diff options
| -rw-r--r-- | mullvad-jni/src/into_java.rs | 56 | ||||
| -rw-r--r-- | mullvad-jni/src/lib.rs | 1 |
2 files changed, 56 insertions, 1 deletions
diff --git a/mullvad-jni/src/into_java.rs b/mullvad-jni/src/into_java.rs index 92d75b4a27..a67b42a5e7 100644 --- a/mullvad-jni/src/into_java.rs +++ b/mullvad-jni/src/into_java.rs @@ -1,6 +1,7 @@ use crate::get_class; use jni::{ objects::{JList, JObject, JString, JValue}, + signature::JavaType, sys::{jint, jsize}, JNIEnv, }; @@ -11,7 +12,7 @@ use mullvad_types::{ settings::Settings, CustomTunnelEndpoint, }; -use std::fmt::Debug; +use std::{fmt::Debug, net::IpAddr}; use talpid_types::{net::wireguard::PublicKey, tunnel::TunnelStateTransition}; pub trait IntoJava<'env> { @@ -91,6 +92,59 @@ impl<'array, 'env> IntoJava<'env> for &'array [u8] { } } +impl<'env> IntoJava<'env> for IpAddr { + type JavaType = JObject<'env>; + + fn into_java(self, env: &JNIEnv<'env>) -> Self::JavaType { + let class = get_class("java/net/InetAddress"); + + let constructor = env + .get_static_method_id(&class, "getByAddress", "([B)Ljava/net/InetAddress;") + .expect("Failed to get InetAddress.getByAddress method ID"); + + let octet_count = if self.is_ipv4() { 4 } else { 16 }; + let octets_array = env + .new_byte_array(octet_count) + .expect("Failed to create byte array to store IP address"); + + let octet_data: Vec<i8> = match self { + IpAddr::V4(address) => address + .octets() + .into_iter() + .map(|octet| *octet as i8) + .collect(), + IpAddr::V6(address) => address + .octets() + .into_iter() + .map(|octet| *octet as i8) + .collect(), + }; + + env.set_byte_array_region(octets_array, 0, &octet_data) + .expect("Failed to copy IP address octets to byte array"); + + let octets = env.auto_local(JObject::from(octets_array)); + let result = env + .call_static_method_unchecked( + "java/net/InetAddress", + constructor, + JavaType::Object("java/net/InetAddress".to_owned()), + &[JValue::Object(octets.as_obj())], + ) + .expect("Failed to create InetAddress Java object"); + + match result { + JValue::Object(object) => object, + value => { + panic!( + "InetAddress.getByAddress returned an invalid value: {:?}", + value + ); + } + } + } +} + impl<'env> IntoJava<'env> for PublicKey { type JavaType = JObject<'env>; diff --git a/mullvad-jni/src/lib.rs b/mullvad-jni/src/lib.rs index e033e01db8..bf9a0b5186 100644 --- a/mullvad-jni/src/lib.rs +++ b/mullvad-jni/src/lib.rs @@ -25,6 +25,7 @@ use talpid_types::ErrorExt; const LOG_FILENAME: &str = "daemon.log"; const CLASSES_TO_LOAD: &[&str] = &[ + "java/net/InetAddress", "java/util/ArrayList", "net/mullvad/mullvadvpn/model/AccountData", "net/mullvad/mullvadvpn/model/Constraint$Any", |