From 72c50a1b183c5e993a27fac51c72b60a8bdb8bf7 Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Fri, 10 Jul 2009 15:38:19 +0000 Subject: Ticket #916: Crash in TURN client when TCP connection is used git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2831 74dad513-b988-da41-8d7b-12977e46ad98 --- pjnath/src/pjnath/stun_transaction.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pjnath/src') diff --git a/pjnath/src/pjnath/stun_transaction.c b/pjnath/src/pjnath/stun_transaction.c index 7360239d..1d8a33f3 100644 --- a/pjnath/src/pjnath/stun_transaction.c +++ b/pjnath/src/pjnath/stun_transaction.c @@ -184,7 +184,8 @@ static pj_status_t tsx_transmit_msg(pj_stun_client_tsx *tsx) { pj_status_t status; - PJ_ASSERT_RETURN(tsx->retransmit_timer.id == 0, PJ_EBUSY); + PJ_ASSERT_RETURN(tsx->retransmit_timer.id == 0 || + !tsx->require_retransmit, PJ_EBUSY); if (tsx->require_retransmit) { /* Calculate retransmit/timeout delay */ @@ -289,6 +290,7 @@ PJ_DEF(pj_status_t) pj_stun_client_tsx_send_msg(pj_stun_client_tsx *tsx, tsx->retransmit_timer.id = 0; return status; } + tsx->retransmit_timer.id = TIMER_ACTIVE; } /* Send the message */ -- cgit v1.2.3