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

Timestamp:

May 15, 2007 10:42:56 AM (17 years ago)

Author:

bennylp

Message:

Fixed several STUN bugs: USERNAME, REALM etc are not allowed in the response, retransmission timer calculation bug, etc.

File:

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

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

@@ -189 +189 @@
             tsx->retransmit_time.msec = tsx->cfg->rto_msec;
 
-        } else if (tsx->transmit_count < PJ_STUN_MAX_RETRANSMIT_COUNT-1) {
+        } else if (tsx->transmit_count < PJ_STUN_MAX_TRANSMIT_COUNT-1) {
             unsigned msec;
 
             msec = PJ_TIME_VAL_MSEC(tsx->retransmit_time);
-            msec = (msec << 1) + 100;
+            msec <<= 1;
             tsx->retransmit_time.sec = msec / 1000;
             tsx->retransmit_time.msec = msec % 1000;
@@ -217 +217 @@
 
 
+    tsx->transmit_count++;
+
+    PJ_LOG(5,(tsx->obj_name, "STUN sending message (transmit count=%d)",
+              tsx->transmit_count));
+
     /* Send message */
     status = tsx->cb.on_send_msg(tsx, tsx->last_pkt, tsx->last_pkt_size);
@@ -229 +234 @@
     }
 
-    tsx->transmit_count++;
-
-    PJ_LOG(5,(tsx->obj_name, "STUN sending message (transmit count=%d)",
-              tsx->transmit_count));
     return status;
 }
@@ -269 +270 @@
     PJ_UNUSED_ARG(timer_heap);
 
-    if (tsx->transmit_count >= PJ_STUN_MAX_RETRANSMIT_COUNT) {
+    if (tsx->transmit_count >= PJ_STUN_MAX_TRANSMIT_COUNT) {
         /* Retransmission count exceeded. Transaction has failed */
         tsx->retransmit_timer.id = 0;