Changeset 1988 for pjproject/trunk/pjnath/src/pjnath/stun_transaction.c

Timestamp:

Jun 6, 2008 2:47:10 PM (16 years ago)

Author:

bennylp

Message:

Major major modifications related to ticket #485 (support for TURN-07):

• Added STUN socket transport pj_stun_sock
• Integration of TURN-07 to ICE
• Major refactoring in ICE stream transport to make it simpler
• Major modification (i.e. API change) in almost everywhere else
• Much more elaborate STUN, TURN, and ICE tests in pjnath-test

File:

• pjproject/trunk/pjnath/src/pjnath/stun_transaction.c (modified) (16 diffs)

pjproject/trunk/pjnath/src/pjnath/stun_transaction.c

@@ -32 +32 @@
 {
     char                 obj_name[PJ_MAX_OBJ_NAME];
-    pj_stun_config      *cfg;
     pj_stun_tsx_cb       cb;
     void                *user_data;
@@ -39 +38 @@
 
     pj_bool_t            require_retransmit;
+    unsigned             rto_msec;
     pj_timer_entry       retransmit_timer;
     unsigned             transmit_count;
     pj_time_val          retransmit_time;
+    pj_timer_heap_t     *timer_heap;
 
     pj_timer_entry       destroy_timer;
@@ -71 +72 @@
 
     tsx = PJ_POOL_ZALLOC_T(pool, pj_stun_client_tsx);
-    tsx->cfg = cfg;
+    tsx->rto_msec = cfg->rto_msec;
+    tsx->timer_heap = cfg->timer_heap;
     pj_memcpy(&tsx->cb, cb, sizeof(*cb));
 
@@ -100 +102 @@
     /* Cancel previously registered timer */
     if (tsx->destroy_timer.id != 0) {
-        pj_timer_heap_cancel(tsx->cfg->timer_heap, &tsx->destroy_timer);
+        pj_timer_heap_cancel(tsx->timer_heap, &tsx->destroy_timer);
         tsx->destroy_timer.id = 0;
     }
@@ -106 +108 @@
     /* Stop retransmission, just in case */
     if (tsx->retransmit_timer.id != 0) {
-        pj_timer_heap_cancel(tsx->cfg->timer_heap, &tsx->retransmit_timer);
-        tsx->retransmit_timer.id = 0;
-    }
-
-    status = pj_timer_heap_schedule(tsx->cfg->timer_heap,
+        pj_timer_heap_cancel(tsx->timer_heap, &tsx->retransmit_timer);
+        tsx->retransmit_timer.id = 0;
+    }
+
+    status = pj_timer_heap_schedule(tsx->timer_heap,
                                     &tsx->destroy_timer, delay);
     if (status != PJ_SUCCESS)
@@ -116 +118 @@
 
     tsx->destroy_timer.id = TIMER_ACTIVE;
+    tsx->cb.on_complete = NULL;
 
     return PJ_SUCCESS;
@@ -129 +132 @@
 
     if (tsx->retransmit_timer.id != 0) {
-        pj_timer_heap_cancel(tsx->cfg->timer_heap, &tsx->retransmit_timer);
+        pj_timer_heap_cancel(tsx->timer_heap, &tsx->retransmit_timer);
         tsx->retransmit_timer.id = 0;
     }
     if (tsx->destroy_timer.id != 0) {
-        pj_timer_heap_cancel(tsx->cfg->timer_heap, &tsx->destroy_timer);
+        pj_timer_heap_cancel(tsx->timer_heap, &tsx->destroy_timer);
         tsx->destroy_timer.id = 0;
     }
@@ -187 +190 @@
         if (tsx->transmit_count == 0) {
             tsx->retransmit_time.sec = 0;
-            tsx->retransmit_time.msec = tsx->cfg->rto_msec;
+            tsx->retransmit_time.msec = tsx->rto_msec;
 
         } else if (tsx->transmit_count < PJ_STUN_MAX_TRANSMIT_COUNT-1) {
@@ -206 +209 @@
          * cancel transmission).
          */;
-        status = pj_timer_heap_schedule(tsx->cfg->timer_heap, 
+        status = pj_timer_heap_schedule(tsx->timer_heap, 
                                         &tsx->retransmit_timer,
                                         &tsx->retransmit_time);
@@ -224 +227 @@
     /* Send message */
     status = tsx->cb.on_send_msg(tsx, tsx->last_pkt, tsx->last_pkt_size);
-    if (status != PJ_SUCCESS) {
+
+    if (status == PJNATH_ESTUNDESTROYED) {
+        /* We've been destroyed, don't access the object. */
+    } else if (status != PJ_SUCCESS) {
         if (tsx->retransmit_timer.id != 0) {
-            pj_timer_heap_cancel(tsx->cfg->timer_heap, 
+            pj_timer_heap_cancel(tsx->timer_heap, 
                                  &tsx->retransmit_timer);
             tsx->retransmit_timer.id = 0;
@@ -280 +286 @@
             }
         }
+        /* We might have been destroyed, don't try to access the object */
         return;
     }
@@ -285 +292 @@
     tsx->retransmit_timer.id = 0;
     status = tsx_transmit_msg(tsx);
-    if (status != PJ_SUCCESS) {
+    if (status == PJNATH_ESTUNDESTROYED) {
+        /* We've been destroyed, don't try to access the object */
+    } else if (status != PJ_SUCCESS) {
         tsx->retransmit_timer.id = 0;
         if (!tsx->complete) {
@@ -293 +302 @@
             }
         }
+        /* We might have been destroyed, don't try to access the object */
     }
 }
@@ -306 +316 @@
 
     if (tsx->retransmit_timer.id != 0) {
-        pj_timer_heap_cancel(tsx->cfg->timer_heap, &tsx->retransmit_timer);
+        pj_timer_heap_cancel(tsx->timer_heap, &tsx->retransmit_timer);
         tsx->retransmit_timer.id = 0;
     }
@@ -352 +362 @@
      */
     if (tsx->retransmit_timer.id) {
-        pj_timer_heap_cancel(tsx->cfg->timer_heap, &tsx->retransmit_timer);
+        pj_timer_heap_cancel(tsx->timer_heap, &tsx->retransmit_timer);
         tsx->retransmit_timer.id = 0;
     }
@@ -385 +395 @@
             tsx->cb.on_complete(tsx, status, msg, src_addr, src_addr_len);
         }
+        /* We might have been destroyed, don't try to access the object */
     }