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

Timestamp:

Aug 22, 2008 5:46:33 PM (16 years ago)

Author:

bennylp

Message:

Ticket #598: Update to draft-ietf-behave-rfc3489bis-18 and draft-ietf-behave-turn-09, and fix other things as well. Please see the ticket for more info

File:

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

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

@@ -252 +252 @@
                                                 unsigned pkt_len)
 {
+    pj_status_t status;
+
     PJ_ASSERT_RETURN(tsx && pkt && pkt_len, PJ_EINVAL);
     PJ_ASSERT_RETURN(tsx->retransmit_timer.id == 0, PJ_EBUSY);
@@ -262 +264 @@
     tsx->require_retransmit = retransmit;
 
+    /* For TCP, schedule timeout timer after PJ_STUN_TIMEOUT_VALUE.
+     * Since we don't have timeout timer, simulate this by using
+     * retransmit timer.
+     */
+    if (!retransmit) {
+        unsigned timeout;
+
+        pj_assert(tsx->retransmit_timer.id == 0);
+        tsx->transmit_count = PJ_STUN_MAX_TRANSMIT_COUNT;
+
+        timeout = tsx->rto_msec * 16;
+        tsx->retransmit_time.sec = timeout / 1000;
+        tsx->retransmit_time.msec = timeout % 1000;
+
+        /* Schedule timer first because when send_msg() failed we can
+         * cancel it (as opposed to when schedule_timer() failed we cannot
+         * cancel transmission).
+         */;
+        status = pj_timer_heap_schedule(tsx->timer_heap, 
+                                        &tsx->retransmit_timer,
+                                        &tsx->retransmit_time);
+        if (status != PJ_SUCCESS) {
+            tsx->retransmit_timer.id = 0;
+            return status;
+        }
+    }
+
     /* Send the message */
-    return tsx_transmit_msg(tsx);
+    status = tsx_transmit_msg(tsx);
+    if (status != PJ_SUCCESS) {
+        if (tsx->retransmit_timer.id != 0) {
+            pj_timer_heap_cancel(tsx->timer_heap, 
+                                 &tsx->retransmit_timer);
+            tsx->retransmit_timer.id = 0;
+        }
+        return status;
+    }
+
+    return PJ_SUCCESS;
 }