Changeset 1338 for pjproject/trunk

Timestamp:

Jun 5, 2007 11:48:15 AM (17 years ago)

Author:

bennylp

Message:

Fixed assertion error in ice_strans.c, when response is received before get_stun_mapped_addr() returns

File:

• pjproject/trunk/pjnath/src/pjnath/ice_strans.c (modified) (2 diffs)

pjproject/trunk/pjnath/src/pjnath/ice_strans.c

@@ -676 +676 @@
     tdata->user_data = (void*)cand;
 
-    /* Send STUN binding request */
-    status = pj_stun_session_send_msg(comp->stun_sess, PJ_FALSE, 
-                                      &ice_st->stun_srv, 
-                                      sizeof(pj_sockaddr_in), tdata);
-    if (status != PJ_SUCCESS)
-        return status;
-
+    /* Add pending count first, since stun_on_request_complete()
+     * may be called before this function completes
+     */
+    comp->pending_cnt++;
 
     /* Add new alias to this component */
@@ -694 +691 @@
     ++comp->cand_cnt;
 
-    /* Add pending count for this component */
-    comp->pending_cnt++;
+    /* Send STUN binding request */
+    status = pj_stun_session_send_msg(comp->stun_sess, PJ_FALSE, 
+                                      &ice_st->stun_srv, 
+                                      sizeof(pj_sockaddr_in), tdata);
+    if (status != PJ_SUCCESS) {
+        --comp->pending_cnt;
+        --comp->cand_cnt;
+        return status;
+    }
 
     return PJ_SUCCESS;