From daa0231ad426032bcb0b488ace511a3cf4b92bca Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Mon, 20 Sep 2021 14:21:53 +0300
Subject: [PATCH] Removed some unused API calls

---
 app/src/main/cpp/baresip.c                    | 36 ++++---------------
 app/src/main/kotlin/com/tutpro/baresip/Api.kt |  2 --
 2 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/app/src/main/cpp/baresip.c b/app/src/main/cpp/baresip.c
index 414b504e..bce0d737 100644
--- a/app/src/main/cpp/baresip.c
+++ b/app/src/main/cpp/baresip.c
@@ -1673,28 +1673,6 @@ Java_com_tutpro_baresip_Api_net_1use_1nameserver(JNIEnv *env, jobject thiz, jstr
     return net_use_nameserver(baresip_network(), nsv, count);
 }
 
-JNIEXPORT jint JNICALL
-Java_com_tutpro_baresip_Api_net_1set_1address(JNIEnv *env, jobject thiz, jstring javaIp) {
-    const char *native_ip = (*env)->GetStringUTFChars(env, javaIp, 0);
-    int res = 0;
-    struct sa temp_sa;
-    char buf[256];
-    LOGD("setting address '%s'\n", native_ip);
-    if (str_len(native_ip) == 0) {
-        (*env)->ReleaseStringUTFChars(env, javaIp, native_ip);
-        return 0;
-    }
-    if (0 == sa_set_str(&temp_sa, native_ip, 0)) {
-        sa_ntop(&temp_sa, buf, 256);
-        net_set_address(baresip_network(), &temp_sa);
-    } else {
-        LOGE("invalid ip address %s\n", native_ip);
-        res = EAFNOSUPPORT;
-    }
-    (*env)->ReleaseStringUTFChars(env, javaIp, native_ip);
-    return res;
-}
-
 JNIEXPORT jint JNICALL
 Java_com_tutpro_baresip_Api_net_1add_1address(JNIEnv *env, jobject thiz, jstring javaIp) {
     const char *native_ip = (*env)->GetStringUTFChars(env, javaIp, 0);
@@ -1708,7 +1686,9 @@ Java_com_tutpro_baresip_Api_net_1add_1address(JNIEnv *env, jobject thiz, jstring
     }
     if (0 == sa_set_str(&temp_sa, native_ip, 0)) {
         sa_ntop(&temp_sa, buf, 256);
+        re_thread_enter();
         net_add_address(baresip_network(), &temp_sa);
+        re_thread_leave();
     } else {
         LOGE("invalid ip address %s\n", native_ip);
         res = EAFNOSUPPORT;
@@ -1730,7 +1710,9 @@ Java_com_tutpro_baresip_Api_net_1rm_1address(JNIEnv *env, jobject thiz, jstring
     }
     if (0 == sa_set_str(&temp_sa, native_ip, 0)) {
         sa_ntop(&temp_sa, buf, 256);
+        re_thread_enter();
         net_rm_address(baresip_network(), &temp_sa);
+        re_thread_leave();
     } else {
         LOGE("invalid ip address %s\n", native_ip);
         res = EAFNOSUPPORT;
@@ -1739,19 +1721,13 @@ Java_com_tutpro_baresip_Api_net_1rm_1address(JNIEnv *env, jobject thiz, jstring
     return res;
 }
 
-JNIEXPORT void JNICALL
-Java_com_tutpro_baresip_Api_net_1unset_1address(JNIEnv *env, jobject thiz, jint javaAf) {
-    struct sa temp_sa;
-    LOGD("unsetting AF '%d' address\n", javaAf);
-    sa_init(&temp_sa, javaAf);
-    net_set_address(baresip_network(), &temp_sa);
-}
-
 JNIEXPORT void JNICALL
 Java_com_tutpro_baresip_Api_uag_1reset_1transp(JNIEnv *env, jobject thiz, jboolean reg,
         jboolean reinvite) {
     LOGD("reseting transports (%d, %d)\n", reg, reinvite);
+    re_thread_enter();
     (void)uag_reset_transp(reg, reinvite);
+    re_thread_leave();
 }
 
 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 08fd49dc..bd35057b 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Api.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Api.kt
@@ -75,10 +75,8 @@ object Api {
     external fun log_level_set(level: Int)
 
     external fun net_use_nameserver(servers: String): Int
-    external fun net_set_address(ip_addr: String): Int
     external fun net_add_address(ip_addr: String): Int
     external fun net_rm_address(ip_addr: String): Int
-    external fun net_unset_address(af: Int)
     external fun net_debug()
     external fun net_dns_debug()