[svn-commits] oej: branch 1.4 r47572 - in /branches/1.4: ./ channels/chan_sip.c

[svn-commits at lists.digium.com]

Author: oej
Date: Mon Nov 13 13:10:39 2006
New Revision: 47572

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47572
Log:
- Don't reply to INVITE already replied to when we get BYE
- Declare errmsg as int. Oops.

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

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_sip.c?view=diff&rev=47572&r1=47571&r2=47572
==============================================================================
--- branches/1.4/channels/chan_sip.c (original)
+++ branches/1.4/channels/chan_sip.c Mon Nov 13 13:10:39 2006
@@ -10532,7 +10532,7 @@
 {
 	int x = 0;
 	struct sip_history *hist;
-	static errmsg = 0;
+	static int errmsg = 0;
 
 	if (!dialog)
 		return;
@@ -13821,7 +13821,8 @@
 	int res;
 	struct ast_channel *bridged_to;
 	
-	if (p->pendinginvite && !ast_test_flag(&p->flags[0], SIP_OUTGOING) && !ast_test_flag(req, SIP_PKT_IGNORE))
+	/* If we have an INCOMING invite that we haven't answered, terminate that transaction */
+	if (p->pendinginvite && !ast_test_flag(&p->flags[0], SIP_OUTGOING) && !ast_test_flag(req, SIP_PKT_IGNORE) && !p->owner)
 		transmit_response_reliable(p, "487 Request Terminated", &p->initreq);
 
 	copy_request(&p->initreq, req);