diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-08-01 20:19:44 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-08-02 22:13:23 +0000 |
| commit | 7d59d4b39a8fe6e615ef30dee65e452cc174e4f1 (patch) | |
| tree | 04c0e6bd740bd91b849e873acfa45c6f221a7d12 | |
| parent | 6a63dd60ea6a4d2412543d0c7fb6b21e9a48d812 (diff) | |
| download | mullvadvpn-7d59d4b39a8fe6e615ef30dee65e452cc174e4f1.tar.xz mullvadvpn-7d59d4b39a8fe6e615ef30dee65e452cc174e4f1.zip | |
Implement `IntoJava` for `Ipv4Addr`
| -rw-r--r-- | mullvad-jni/src/into_java.rs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mullvad-jni/src/into_java.rs b/mullvad-jni/src/into_java.rs index 566be9f2bf..305101a9f1 100644 --- a/mullvad-jni/src/into_java.rs +++ b/mullvad-jni/src/into_java.rs @@ -19,7 +19,7 @@ use mullvad_types::{ }; use std::{ fmt::Debug, - net::{IpAddr, SocketAddr}, + net::{IpAddr, Ipv4Addr, SocketAddr}, }; use talpid_core::tunnel::tun_provider::TunConfig; use talpid_types::{ @@ -151,6 +151,14 @@ fn ipvx_addr_into_java<'env>(original_octets: &[u8], env: &JNIEnv<'env>) -> JObj } } +impl<'env> IntoJava<'env> for Ipv4Addr { + type JavaType = JObject<'env>; + + fn into_java(self, env: &JNIEnv<'env>) -> Self::JavaType { + ipvx_addr_into_java(self.octets().as_ref(), env) + } +} + impl<'env> IntoJava<'env> for IpAddr { type JavaType = JObject<'env>; |
