summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-08-01 20:29:46 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-08-02 22:13:23 +0000
commit49c724d6063934eb60bd279be79f7b0ee7ef02eb (patch)
treea87c774febd74537c58b95bb2fbba35fc77199a2
parent7d59d4b39a8fe6e615ef30dee65e452cc174e4f1 (diff)
downloadmullvadvpn-49c724d6063934eb60bd279be79f7b0ee7ef02eb.tar.xz
mullvadvpn-49c724d6063934eb60bd279be79f7b0ee7ef02eb.zip
Implement `IntoJava` for `Ipv6Addr`
-rw-r--r--mullvad-jni/src/into_java.rs10
1 files changed, 9 insertions, 1 deletions
diff --git a/mullvad-jni/src/into_java.rs b/mullvad-jni/src/into_java.rs
index 305101a9f1..884d8ec391 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, Ipv4Addr, SocketAddr},
+ net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr},
};
use talpid_core::tunnel::tun_provider::TunConfig;
use talpid_types::{
@@ -159,6 +159,14 @@ impl<'env> IntoJava<'env> for Ipv4Addr {
}
}
+impl<'env> IntoJava<'env> for Ipv6Addr {
+ 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>;