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

Timestamp:

Apr 3, 2007 6:01:27 PM (16 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_transaction.c (modified) (12 diffs)

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

@@ -37 +37 @@
 
     pj_bool_t            complete;
-    \
+
     pj_bool_t            require_retransmit;
-    pj_timer_entry       timer;
+    pj_timer_entry       retransmit_timer;
     unsigned             transmit_count;
     pj_time_val          retransmit_time;
+
+    pj_timer_entry       destroy_timer;
 
     void                *last_pkt;
@@ -50 +52 @@
 static void retransmit_timer_callback(pj_timer_heap_t *timer_heap, 
                                       pj_timer_entry *timer);
+static void destroy_timer_callback(pj_timer_heap_t *timer_heap, 
+                                   pj_timer_entry *timer);
 
 #define stun_perror(tsx,msg,rc) pjnath_perror(tsx->obj_name, msg, rc)
@@ -70 +74 @@
     pj_memcpy(&tsx->cb, cb, sizeof(*cb));
 
-    tsx->timer.cb = &retransmit_timer_callback;
-    tsx->timer.user_data = tsx;
+    tsx->retransmit_timer.cb = &retransmit_timer_callback;
+    tsx->retransmit_timer.user_data = tsx;
+
+    tsx->destroy_timer.cb = &destroy_timer_callback;
+    tsx->destroy_timer.user_data = tsx;
 
     pj_ansi_snprintf(tsx->obj_name, sizeof(tsx->obj_name), "stuntsx%p", tsx);
@@ -82 +89 @@
 
 
-/*
- * .
+PJ_DEF(pj_status_t) 
+pj_stun_client_tsx_schedule_destroy(pj_stun_client_tsx *tsx,
+                                    const pj_time_val *delay)
+{
+    pj_status_t status;
+
+    PJ_ASSERT_RETURN(tsx && delay, PJ_EINVAL);
+    PJ_ASSERT_RETURN(tsx->cb.on_destroy, PJ_EINVAL);
+
+    /* Cancel previously registered timer */
+    if (tsx->destroy_timer.id != 0) {
+        pj_timer_heap_cancel(tsx->cfg->timer_heap, &tsx->destroy_timer);
+        tsx->destroy_timer.id = 0;
+    }
+
+    /* 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,
+                                    &tsx->destroy_timer, delay);
+    if (status != PJ_SUCCESS)
+        return status;
+
+    tsx->destroy_timer.id = TIMER_ACTIVE;
+
+    return PJ_SUCCESS;
+}
+
+
+/*
+ * Destroy transaction immediately.
  */
 PJ_DEF(pj_status_t) pj_stun_client_tsx_destroy(pj_stun_client_tsx *tsx)
@@ -89 +128 @@
     PJ_ASSERT_RETURN(tsx, PJ_EINVAL);
 
-    if (tsx->timer.id != 0) {
-        pj_timer_heap_cancel(tsx->cfg->timer_heap, &tsx->timer);
-        tsx->timer.id = 0;
-    }
+    if (tsx->retransmit_timer.id != 0) {
+        pj_timer_heap_cancel(tsx->cfg->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);
+        tsx->destroy_timer.id = 0;
+    }
+
+    PJ_LOG(5,(tsx->obj_name, "STUN client transaction destroyed"));
     return PJ_SUCCESS;
 }
@@ -136 +181 @@
     pj_status_t status;
 
-    PJ_ASSERT_RETURN(tsx->timer.id == 0, PJ_EBUSY);
+    PJ_ASSERT_RETURN(tsx->retransmit_timer.id == 0, PJ_EBUSY);
 
     if (tsx->require_retransmit) {
@@ -161 +206 @@
          * cancel transmission).
          */;
-        status = pj_timer_heap_schedule(tsx->cfg->timer_heap, &tsx->timer,
+        status = pj_timer_heap_schedule(tsx->cfg->timer_heap, 
+                                        &tsx->retransmit_timer,
                                         &tsx->retransmit_time);
         if (status != PJ_SUCCESS) {
-            tsx->timer.id = 0;
+            tsx->retransmit_timer.id = 0;
             return status;
         }
-        tsx->timer.id = TIMER_ACTIVE;
+        tsx->retransmit_timer.id = TIMER_ACTIVE;
     }
 
