[svn-commits] trunk r25612 - in /trunk: ./ channels/chan_sip.c

[svn-commits at lists.digium.com]

Author: oej
Date: Mon May  8 10:31:58 2006
New Revision: 25612

URL: http://svn.digium.com/view/asterisk?rev=25612&view=rev
Log:
Issue #7103 (mikma)
- Don't send reply on ACK
- use "require" instead of "required" which is an unknown header
 (Partly imported from 1.2)

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

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

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?rev=25612&r1=25611&r2=25612&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Mon May  8 10:31:58 2006
@@ -5237,7 +5237,7 @@
 	other end knows and replace the current call with this new call */
 	if (p->options && p->options->replaces && !ast_strlen_zero(p->options->replaces)) {
 		add_header(&req, "Replaces", p->options->replaces);
-		add_header(&req, "Required", "replaces");
+		add_header(&req, "Require", "replaces");
 	}
 
 	if (p->options && !ast_strlen_zero(p->options->distinctive_ring)) {
@@ -10987,7 +10987,7 @@
 	}
 
 	/* Find out what they require */
-	required = get_header(req, "Required");
+	required = get_header(req, "Require");
 	if (!ast_strlen_zero(required)) {
 		required_profile = parse_sip_options(NULL, required);
 		if (required_profile) { 	/* They require something */
@@ -11809,7 +11809,7 @@
 			if (!ast_test_flag(req, SIP_PKT_IGNORE) && req->method == SIP_INVITE) {
 				transmit_response_reliable(p, "481 Call/Transaction Does Not Exist", req);
 				/* Will cease to exist after ACK */
-			} else {
+			} else if (req->method != SIP_ACK) {
 				transmit_response(p, "481 Call/Transaction Does Not Exist", req);
 				ast_set_flag(&p->flags[0], SIP_NEEDDESTROY);
 			}