[asterisk-commits] oej: branch oej/darjeeling-prack-1.8 r369461 - /team/oej/darjeeling-prack-1.8...

[SVN commits to the Asterisk project]

Author: oej
Date: Thu Jun 28 06:36:58 2012
New Revision: 369461

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=369461
Log:
Please march in order folks. No apples before the bananas. Pineapples, get back in line please.

Modified:
    team/oej/darjeeling-prack-1.8/channels/chan_sip.c

Modified: team/oej/darjeeling-prack-1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/chan_sip.c?view=diff&rev=369461&r1=369460&r2=369461
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/chan_sip.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/chan_sip.c Thu Jun 28 06:36:58 2012
@@ -10573,8 +10573,8 @@
 			add_header(&resp, "X-Asterisk-HangupCauseCode", buf);
 		}
 	}
+	add_prack_respheader(p, &resp, reliable);
 	add_required_respheader(&resp);
-	add_prack_respheader(p, &resp, reliable);
 	return send_response(p, &resp, reliable, seqno);
 }
 
@@ -11834,8 +11834,13 @@
 	if (rpid == TRUE) {
 		add_rpid(&resp, p);
 	}
+	if (ast_test_flag(&p->flags[2], SIP_PAGE3_PRACK) && strncmp(msg, "100", 3) && !strncmp(msg, "1", 1)) {
+		/* SKREP */
+		ast_debug(2, "=!=!=!=!=!= PRACK applied to message \"%s\" \n", msg);
+		reliable = XMIT_PRACK;
+	}
+	add_prack_respheader(p, &resp, reliable);
 	add_required_respheader(&resp);
-	add_prack_respheader(p, &resp, reliable);
 	if (ast_test_flag(&p->flags[0], SIP_OFFER_CC)) {
 		add_cc_call_info_to_response(p, &resp);
 	}
@@ -11855,11 +11860,6 @@
 		ast_log(LOG_ERROR, "Can't add SDP to response, since we have no RTP session allocated. Call-ID %s\n", p->callid);
 	if (reliable && !p->pendinginvite)
 		p->pendinginvite = seqno;		/* Buggy clients sends ACK on RINGING too */
-	if (ast_test_flag(&p->flags[2], SIP_PAGE3_PRACK) && strncmp(msg, "100", 3) && !strncmp(msg, "1", 1)) {
-		/* SKREP */
-		ast_debug(2, "=!=!=!=!=!= PRACK applied to message \"%s\" \n", msg);
-		reliable = XMIT_PRACK;
-	}
 	return send_response(p, &resp, reliable, seqno);
 }