@@ -174 +220 @@
     status = tsx->cb.on_send_msg(tsx, tsx->last_pkt, tsx->last_pkt_size);
     if (status != PJ_SUCCESS) {
-        if (tsx->timer.id != 0) {
-            pj_timer_heap_cancel(tsx->cfg->timer_heap, &tsx->timer);
-            tsx->timer.id = 0;
+        if (tsx->retransmit_timer.id != 0) {
+            pj_timer_heap_cancel(tsx->cfg->timer_heap, 
+                                 &tsx->retransmit_timer);
+            tsx->retransmit_timer.id = 0;
         }
         stun_perror(tsx, "STUN error sending message", status);
@@ -199 +246 @@
 {
     PJ_ASSERT_RETURN(tsx && pkt && pkt_len, PJ_EINVAL);
-    PJ_ASSERT_RETURN(tsx->timer.id == 0, PJ_EBUSY);
+    PJ_ASSERT_RETURN(tsx->retransmit_timer.id == 0, PJ_EBUSY);
 
     /* Encode message */
@@ -224 +271 @@
     if (tsx->transmit_count >= PJ_STUN_MAX_RETRANSMIT_COUNT) {
         /* Retransmission count exceeded. Transaction has failed */
-        tsx->timer.id = 0;
+        tsx->retransmit_timer.id = 0;
         PJ_LOG(4,(tsx->obj_name, "STUN timeout waiting for response"));
-        tsx->complete = PJ_TRUE;
-        if (tsx->cb.on_complete) {
-            tsx->cb.on_complete(tsx, PJNATH_ESTUNTIMEDOUT, NULL);
+        if (!tsx->complete) {
+            tsx->complete = PJ_TRUE;
+            if (tsx->cb.on_complete) {
+                tsx->cb.on_complete(tsx, PJNATH_ESTUNTIMEDOUT, NULL);
+            }
         }
         return;
     }
 
-    tsx->timer.id = 0;
+    tsx->retransmit_timer.id = 0;
     status = tsx_transmit_msg(tsx);
     if (status != PJ_SUCCESS) {
-        tsx->timer.id = 0;
-        tsx->complete = PJ_TRUE;
-        if (tsx->cb.on_complete) {
-            tsx->cb.on_complete(tsx, status, NULL);
-        }
-    }
-}
-
+        tsx->retransmit_timer.id = 0;
+        if (!tsx->complete) {
+            tsx->complete = PJ_TRUE;
+            if (tsx->cb.on_complete) {
+                tsx->cb.on_complete(tsx, status, NULL);
+            }
+        }
+    }
+}
+
+
+/* Timer callback to destroy transaction */
+static void destroy_timer_callback(pj_timer_heap_t *timer_heap, 
+                                   pj_timer_entry *timer)
+{
+    pj_stun_client_tsx *tsx = (pj_stun_client_tsx *) timer->user_data;
+
+    PJ_UNUSED_ARG(timer_heap);
+
+    tsx->destroy_timer.id = PJ_FALSE;
+    tsx->cb.on_destroy(tsx);
+    /* Don't access transaction after this */
+}
 
 
@@ -268 +332 @@
      * We can cancel retransmit timer now.
      */
-    if (tsx->timer.id) {
-        pj_timer_heap_cancel(tsx->cfg->timer_heap, &tsx->timer);
-        tsx->timer.id = 0;
+    if (tsx->retransmit_timer.id) {
+        pj_timer_heap_cancel(tsx->cfg->timer_heap, &tsx->retransmit_timer);
+        tsx->retransmit_timer.id = 0;
     }
 
@@ -297 +361 @@
 
     /* Call callback */
-    tsx->complete = PJ_TRUE;
-    if (tsx->cb.on_complete) {
-        tsx->cb.on_complete(tsx, status, msg);
-    }
-
-    return PJ_SUCCESS;
-
-}
-
+    if (!tsx->complete) {
+        tsx->complete = PJ_TRUE;
+        if (tsx->cb.on_complete) {
+            tsx->cb.on_complete(tsx, status, msg);
+        }
+    }
+
+    return PJ_SUCCESS;
+
+}
+