Changeset 1140 for pjproject/trunk/pjnath/src/pjnath/stun_session.c

Timestamp:

Apr 3, 2007 6:01:27 PM (17 years ago)

Author:

bennylp

Message:

Fixed misc bugs with ICE: (1) moved STUN session from candidate to component since it causes STUN response to wrong session, and (2) keep-alive transaction timed-out when ICE is active

File:

• pjproject/trunk/pjnath/src/pjnath/stun_session.c (modified) (10 diffs)

pjproject/trunk/pjnath/src/pjnath/stun_session.c

@@ -50 +50 @@
 
 
-static void tsx_on_complete(pj_stun_client_tsx *tsx,
-                            pj_status_t status, 
-                            const pj_stun_msg *response);
-static pj_status_t tsx_on_send_msg(pj_stun_client_tsx *tsx,
-                                   const void *stun_pkt,
-                                   pj_size_t pkt_size);
+static void stun_tsx_on_complete(pj_stun_client_tsx *tsx,
+                                 pj_status_t status, 
+                                 const pj_stun_msg *response);
+static pj_status_t stun_tsx_on_send_msg(pj_stun_client_tsx *tsx,
+                                        const void *stun_pkt,
+                                        pj_size_t pkt_size);
+static void stun_tsx_on_destroy(pj_stun_client_tsx *tsx);
 
 static pj_stun_tsx_cb tsx_cb = 
 {
-    &tsx_on_complete,
-    &tsx_on_send_msg
+    &stun_tsx_on_complete,
+    &stun_tsx_on_send_msg,
+    &stun_tsx_on_destroy
 };
 
@@ -121 +123 @@
 static pj_status_t create_request_tdata(pj_stun_session *sess,
                                         unsigned msg_type,
+                                        const pj_uint8_t tsx_id[12],
                                         pj_stun_tx_data **p_tdata)
 {
@@ -132 +135 @@
     /* Create STUN message */
     status = pj_stun_msg_create(tdata->pool, msg_type,  PJ_STUN_MAGIC, 
-                                NULL, &tdata->msg);
+                                tsx_id, &tdata->msg);
     if (status != PJ_SUCCESS) {
         pj_pool_release(tdata->pool);
@@ -149 +152 @@
 }
 
+
+static void stun_tsx_on_destroy(pj_stun_client_tsx *tsx)
+{
+    pj_stun_tx_data *tdata;
+
+    tdata = (pj_stun_tx_data*) pj_stun_client_tsx_get_data(tsx);
+    pj_stun_client_tsx_destroy(tsx);
+    pj_pool_release(tdata->pool);
+}
+
 static void destroy_tdata(pj_stun_tx_data *tdata)
 {
-    if (tdata->client_tsx) {
-        tsx_erase(tdata->sess, tdata);
-        pj_stun_client_tsx_destroy(tdata->client_tsx);
-        tdata->client_tsx = NULL;
-    }
     if (tdata->res_timer.id != PJ_FALSE) {
         pj_timer_heap_cancel(tdata->sess->cfg->timer_heap, 
@@ -162 +170 @@
         pj_list_erase(tdata);
     }
-    pj_pool_release(tdata->pool);
+
+    if (tdata->client_tsx) {
+        pj_time_val delay = {2, 0};
+        tsx_erase(tdata->sess, tdata);
+        pj_stun_client_tsx_schedule_destroy(tdata->client_tsx, &delay);
+        tdata->client_tsx = NULL;
+
+    } else {
+        pj_pool_release(tdata->pool);
+    }
 }
 
@@ -307 +324 @@
 
 
-static void tsx_on_complete(pj_stun_client_tsx *tsx,
-                            pj_status_t status, 
-                            const pj_stun_msg *response)
+static void stun_tsx_on_complete(pj_stun_client_tsx *tsx,
+                                 pj_status_t status, 
+                                 const pj_stun_msg *response)
 {
     pj_stun_tx_data *tdata;
@@ -321 +338 @@
 }
 
-static pj_status_t tsx_on_send_msg(pj_stun_client_tsx *tsx,
-                                   const void *stun_pkt,
-                                   pj_size_t pkt_size)
+static pj_status_t stun_tsx_on_send_msg(pj_stun_client_tsx *tsx,
+                                        const void *stun_pkt,
+                                        pj_size_t pkt_size)
 {
     pj_stun_tx_data *tdata;
@@ -442 +459 @@
 PJ_DEF(pj_status_t) pj_stun_session_create_req(pj_stun_session *sess,
                                                int method,
+                                               const pj_uint8_t tsx_id[12],
                                                pj_stun_tx_data **p_tdata)
 {
@@ -449 +467 @@
     PJ_ASSERT_RETURN(sess && p_tdata, PJ_EINVAL);
 
-    status = create_request_tdata(sess, method, &tdata);
+    status = create_request_tdata(sess, method, tsx_id, &tdata);
     if (status != PJ_SUCCESS)
         return status;
@@ -766 +784 @@
     tdata = tsx_lookup(sess, msg);
     if (tdata == NULL) {
-        PJ_LOG(5,(SNAME(sess), 
+        PJ_LOG(4,(SNAME(sess), 
                   "Transaction not found, response silently discarded"));
         return PJ_SUCCESS;