From 441e3745632d78537e10bb727ed3daa3a167b517 Mon Sep 17 00:00:00 2001 From: lubeilin <1791778603@qq.com> Date: Tue, 23 Apr 2024 13:56:25 +0800 Subject: [PATCH] =?UTF-8?q?jni=E8=AE=BE=E7=BD=AEdns?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vnt-jni/java/top/wherewego/vnt/jni/Config.java | 10 +++++++++- vnt-jni/src/config.rs | 3 +-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/vnt-jni/java/top/wherewego/vnt/jni/Config.java b/vnt-jni/java/top/wherewego/vnt/jni/Config.java index 97f28db..4fd3abc 100644 --- a/vnt-jni/java/top/wherewego/vnt/jni/Config.java +++ b/vnt-jni/java/top/wherewego/vnt/jni/Config.java @@ -51,7 +51,7 @@ public class Config { */ private String server; /** - * 服务端地址 + * dns地址 */ private String[] dns; /** @@ -194,6 +194,14 @@ public class Config { this.server = server; } + public String[] getDns() { + return dns; + } + + public void setDns(String[] dns) { + this.dns = dns; + } + public String[] getStunServer() { return stunServer; } diff --git a/vnt-jni/src/config.rs b/vnt-jni/src/config.rs index 3854215..3afd5fe 100644 --- a/vnt-jni/src/config.rs +++ b/vnt-jni/src/config.rs @@ -1,4 +1,3 @@ -use std::net::ToSocketAddrs; use std::str::FromStr; use jni::errors::Error; @@ -21,7 +20,7 @@ pub fn new_config(env: &mut JNIEnv, config: JObject) -> Result { let password = to_string(env, &config, "password")?; let server_address_str = to_string_not_null(env, &config, "server")?; let stun_server = to_string_array_not_null(env, &config, "stunServer")?; - let dns = to_string_array_not_null(env, &config, "dns")?; + let dns = to_string_array(env, &config, "dns")?.unwrap_or_else(|| vec![]); let cipher_model = to_string_not_null(env, &config, "cipherModel")?; let punch_model = to_string(env, &config, "punchModel")?; let mtu = to_integer(env, &config, "mtu")?.map(|v| v as u32);