Changeset 1546 for pjproject

Timestamp:

Nov 3, 2007 10:44:14 PM (17 years ago)

Author:

bennylp

Message:

Only do Test 1B if Test 2 failed

File:

• pjproject/trunk/pjnath/src/pjnath/nat_detect.c (modified) (5 diffs)

pjproject/trunk/pjnath/src/pjnath/nat_detect.c

@@ -103 +103 @@
         pj_sockaddr_in  ma;
         pj_sockaddr_in  ca;
+        pj_stun_tx_data *tdata;
     } result[ST_MAX];
 
@@ -549 +550 @@
     }
 
-    if (test_id == ST_TEST_1 && status == PJ_SUCCESS) {
+    /* Send Test 1B only when Test 2 completes. Must not send Test 1B
+     * before Test 2 completes to avoid creating mapping on the NAT.
+     */
+    if (!sess->result[ST_TEST_1B].executed && 
+        sess->result[ST_TEST_2].complete &&
+        sess->result[ST_TEST_2].status != PJ_SUCCESS &&
+        sess->result[ST_TEST_1].complete &&
+        sess->result[ST_TEST_1].status == PJ_SUCCESS) 
+    {
         cmp = pj_memcmp(&sess->local_addr, &sess->result[ST_TEST_1].ma,
                         sizeof(pj_sockaddr_in));
         if (cmp != 0)
-            send_test(sess, ST_TEST_1B, &sess->result[test_id].ca, 0);
+            send_test(sess, ST_TEST_1B, &sess->result[ST_TEST_1].ca, 0);
     }
 
@@ -760 +769 @@
                              pj_uint32_t change_flag)
 {
-    pj_stun_tx_data *tdata;
     pj_uint32_t magic, tsx_id[3];
     pj_status_t status;
@@ -778 +786 @@
     status = pj_stun_session_create_req(sess->stun_sess, 
                                         PJ_STUN_BINDING_REQUEST, magic,
-                                        (pj_uint8_t*)tsx_id, &tdata);
+                                        (pj_uint8_t*)tsx_id, 
+                                        &sess->result[test_id].tdata);
     if (status != PJ_SUCCESS)
         goto on_error;
 
     /* Add CHANGE-REQUEST attribute */
-    status = pj_stun_msg_add_uint_attr(sess->pool, tdata->msg,
+    status = pj_stun_msg_add_uint_attr(sess->pool, 
+                                       sess->result[test_id].tdata->msg,
                                        PJ_STUN_ATTR_CHANGE_REQUEST,
                                        change_flag);
@@ -805 +815 @@
                                       sess->cur_server, 
                                       sizeof(pj_sockaddr_in),
-                                      tdata);
+                                      sess->result[test_id].tdata);
     if (status != PJ_SUCCESS)
         goto on_error;