aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authormmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2009-06-24 18:30:09 +0000
committermmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2009-06-24 18:30:09 +0000
commit7587dcbad07ab594961d32eed7ff521acdf8398a (patch)
tree8d2867286be31cc4c0348e3b1b9f172cf2e1b711 /channels
parentd7e47672c2b7ffd8ab648b9d62ce81969fb5b8bc (diff)
Merged revisions 202967 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r202967 | mmichelson | 2009-06-24 13:29:10 -0500 (Wed, 24 Jun 2009) | 9 lines Merged revisions 202966 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r202966 | mmichelson | 2009-06-24 13:28:47 -0500 (Wed, 24 Jun 2009) | 3 lines Use the handy UNLINK macro instead of hand-coding the same thing in-line. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@202969 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 03e35cbc3..b89db1818 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -19248,11 +19248,7 @@ static int handle_request_cancel(struct sip_pvt *p, struct sip_request *req)
for (pkt = p->packets, prev_pkt = NULL; pkt; prev_pkt = pkt, pkt = pkt->next) {
if (pkt->seqno == p->lastinvite && pkt->response_code == 487) {
AST_SCHED_DEL(sched, pkt->retransid);
- if (prev_pkt) {
- prev_pkt->next = pkt->next;
- } else {
- p->packets = pkt->next;
- }
+ UNLINK(pkt, p->packets, prev_pkt);
ast_free(pkt);
break;
}