Changeset 1498 for pjproject/trunk/pjnath/src/pjnath/nat_detect.c

Timestamp:

Oct 13, 2007 12:06:59 AM (17 years ago)

Author:

bennylp

Message:

Added "magic" parameter in pj_stun_session_create_req()

File:

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

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

@@ -55 +55 @@
 };
 
+static const char *test_names[] =
+{
+    "Test I: Binding request",
+    "Test II: Binding request with change address and port request",
+    "Test IB: Binding request to alternate address",
+    "Test III: Binding request with change port request"
+};
+
 typedef struct nat_detect_session
 {
@@ -309 +317 @@
     /* Create BIND request */
     status = pj_stun_session_create_req(sess->stun_sess, 
-                                        PJ_STUN_BINDING_REQUEST,
+                                        PJ_STUN_BINDING_REQUEST, 0x83224,
                                         NULL, &tdata);
     if (status != PJ_SUCCESS)
         return status;
 
-    /* Add CHANGE-REQUEST attribute if necessary */
-    if (change_flag) {
-        status = pj_stun_msg_add_uint_attr(sess->pool, tdata->msg,
-                                           PJ_STUN_ATTR_CHANGE_REQUEST,
-                                           change_flag);
-        if (status != PJ_SUCCESS)
-            return status;
-    }
+    /* Add CHANGE-REQUEST attribute */
+    status = pj_stun_msg_add_uint_attr(sess->pool, tdata->msg,
+                                       PJ_STUN_ATTR_CHANGE_REQUEST,
+                                       change_flag);
+    if (status != PJ_SUCCESS)
+        return status;
 
     /* Configure alternate address */
@@ -328 +334 @@
     else
         sess->cur_server = &sess->server;
+
+    PJ_LOG(5,(sess->pool->obj_name, 
+              "Performing %s to %s:%d", 
+              test_names[state],
+              pj_inet_ntoa(sess->cur_server->sin_addr),
+              pj_ntohs(sess->cur_server->sin_port)));
 
     /* Send the request */
@@ -562 +574 @@
 
             /* Compare mapped address with local address */
-            sess->test1_same_ip = (pj_memcmp(&sess->local_addr, &mattr->sockaddr,
-                                             sizeof(pj_sockaddr_in))==0);
+            sess->test1_same_ip=(pj_memcmp(&sess->local_addr, &mattr->sockaddr,
+                                           sizeof(pj_sockaddr_in))==0);
             
             /* Execute test 2:
-             *  Send BINDING_REQUEST with both the "change IP" and "change port" 
-             *  flags from the CHANGE-REQUEST attribute set
+             * Send BINDING_REQUEST with both the "change IP" and "change port" 
+             * flags from the CHANGE-REQUEST attribute set
              */
             start_test(sess, ST_TEST_2, NULL, CHANGE_ADDR_PORT);
@@ -663 +675 @@
     sess_destroy(sess);
 }
+