From: Mark Michelson <mmichelson@digium.com>
Date: Wed, 24 Jun 2009 18:30:09 +0000 (+0000)
Subject: Merged revisions 202967 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d35f9503b2e1eed45c45f9051740600557299cf;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@202969 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 03e35cbc39..b89db1818b 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;
 			}