Changeset 1434 for pjproject/trunk

Timestamp:

Sep 14, 2007 10:19:47 AM (17 years ago)

Author:

bennylp

Message:

Fixed ticket #372: Handle case where STUN mapped address has changed in ICE (thanks Ravin Suri)

Location:

pjproject/trunk/pjnath

Files:

• include/pjnath/ice_strans.h (modified) (1 diff)
• src/pjnath/ice_strans.c (modified) (5 diffs)

pjproject/trunk/pjnath/include/pjnath/ice_strans.h

@@ -163 +163 @@
                                pj_status_t status);
 
+    /**
+     * This callback will be called when ICE transport has detected that
+     * the STUN mapped address of a candidate has changed.
+     *
+     * @param ice_st        The ICE stream transport.
+     * @param comp_id       Component ID.
+     * @param cand_id       Candidate ID.
+     */
+    void    (*on_addr_change)(pj_ice_strans *ice_st, 
+                              unsigned comp_id, 
+                              unsigned cand_id);
+                              
 } pj_ice_strans_cb;
 

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

@@ -583 +583 @@
 
         /* tdata->user_data is NULL for keep-alive */
-        tdata->user_data = NULL;
+        //tdata->user_data = NULL;
+
+        // We need this to support mapped address change
+        tdata->user_data = &comp->cand_list[j];
+        ++comp->pending_cnt;
+
 
         /* Send STUN binding request */
@@ -590 +595 @@
                                           &ice_st->stun_srv, 
                                           sizeof(pj_sockaddr_in), tdata);
+        if (status != PJ_SUCCESS) {
+            --comp->pending_cnt;
+        }
     }
 
@@ -1086 +1094 @@
     pj_stun_mapped_addr_attr *ma;
     pj_sockaddr *mapped_addr;
+    char ip[20];
 
     comp = (pj_ice_strans_comp*) pj_stun_session_get_user_data(sess);
@@ -1129 +1138 @@
     }
 
+    /* Ignore response if it reports the same address */
+    if (cand->addr.ipv4.sin_addr.s_addr == mapped_addr->ipv4.sin_addr.s_addr &&
+        cand->addr.ipv4.sin_port == mapped_addr->ipv4.sin_port)
+    {
+        return;
+    }
+
+    pj_ansi_strcpy(ip, pj_inet_ntoa(comp->local_addr.ipv4.sin_addr));
+
     PJ_LOG(4,(comp->ice_st->obj_name, 
-              "STUN mapped address: %s:%d",
+              "STUN mapped address for %s:%d is %s:%d",
+              ip, (int)pj_ntohs(comp->local_addr.ipv4.sin_port),
               pj_inet_ntoa(mapped_addr->ipv4.sin_addr),
               (int)pj_ntohs(mapped_addr->ipv4.sin_port)));
@@ -1142 +1161 @@
     /* We have STUN, so we must start the keep-alive timer */
     start_ka_timer(comp->ice_st);
-}
-
+
+    /* Notify app that STUN address has changed. */
+    if (comp->ice_st->cb.on_addr_change)
+        (*comp->ice_st->cb.on_addr_change)(comp->ice_st, comp->comp_id, 
+                                           (cand - comp->cand_list));
+}
+