[asterisk-commits] mmichelson: branch 1.6.0 r113683 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Apr  9 09:42:48 2008
New Revision: 113683

URL: http://svn.digium.com/view/asterisk?view=rev&rev=113683
Log:
Merged revisions 113682 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r113682 | mmichelson | 2008-04-09 09:41:58 -0500 (Wed, 09 Apr 2008) | 17 lines

Merged revisions 113681 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r113681 | mmichelson | 2008-04-09 09:40:05 -0500 (Wed, 09 Apr 2008) | 9 lines

If Asterisk receives a 488 on an INVITE (not a reinvite), then
we should not send a BYE.

(closes issue #12392)
Reported by: fnordian
Patches:
      chan_sip.patch uploaded by fnordian (license 110) with small modification from me


........

................

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.digium.com/view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=113683&r1=113682&r2=113683
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Wed Apr  9 09:42:48 2008
@@ -14781,6 +14781,9 @@
 			if (p->owner && !req->ignore)
 				ast_queue_control(p->owner, AST_CONTROL_CONGESTION);
 			p->needdestroy = 1;
+			/* If there's no dialog to end, then mark p as already gone */
+			if (!reinvite)
+				sip_alreadygone(p);
 		}
 		break;
 	case 491: /* Pending */