aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-05 15:31:37 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-05 15:31:37 +0000
commita07c2c9944dc56f072d65f3d5ad5e56d8cdd9378 (patch)
tree866fd10a4bc5706fe350e50d850ea2071ec697c9 /channels
parent9792167e6a5593f7cabe4cb9dd6f9593eeea95f9 (diff)
Merged revisions 106036 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r106036 | tilghman | 2008-03-05 09:23:32 -0600 (Wed, 05 Mar 2008) | 15 lines Merged revisions 106015 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r106015 | tilghman | 2008-03-05 09:17:16 -0600 (Wed, 05 Mar 2008) | 7 lines Correctly initialize retransid in SIP, and ensure that the warning when failing to delete a schedule entry can actually hit the log. (closes issue #12140) Reported by: slavon Patches: sch2.patch uploaded by slavon (license 288) (Patch slightly modified by me) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@106037 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 4ed3e3d75..014f9812f 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -2817,6 +2817,7 @@ static enum sip_result __sip_reliable_xmit(struct sip_pvt *p, int seqno, int res
pkt->next = p->packets;
p->packets = pkt; /* Add it to the queue */
pkt->timer_t1 = p->timer_t1; /* Set SIP timer T1 */
+ pkt->retransid = -1;
if (pkt->timer_t1)
siptimer_a = pkt->timer_t1 * 2;