diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2013-11-14 09:36:05 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2013-11-14 09:36:05 +0000 |
| commit | e0ef71b2cd8727ef95ee9be852d824c98d2ff3ca (patch) | |
| tree | 4d1530635e0efa02aacde92258f538a118bbdd83 | |
| parent | a9f228f17c309ad59cd014b5edc6f792e9c3753a (diff) | |
Re #1630 (misc): Prevent retransmit timer cancellation during retransmission of STUN request.
This is related to ticket #1620: Fix the calculation of transmission count during retransmission of STUN request. If mod_count is set to PJ_FALSE, retransmit timer shouldn't be cancelled.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4652 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjnath/src/pjnath/stun_transaction.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pjnath/src/pjnath/stun_transaction.c b/pjnath/src/pjnath/stun_transaction.c index 33fccea4..aede7bc6 100644 --- a/pjnath/src/pjnath/stun_transaction.c +++ b/pjnath/src/pjnath/stun_transaction.c @@ -387,8 +387,10 @@ PJ_DEF(pj_status_t) pj_stun_client_tsx_retransmit(pj_stun_client_tsx *tsx, return PJ_SUCCESS; } - pj_timer_heap_cancel_if_active(tsx->timer_heap, &tsx->retransmit_timer, - TIMER_INACTIVE); + if (mod_count) { + pj_timer_heap_cancel_if_active(tsx->timer_heap, &tsx->retransmit_timer, + TIMER_INACTIVE); + } return tsx_transmit_msg(tsx, mod_count); } |