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

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Jan 12 09:00:31 2009
New Revision: 168486

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

................
r168485 | mmichelson | 2009-01-12 09:00:00 -0600 (Mon, 12 Jan 2009) | 13 lines

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

........
r168482 | mmichelson | 2009-01-12 08:58:25 -0600 (Mon, 12 Jan 2009) | 5 lines

I am reverting the fix made in revision 168128 (and its upward merges)
after being contacted by Olle Johansson and being shown how this fix is
incorrect. Thanks to Olle for clearing this up for 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/svn-view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=168486&r1=168485&r2=168486
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Mon Jan 12 09:00:31 2009
@@ -13820,7 +13820,6 @@
 	unsigned int event;
 	const char *c = get_header(req, "Content-Type");
 
-	check_via(p, req);
 	/* Need to check the media/type */
 	if (!strcasecmp(c, "application/dtmf-relay") ||
 	    !strcasecmp(c, "application/vnd.nortelnetworks.digits")) {
@@ -16141,7 +16140,6 @@
 	char *eventid = NULL;
 	char *sep;
 
-	check_via(p, req);
 	if( (sep = strchr(event, ';')) ) {	/* XXX bug here - overwriting string ? */
 		*sep++ = '\0';
 		eventid = sep;
@@ -16280,7 +16278,6 @@
 			(this needs to be fixed in 1.4 as well)
 	*/
 
-	check_via(p, req);
 	if (p->lastinvite) {
 		/* if this is a request in an active dialog, just confirm that the dialog exists. */
 		transmit_response_with_allow(p, "200 OK", req, 0);
@@ -17576,7 +17573,6 @@
 
 	int res = 0;
 
-	check_via(p, req);
 	if (req->debug)
 		ast_verbose("Call %s got a SIP call transfer from %s: (REFER)!\n", p->callid, ast_test_flag(&p->flags[0], SIP_OUTGOING) ? "callee" : "caller");
 
@@ -18063,7 +18059,6 @@
 static int handle_request_message(struct sip_pvt *p, struct sip_request *req)
 {
 	if (!req->ignore) {
-		check_via(p, req);
 		if (req->debug)
 			ast_verbose("Receiving message!\n");
 		receive_message(p, req);