Changeset 4352 for pjproject/trunk

Timestamp:

Feb 19, 2013 2:37:28 PM (12 years ago)

Author:

ming

Message:

Fixed #1620: Fix the calculation of transmission count during retransmission of STUN request

Location:

pjproject/trunk/pjnath

Files:

• include/pjnath/stun_session.h (modified) (2 diffs)
• include/pjnath/stun_transaction.h (modified) (2 diffs)
• src/pjnath/ice_session.c (modified) (1 diff)
• src/pjnath/stun_session.c (modified) (2 diffs)
• src/pjnath/stun_transaction.c (modified) (8 diffs)

pjproject/trunk/pjnath/include/pjnath/stun_session.h

@@ -683 +683 @@
  * @param sess      The STUN session instance.
  * @param tdata     The request message previously sent.
+ * @param mod_count Boolean flag to indicate whether transmission count
+ *                  needs to be incremented.
  *
  * @return          PJ_SUCCESS on success, or the appropriate error.
@@ -690 +692 @@
  */
 PJ_DECL(pj_status_t) pj_stun_session_retransmit_req(pj_stun_session *sess,
-                                                    pj_stun_tx_data *tdata);
+                                                    pj_stun_tx_data *tdata,
+                                                    pj_bool_t mod_count);
 
 

pjproject/trunk/pjnath/include/pjnath/stun_transaction.h

@@ -235 +235 @@
  *
  * @param tsx           The STUN client transaction instance.
+ * @param mod_count     Boolean flag to indicate whether transmission count
+ *                      needs to be incremented.
  *
  * @return              PJ_SUCCESS on success, or PJNATH_ESTUNDESTROYED 
@@ -241 +243 @@
  *                      as returned by \a on_send_msg() callback.
  */
-PJ_DECL(pj_status_t) pj_stun_client_tsx_retransmit(pj_stun_client_tsx *tsx);
+PJ_DECL(pj_status_t) pj_stun_client_tsx_retransmit(pj_stun_client_tsx *tsx,
+                                                   pj_bool_t mod_count);
 
 

pjproject/trunk/pjnath/src/pjnath/ice_session.c

@@ -2743 +2743 @@
                   "because it's in progress. Retransmitting", i));
             pj_log_push_indent();
-            pj_stun_session_retransmit_req(comp->stun_sess, c->tdata);
+            pj_stun_session_retransmit_req(comp->stun_sess, c->tdata, PJ_FALSE);
             pj_log_pop_indent();
 

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

@@ -1055 +1055 @@
  */
 PJ_DEF(pj_status_t) pj_stun_session_retransmit_req(pj_stun_session *sess,
-                                                   pj_stun_tx_data *tdata)
+                                                   pj_stun_tx_data *tdata,
+                                                   pj_bool_t mod_count)
 {
     pj_status_t status;
@@ -1066 +1067 @@
     pj_lock_acquire(sess->lock);
 
-    status = pj_stun_client_tsx_retransmit(tdata->client_tsx);
+    status = pj_stun_client_tsx_retransmit(tdata->client_tsx, mod_count);
 
     pj_lock_release(sess->lock);

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

@@ -181 +181 @@
  * Transmit message.
  */
-static pj_status_t tsx_transmit_msg(pj_stun_client_tsx *tsx)
+static pj_status_t tsx_transmit_msg(pj_stun_client_tsx *tsx,
+                                    pj_bool_t mod_count)
 {
     pj_status_t status;
@@ -188 +189 @@
                      !tsx->require_retransmit, PJ_EBUSY);
 
-    if (tsx->require_retransmit) {
+    if (tsx->require_retransmit && mod_count) {
         /* Calculate retransmit/timeout delay */
         if (tsx->transmit_count == 0) {
@@ -222 +223 @@
 
 
-    tsx->transmit_count++;
+    if (mod_count)
+        tsx->transmit_count++;
 
     PJ_LOG(5,(tsx->obj_name, "STUN sending message (transmit count=%d)",
@@ -234 +236 @@
         /* We've been destroyed, don't access the object. */
     } else if (status != PJ_SUCCESS) {
-        if (tsx->retransmit_timer.id != 0) {
+        if (tsx->retransmit_timer.id != 0 && mod_count) {
             pj_timer_heap_cancel(tsx->timer_heap, 
                                  &tsx->retransmit_timer);
@@ -296 +298 @@
 
     /* Send the message */
-    status = tsx_transmit_msg(tsx);
+    status = tsx_transmit_msg(tsx, PJ_TRUE);
     if (status != PJ_SUCCESS) {
         if (tsx->retransmit_timer.id != 0) {
@@ -336 +338 @@
 
     tsx->retransmit_timer.id = 0;
-    status = tsx_transmit_msg(tsx);
+    status = tsx_transmit_msg(tsx, PJ_TRUE);
     if (status == PJNATH_ESTUNDESTROYED) {
         /* We've been destroyed, don't try to access the object */
@@ -354 +356 @@
  * Request to retransmit the request.
  */
-PJ_DEF(pj_status_t) pj_stun_client_tsx_retransmit(pj_stun_client_tsx *tsx)
+PJ_DEF(pj_status_t) pj_stun_client_tsx_retransmit(pj_stun_client_tsx *tsx,
+                                                  pj_bool_t mod_count)
 {
     if (tsx->destroy_timer.id != 0) {
@@ -365 +368 @@
     }
 
-    return tsx_transmit_msg(tsx);
+    return tsx_transmit_msg(tsx, mod_count);
 }