Changeset 2531 for pjproject/branches/1.0

Timestamp:

Mar 23, 2009 1:02:53 PM (15 years ago)

Author:

bennylp

Message:

Ticket #743: backported from ticket #742

Location:

pjproject/branches/1.0

Files:

• . (modified) (1 prop)
• pjnath/include/pjnath/stun_sock.h (modified) (1 diff)
• pjnath/src/pjnath-test/stun_sock_test.c (modified) (3 diffs)
• pjnath/src/pjnath/ice_strans.c (modified) (3 diffs)
• pjnath/src/pjnath/stun_sock.c (modified) (1 diff)

pjproject/branches/1.0/pjnath/include/pjnath/stun_sock.h

@@ -74 +74 @@
      */
     PJ_STUN_SOCK_KEEP_ALIVE_OP,
+
+    /**
+     * IP address change notification from the keep-alive operation.
+     */
+    PJ_STUN_SOCK_MAPPED_ADDR_CHANGE
+
 
 } pj_stun_sock_op;

pjproject/branches/1.0/pjnath/src/pjnath-test/stun_sock_test.c

@@ -628 +628 @@
      * called
      */
+    /* No longer valid due to this ticket:
+     *  http://trac.pjsip.org/repos/ticket/742
+
     if (client->on_status_cnt != 0) {
         PJ_LOG(3, (THIS_FILE, "    error: on_status() must not be called on successful"
@@ -634 +637 @@
         goto on_return;
     }
+    */
     /* Check that client doesn't receive anything */
     if (client->on_rx_data_cnt != 0) {
@@ -687 +691 @@
     }
     /* Check that callback was called with correct operation */
-    if (client->last_op != PJ_STUN_SOCK_KEEP_ALIVE_OP) {
+    if (client->last_op != PJ_STUN_SOCK_MAPPED_ADDR_CHANGE) {
         PJ_LOG(3,(THIS_FILE, "    error: expecting keep-alive operation status"));
         ret = -470;

pjproject/branches/1.0/pjnath/src/pjnath/ice_strans.c

@@ -1266 +1266 @@
         break;
     case PJ_STUN_SOCK_BINDING_OP:
+    case PJ_STUN_SOCK_MAPPED_ADDR_CHANGE:
         if (status == PJ_SUCCESS) {
             pj_stun_sock_info info;
@@ -1272 +1273 @@
             if (status == PJ_SUCCESS) {
                 char ipaddr[PJ_INET6_ADDRSTRLEN+10];
+                const char *op_name = (op==PJ_STUN_SOCK_BINDING_OP) ?
+                                    "Binding discovery complete" :
+                                    "srflx address changed";
                 pj_bool_t dup = PJ_FALSE;
 
@@ -1309 +1313 @@
 
                 PJ_LOG(4,(comp->ice_st->obj_name, 
-                          "Comp %d: Binding discovery complete, "
+                          "Comp %d: %s, "
                           "srflx address is %s",
-                          comp->comp_id, 
+                          comp->comp_id, op_name, 
                           pj_sockaddr_print(&info.mapped_addr, ipaddr, 
                                              sizeof(ipaddr), 3)));

pjproject/branches/1.0/pjnath/src/pjnath/stun_sock.c

@@ -670 +670 @@
         pj_sockaddr_cp(&stun_sock->mapped_addr, &mapped_attr->sockaddr);
 
-        resched = (*stun_sock->cb.on_status)(stun_sock, op, PJ_SUCCESS);
-
-        goto on_return;
-    }
+        if (op==PJ_STUN_SOCK_KEEP_ALIVE_OP)
+            op = PJ_STUN_SOCK_MAPPED_ADDR_CHANGE;
+    }
+
+    /* Notify user */
+    resched = (*stun_sock->cb.on_status)(stun_sock, op, PJ_SUCCESS);
 
 on_return: