Changeset 5442 for pjproject

Timestamp:

Oct 4, 2016 9:10:11 AM (8 years ago)

Author:

ming

Message:

Fixed #1962: Premature STUN socket destruction when there's an error during STUN server resolution

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• src/pjsua-lib/pjsua_core.c (modified) (3 diffs)

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

@@ -375 +375 @@
     pj_sockaddr          addr;      /**< Result             */
     pj_stun_sock        *stun_sock; /**< Testing STUN sock  */
+    pj_bool_t            async_wait;/**< Async resolution 
+                                         of STUN entry      */
 } pjsua_stun_resolve;
 

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

@@ -1285 +1285 @@
                   sess->srv[sess->idx].ptr, errmsg));
 
+        if (op == PJ_STUN_SOCK_BINDING_OP && !sess->async_wait) {
+            /* Just return here, we will destroy the STUN socket and
+             * continue the STUN resolution later in resolve_stun_entry().
+             * For more details, please refer to ticket #19xx.
+             */
+            return PJ_FALSE;
+        }
+
         pj_stun_sock_destroy(stun_sock);
         sess->stun_sock = NULL;
@@ -1373 +1381 @@
         pj_bzero(&stun_sock_cb, sizeof(stun_sock_cb));
         stun_sock_cb.on_status = &test_stun_on_status;
+        sess->async_wait = PJ_FALSE;
         status = pj_stun_sock_create(&pjsua_var.stun_cfg, "stunresolve",
                                      pj_AF_INET(), &stun_sock_cb,
@@ -1405 +1414 @@
          * stun_sock_cb()
          */
+        sess->async_wait = PJ_TRUE;
         return;
     }