[sr-dev] git:master: tm: fix retransmission disabled case

[Andrei Pelinescu-Onciul]

Module: sip-router
Branch: master
Commit: 8ef99a9eecc8744b028e6a6290defd836d0d40b7
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8ef99a9eecc8744b028e6a6290defd836d0d40b7

Author: Andrei Pelinescu-Onciul <andrei at iptel.org>
Committer: Andrei Pelinescu-Onciul <andrei at iptel.org>
Date:   Mon Aug 22 20:02:02 2011 +0200

tm: fix retransmission disabled case

Commit a92001 broke the magic value (-1) used when retransmissions
were supposed to be disabled.

Reported-by:  Peter Dunkley  peter.dunkley crocodile-rcs com

---

 modules/tm/timer.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/tm/timer.h b/modules/tm/timer.h
index 0d782c0..d506adb 100644
--- a/modules/tm/timer.h
+++ b/modules/tm/timer.h
@@ -201,8 +201,8 @@ inline static int _set_fr_retr(struct retr_buf* rb, unsigned retr_ms)
 	ticks=get_ticks_raw();
 	timeout=rb->my_T->fr_timeout;
 	eol=rb->my_T->end_of_life;
+	retr_ticks = (retr_ms != (unsigned)(-1))?MS_TO_TICKS(retr_ms):retr_ms;
 	/* hack , next retr. int. */
-	retr_ticks = MS_TO_TICKS(retr_ms);
 	rb->timer.data=(void*)(unsigned long)(2*retr_ms);
 	rb->retr_expire=ticks + retr_ticks;
 	if (unlikely(rb->t_active)){