[svn-commits] mmichelson: branch 1.6.0 r202968 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed Jun 24 13:29:43 2009
New Revision: 202968

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=202968
Log:
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.
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=202968&r1=202967&r2=202968
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Wed Jun 24 13:29:43 2009
@@ -18377,11 +18377,7 @@
 		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;
 			}