Changeset 1144

Timestamp:

Apr 4, 2007 10:13:07 AM (17 years ago)

Author:

bennylp

Message:

Fixed potential crash in ICE when adding peer reflexive candidate

File:

• pjproject/trunk/pjnath/src/pjnath/ice_session.c (modified) (3 diffs)

pjproject/trunk/pjnath/src/pjnath/ice_session.c

@@ -913 +913 @@
     pj_assert(check->state >= PJ_ICE_SESS_CHECK_STATE_SUCCEEDED);
 
+    /* 7.1.2.2.2.  Updating Pair States
+     * 
+     * The agent sets the state of the pair that generated the check to
+     * Succeeded.  The success of this check might also cause the state of
+     * other checks to change as well.  The agent MUST perform the following
+     * two steps:
+     * 
+     * 1.  The agent changes the states for all other Frozen pairs for the
+     * same media stream and same foundation to Waiting.  Typically
+     * these other pairs will have different component IDs but not
+     * always.
+     */
+
+
     /* If there is at least one nominated pair in the valid list:
      * - The agent MUST remove all Waiting and Frozen pairs in the check
@@ -1583 +1597 @@
 
         pj_ice_calc_foundation(ice->pool, &foundation, PJ_ICE_CAND_TYPE_PRFLX,
-                               &lcand->base_addr);
+                               &check->lcand->base_addr);
+
+        /* According to: 7.1.2.2.1. Discovering Peer Reflexive Candidates:
+         * Its priority is set equal to the value of the PRIORITY attribute
+         * in the Binding Request.
+         *
+         * I think the priority calculated by add_cand() should be the same
+         * as the one calculated in perform_check(), so there's no need to
+         * get the priority from the PRIORITY attribute.
+         */
 
         /* Add new peer reflexive candidate */
         status = pj_ice_sess_add_cand(ice, lcand->comp_id, 
-                                 PJ_ICE_CAND_TYPE_PRFLX,
-                                 65535, &foundation,
-                                 &xaddr->sockaddr, &lcand->base_addr, NULL,
-                                 sizeof(pj_sockaddr_in), &cand_id);
+                                      PJ_ICE_CAND_TYPE_PRFLX,
+                                      65535, &foundation,
+                                      &xaddr->sockaddr, 
+                                      &check->lcand->base_addr, NULL,
+                                      sizeof(pj_sockaddr_in), &cand_id);
         if (status != PJ_SUCCESS) {
             check_set_state(ice, check, PJ_ICE_SESS_CHECK_STATE_FAILED, 
@@ -1601 +1625 @@
         /* Update local candidate */
         lcand = &ice->lcand[cand_id];
+
     }