From eb77eefc224805bc2463628895f4d94878d75f64 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Sun, 9 Jun 2019 19:43:50 +0300
Subject: [PATCH] - Use net_use_nameserver() API function to update DNS
 servers.

---
 app/src/main/cpp/baresip.c                               | 9 ++++-----
 app/src/main/kotlin/com/tutpro/baresip/Api.kt            | 2 +-
 app/src/main/kotlin/com/tutpro/baresip/Config.kt         | 2 +-
 app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/src/main/cpp/baresip.c b/app/src/main/cpp/baresip.c
index b9a80514..6fc332e6 100644
--- a/app/src/main/cpp/baresip.c
+++ b/app/src/main/cpp/baresip.c
@@ -1379,13 +1379,13 @@ Java_com_tutpro_baresip_Api_log_1level_1set(JNIEnv *env, jobject thiz, jint leve
 }
 
 JNIEXPORT jint JNICALL
-Java_com_tutpro_baresip_Api_dnsc_1srv_1set(JNIEnv *env, jobject thiz, jstring javaServers) {
+Java_com_tutpro_baresip_Api_net_1use_1nameserver(JNIEnv *env, jobject thiz, jstring javaServers) {
     const char *native_servers = (*env)->GetStringUTFChars(env, javaServers, 0);
     char servers[256];
     char *server;
     struct sa nsv[NET_MAX_NS];
-	uint32_t count = 0;
-	char *comma;
+    uint32_t count = 0;
+    char *comma;
     int err;
     LOGD("setting dns servers '%s'\n", native_servers);
     if (str_len(native_servers) > 255) {
@@ -1413,8 +1413,7 @@ Java_com_tutpro_baresip_Api_dnsc_1srv_1set(JNIEnv *env, jobject thiz, jstring ja
         }
         count++;
     }
-    (void)dnsc_srv_set(net_dnsc(baresip_network()), nsv, count);
-    return 0;
+    return net_use_nameserver(net_dnsc(baresip_network()), nsv, count);
 }
 
 JNIEXPORT void JNICALL
diff --git a/app/src/main/kotlin/com/tutpro/baresip/Api.kt b/app/src/main/kotlin/com/tutpro/baresip/Api.kt
index 78a55944..f1a88700 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Api.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Api.kt
@@ -31,7 +31,7 @@ object Api {
     external fun contact_add(contact: String)
     external fun contacts_remove()
     external fun log_level_set(level: Int)
-    external fun dnsc_srv_set(servers: String): Int
+    external fun net_use_nameserver(servers: String): Int
     external fun net_debug()
     external fun module_load(module: String): Int
     external fun module_unload(module: String)
diff --git a/app/src/main/kotlin/com/tutpro/baresip/Config.kt b/app/src/main/kotlin/com/tutpro/baresip/Config.kt
index 6beb72ec..4dcbe34b 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Config.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Config.kt
@@ -126,6 +126,6 @@ object Config {
             else
                 servers = "${servers},${address}"
         }
-        return Api.dnsc_srv_set(servers)
+        return Api.net_use_nameserver(servers)
     }
 }
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
index d009878b..e9aa941a 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
@@ -172,7 +172,7 @@ class ConfigActivity : AppCompatActivity() {
                     for (server in dnsServers.split(","))
                         Config.add("dns_server", server)
                     Config.add("dyn_dns", "no")
-                    if (Api.dnsc_srv_set(dnsServers) != 0) {
+                    if (Api.net_use_nameserver(dnsServers) != 0) {
                         Utils.alertView(this, "Notice",
                                 "Failed to set DNS servers '$dnsServers'")
                         return false