Changeset 1932 for pjproject/branches/projects/ice-turn07/pjnath/src/pjnath/ice_strans.c

Timestamp:

Apr 17, 2008 5:25:37 PM (16 years ago)

Author:

bennylp

Message:

SIPit ICE test: fixed crashed with ICE negotiation, fixed empty (0.0.0.0) srflx addr, etc.

File:

• pjproject/branches/projects/ice-turn07/pjnath/src/pjnath/ice_strans.c (modified) (3 diffs)

pjproject/branches/projects/ice-turn07/pjnath/src/pjnath/ice_strans.c

@@ -954 +954 @@
             }
 
+            /* Skip if candidate has no address */
+            if (!pj_sockaddr_has_addr(&cand->addr)) {
+                PJ_LOG(5,(ice_st->obj_name, 
+                          "Candidate %d in component %d is not added",
+                          j, i));
+                continue;
+            }
+
             if (cand->type == PJ_ICE_CAND_TYPE_RELAYED) {
                 local_addr = &cand->addr;
@@ -964 +972 @@
                                           cand->type, cand->local_pref, 
                                           &cand->foundation, &cand->addr, 
-                                          &comp->local_addr, NULL, 
+                                          local_addr, relay_addr, 
                                           sizeof(pj_sockaddr_in), 
                                           (unsigned*)&cand->ice_cand_id);
@@ -1316 +1324 @@
     }
 
+    if (comp->ice_st->ice == NULL) {
+        /* The session is gone */
+        return;
+    }
+
     /* Find candidate ID for this packet */
     for (cand_id=0; cand_id<comp->cand_cnt; ++cand_id) {