Changeset 1932 for pjproject/branches/projects/ice-turn07/pjnath/src/pjnath/ice_session.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_session.c (modified) (9 diffs)

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

@@ -107 +107 @@
 struct msg_data
 {
-    pj_bool_t                        is_request;
+    pj_bool_t   is_request;
+    unsigned    cand_id;
 
     union data {
@@ -115 +116 @@
             unsigned                 ckid;
         } req;
-
-        struct response_data {
-            unsigned                 cand_id;
-        } res;
     } data;
 };
@@ -1401 +1398 @@
      * completes and on_stun_request_complete() callback is called.
      */
-    msg_data = PJ_POOL_ZALLOC_T(check->tdata->pool, struct msg_data);
+    msg_data = PJ_POOL_ZALLOC_T(ice->pool, struct msg_data);
     msg_data->is_request = PJ_TRUE;
+    msg_data->cand_id = lcand - ice->lcand;
     msg_data->data.req.ice = ice;
     msg_data->data.req.clist = clist;
@@ -1668 +1666 @@
     unsigned cand_id;
     
-    if (msg_data->is_request) {
-        pj_ice_sess_checklist *clist = msg_data->data.req.clist;
-        pj_ice_sess_cand *lcand = clist->checks[msg_data->data.req.ckid].lcand;
-
-        cand_id = lcand - ice->lcand;
-        
-    } else {
-        cand_id = msg_data->data.res.cand_id;
-    }
+    cand_id = msg_data->cand_id;
 
     return (*ice->cb.on_tx_pkt)(ice, sd->comp_id, cand_id,
@@ -1940 +1930 @@
 {
     stun_data *sd;
-    unsigned *param_cand_id;
+    //unsigned *param_cand_id;
     const pj_stun_msg *msg = rdata->msg;
     struct msg_data *msg_data;
@@ -1962 +1952 @@
      *  whether to send packet using local socket or the relay.
      */
-    param_cand_id = (unsigned*)token;
+    //param_cand_id = (unsigned*)token;
 
     /* Reject any requests except Binding request */
@@ -2073 +2063 @@
 
     /* Create a msg_data to be associated with this response */
-    msg_data = PJ_POOL_ZALLOC_T(tdata->pool, struct msg_data);
+    msg_data = PJ_POOL_ZALLOC_T(ice->pool, struct msg_data);
     msg_data->is_request = PJ_FALSE;
-    msg_data->data.res.cand_id = *param_cand_id;
+    msg_data->cand_id = ((struct msg_data*)token)->cand_id;
 
     /* Send the response */
@@ -2389 +2379 @@
     pj_status_t status = PJ_SUCCESS;
     pj_ice_sess_comp *comp;
+    struct msg_data *msg_data;
     pj_status_t stun_status;
 
@@ -2401 +2392 @@
     }
 
+    msg_data = PJ_POOL_ZALLOC_T(ice->pool, struct msg_data);
+    msg_data->is_request = PJ_FALSE;
+    msg_data->cand_id = cand_id;
+
     stun_status = pj_stun_msg_check((const pj_uint8_t*)pkt, pkt_size, 
                                     PJ_STUN_IS_DATAGRAM);
     if (stun_status == PJ_SUCCESS) {
         status = pj_stun_session_on_rx_pkt(comp->stun_sess, pkt, pkt_size,
-                                           PJ_STUN_IS_DATAGRAM, &cand_id,
+                                           PJ_STUN_IS_DATAGRAM, msg_data,
                                            NULL, src_addr, src_addr_len);
         if (status != PJ_SUCCESS) {