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

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4352 74dad513-b988-da41-8d7b-12977e46ad98

5 files changed, 23 insertions, 13 deletions

diff --git a/pjnath/include/pjnath/stun_session.h b/pjnath/include/pjnath/stun_session.h
index 9e608376..22551a8f 100644
--- a/pjnath/include/pjnath/stun_session.h
+++ b/pjnath/include/pjnath/stun_session.h
@@ -682,6 +682,8 @@ PJ_DECL(pj_status_t) pj_stun_session_cancel_req(pj_stun_session *sess,
  *
  * @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.
  *		    This function will return PJNATH_ESTUNDESTROYED if 
@@ -689,7 +691,8 @@ PJ_DECL(pj_status_t) pj_stun_session_cancel_req(pj_stun_session *sess,
  *		    callback.
  */
 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);
 
 
 /**
diff --git a/pjnath/include/pjnath/stun_transaction.h b/pjnath/include/pjnath/stun_transaction.h
index 61d563ea..1f10fb7d 100644
--- a/pjnath/include/pjnath/stun_transaction.h
+++ b/pjnath/include/pjnath/stun_transaction.h
@@ -234,13 +234,16 @@ PJ_DECL(pj_status_t) pj_stun_client_tsx_send_msg(pj_stun_client_tsx *tsx,
  * but this functionality is needed by ICE.
  *
  * @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 
  *			when the user has destroyed the transaction in 
  *			\a on_send_msg() callback, or any other error code
  *			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);
 
 
 /**
diff --git a/pjnath/src/pjnath/ice_session.c b/pjnath/src/pjnath/ice_session.c
index 40e10d55..83199618 100644
--- a/pjnath/src/pjnath/ice_session.c
+++ b/pjnath/src/pjnath/ice_session.c
@@ -2742,7 +2742,7 @@ static void handle_incoming_check(pj_ice_sess *ice,
 	    LOG5((ice->obj_name, "Triggered check for check %d not performed "
 		  "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();
 
 	} else if (c->state == PJ_ICE_SESS_CHECK_STATE_SUCCEEDED) {
diff --git a/pjnath/src/pjnath/stun_session.c b/pjnath/src/pjnath/stun_session.c
index 74276b26..4feae906 100644
--- a/pjnath/src/pjnath/stun_session.c
+++ b/pjnath/src/pjnath/stun_session.c
@@ -1054,7 +1054,8 @@ PJ_DEF(pj_status_t) pj_stun_session_cancel_req( pj_stun_session *sess,
  * Explicitly request retransmission of the request.
  */
 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;
 
@@ -1065,7 +1066,7 @@ PJ_DEF(pj_status_t) pj_stun_session_retransmit_req(pj_stun_session *sess,
     pj_atomic_inc(sess->busy);
     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);
 
diff --git a/pjnath/src/pjnath/stun_transaction.c b/pjnath/src/pjnath/stun_transaction.c
index ab16b32c..8677d322 100644
--- a/pjnath/src/pjnath/stun_transaction.c
+++ b/pjnath/src/pjnath/stun_transaction.c
@@ -180,14 +180,15 @@ PJ_DEF(void*) pj_stun_client_tsx_get_data(pj_stun_client_tsx *tsx)
 /*
  * 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;
 
     PJ_ASSERT_RETURN(tsx->retransmit_timer.id == 0 ||
 		     !tsx->require_retransmit, PJ_EBUSY);
 
-    if (tsx->require_retransmit) {
+    if (tsx->require_retransmit && mod_count) {
 	/* Calculate retransmit/timeout delay */
 	if (tsx->transmit_count == 0) {
 	    tsx->retransmit_time.sec = 0;
@@ -221,7 +222,8 @@ static pj_status_t tsx_transmit_msg(pj_stun_client_tsx *tsx)
     }
 
 
-    tsx->transmit_count++;
+    if (mod_count)
+        tsx->transmit_count++;
 
     PJ_LOG(5,(tsx->obj_name, "STUN sending message (transmit count=%d)",
 	      tsx->transmit_count));
@@ -233,7 +235,7 @@ static pj_status_t tsx_transmit_msg(pj_stun_client_tsx *tsx)
     if (status == PJNATH_ESTUNDESTROYED) {
 	/* 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);
 	    tsx->retransmit_timer.id = 0;
@@ -295,7 +297,7 @@ PJ_DEF(pj_status_t) pj_stun_client_tsx_send_msg(pj_stun_client_tsx *tsx,
     }
 
     /* 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) {
 	    pj_timer_heap_cancel(tsx->timer_heap, 
@@ -335,7 +337,7 @@ static void retransmit_timer_callback(pj_timer_heap_t *timer_heap,
     }
 
     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 */
     } else if (status != PJ_SUCCESS) {
@@ -353,7 +355,8 @@ static void retransmit_timer_callback(pj_timer_heap_t *timer_heap,
 /*
  * 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) {
 	return PJ_SUCCESS;
@@ -364,7 +367,7 @@ PJ_DEF(pj_status_t) pj_stun_client_tsx_retransmit(pj_stun_client_tsx *tsx)
 	tsx->retransmit_timer.id = 0;
     }
 
-    return tsx_transmit_msg(tsx);
+    return tsx_transmit_msg(tsx, mod_count);
 }
 
 /* Timer callback to destroy transaction */