Changeset 5217 for pjproject

Timestamp:

Dec 24, 2015 12:25:58 PM (9 years ago)

Author:

nanang

Message:

Misc (re #1882): Fixed bug STUN still being used in media transport UDP & ICE after STUN is disabled in account config (media_stun_use == PJSUA_STUN_USE_DISABLED).

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• src/pjsua-lib/pjsua_acc.c (modified) (1 diff)
• src/pjsua-lib/pjsua_media.c (modified) (4 diffs)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -609 +609 @@
 /* acc use stun? */
 pj_bool_t pjsua_sip_acc_is_using_stun(pjsua_acc_id acc_id);
+pj_bool_t pjsua_media_acc_is_using_stun(pjsua_acc_id acc_id);
 
 /* Get local transport address suitable to be used for Via or Contact address

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -2481 +2481 @@
 
     return acc->cfg.sip_stun_use != PJSUA_STUN_USE_DISABLED &&
-            pjsua_var.ua_cfg.stun_srv_cnt != 0;
+           pjsua_var.ua_cfg.stun_srv_cnt != 0;
+}
+
+pj_bool_t pjsua_media_acc_is_using_stun(pjsua_acc_id acc_id)
+{
+    pjsua_acc *acc = &pjsua_var.acc[acc_id];
+
+    return acc->cfg.media_stun_use != PJSUA_STUN_USE_DISABLED &&
+           pjsua_var.ua_cfg.stun_srv_cnt != 0;
 }
 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -254 +254 @@
 
     /* Make sure STUN server resolution has completed */
-    if (!use_ipv6 && pjsua_sip_acc_is_using_stun(call_med->call->acc_id)) {
+    if (!use_ipv6 && pjsua_media_acc_is_using_stun(call_med->call->acc_id)) {
         status = resolve_stun_server(PJ_TRUE);
         if (status != PJ_SUCCESS) {
@@ -351 +351 @@
          * and make sure that the mapped RTCP port is adjacent with the RTP.
          */
-        if (!use_ipv6 && pjsua_sip_acc_is_using_stun(call_med->call->acc_id) &&
+        if (!use_ipv6 &&
+            pjsua_media_acc_is_using_stun(call_med->call->acc_id) &&
             pjsua_var.stun_srv.addr.sa_family != 0)
         {
@@ -748 +749 @@
 
     /* Make sure STUN server resolution has completed */
-    status = resolve_stun_server(PJ_TRUE);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Error resolving STUN server", status);
-        return status;
+    if (pjsua_media_acc_is_using_stun(call_med->call->acc_id)) {
+        status = resolve_stun_server(PJ_TRUE);
+        if (status != PJ_SUCCESS) {
+            pjsua_perror(THIS_FILE, "Error resolving STUN server", status);
+            return status;
+        }
     }
 
@@ -766 +769 @@
 
     /* Configure STUN settings */
-    if (pj_sockaddr_has_addr(&pjsua_var.stun_srv)) {
+    if (pj_sockaddr_has_addr(&pjsua_var.stun_srv) &&
+        pjsua_media_acc_is_using_stun(call_med->call->acc_id))
+    {
         pj_sockaddr_print(&pjsua_var.stun_srv, stunip, sizeof(stunip), 0);
         ice_cfg.stun.server = pj_str(stunip);