Changeset 4735 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

Timestamp:

Feb 6, 2014 5:09:52 AM (10 years ago)

Author:

ming

Message:

Fixed #1733: Fix polling mechanism during STUN server resolution

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c (modified) (8 diffs)

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

@@ -1239 +1239 @@
                   sess->srv[sess->idx].ptr, errmsg));
 
-        sess->status = status;
-
         pj_stun_sock_destroy(stun_sock);
         sess->stun_sock = NULL;
 
         ++sess->idx;
+        if (sess->idx >= sess->count)
+            sess->status = status;
+
         resolve_stun_entry(sess);
 
@@ -1274 +1275 @@
 static void resolve_stun_entry(pjsua_stun_resolve *sess)
 {
+    pj_status_t status = PJ_EUNKNOWN;
+
     stun_resolve_add_ref(sess);
 
@@ -1291 +1294 @@
 
         /* Parse the server entry into host:port */
-        sess->status = pj_sockaddr_parse2(af, 0, &sess->srv[sess->idx],
+        status = pj_sockaddr_parse2(af, 0, &sess->srv[sess->idx],
                                           &hostpart, &port, NULL);
-        if (sess->status != PJ_SUCCESS) {
-            PJ_LOG(2,(THIS_FILE, "Invalid STUN server entry %s", target));
+        if (status != PJ_SUCCESS) {
+            PJ_LOG(2,(THIS_FILE, "Invalid STUN server entry %s", target));
             continue;
         }
@@ -1310 +1313 @@
         pj_bzero(&stun_sock_cb, sizeof(stun_sock_cb));
         stun_sock_cb.on_status = &test_stun_on_status;
-        sess->status = pj_stun_sock_create(&pjsua_var.stun_cfg, "stunresolve",
+        status = pj_stun_sock_create(&pjsua_var.stun_cfg, "stunresolve",
                                            pj_AF_INET(), &stun_sock_cb,
                                            NULL, sess, &sess->stun_sock);
-        if (sess->status != PJ_SUCCESS) {
+        if (status != PJ_SUCCESS) {
             char errmsg[PJ_ERR_MSG_SIZE];
-            pj_strerror(sess->status, errmsg, sizeof(errmsg));
+            pj_strerror(status, errmsg, sizeof(errmsg));
             PJ_LOG(4,(THIS_FILE, 
                      "Error creating STUN socket for %s: %s",
@@ -1323 +1326 @@
         }
 
-        sess->status = pj_stun_sock_start(sess->stun_sock, &hostpart,
+        status = pj_stun_sock_start(sess->stun_sock, &hostpart,
                                           port, pjsua_var.resolver);
-        if (sess->status != PJ_SUCCESS) {
+        if (status != PJ_SUCCESS) {
             char errmsg[PJ_ERR_MSG_SIZE];
-            pj_strerror(sess->status, errmsg, sizeof(errmsg));
+            pj_strerror(status, errmsg, sizeof(errmsg));
             PJ_LOG(4,(THIS_FILE, 
                      "Error starting STUN socket for %s: %s",
@@ -1347 +1350 @@
     if (sess->idx >= sess->count) {
         /* No more entries to try */
-        PJ_ASSERT_ON_FAIL(sess->status != PJ_SUCCESS, 
-                          sess->status = PJ_EUNKNOWN);
+        pj_assert(status != PJ_SUCCESS || sess->status != PJ_EPENDING);
+        if (sess->status == PJ_EPENDING)
+            sess->status = status;
         stun_resolve_complete(sess);
     }
@@ -1399 +1403 @@
 
     while (sess->status == PJ_EPENDING) {
-        pjsua_handle_events(50);
+        /* If there is no worker thread or
+         * the function is called from the only worker thread,
+         * we have to handle the events here.
+         */
+        if (pjsua_var.thread[0] == NULL ||
+            (pj_thread_this() == pjsua_var.thread[0] &&
+             pjsua_var.ua_cfg.thread_cnt == 1))
+            {
+            pjsua_handle_events(50);
+        } else {
+            pj_thread_sleep(20);
+        }
     }
 
@@ -1485 +1500 @@
         if (wait) {
             while (pjsua_var.stun_status == PJ_EPENDING) {
-                if (pjsua_var.thread[0] == NULL)
+                /* If there is no worker thread or
+                 * the function is called from the only worker thread,
+                 * we have to handle the events here.
+                 */
+                if (pjsua_var.thread[0] == NULL ||
+                    (pj_thread_this() == pjsua_var.thread[0] &&
+                     pjsua_var.ua_cfg.thread_cnt == 1))
+                {
                     pjsua_handle_events(10);
-                else
+                } else {
                     pj_thread_sleep(10);
+                }
             }
         }