[asterisk-commits] jrose: branch 12 r398991 - in /branches/12: ./ channels/ channels/sip/include/

[SVN commits to the Asterisk project]

Author: jrose
Date: Thu Sep 12 15:20:46 2013
New Revision: 398991

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=398991
Log:
chan_sip: Revert r398835 due to failing tests involving originate

(issue ASTERISK-22424)
Reported by: Jonathan Rose
........

Merged revisions 398977 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 398986 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    branches/12/   (props changed)
    branches/12/channels/chan_sip.c
    branches/12/channels/sip/include/sip.h

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/channels/chan_sip.c?view=diff&rev=398991&r1=398990&r2=398991
==============================================================================
--- branches/12/channels/chan_sip.c (original)
+++ branches/12/channels/chan_sip.c Thu Sep 12 15:20:46 2013
@@ -23250,15 +23250,6 @@
 					ast_set_flag(&p->flags[0], SIP_PENDINGBYE);
 				}
 			ast_rtp_instance_activate(p->rtp);
-		} else if (!reinvite) {
-			struct ast_sockaddr remote_address = {{0,}};
-
-			ast_rtp_instance_get_remote_address(p->rtp, &remote_address);
-			if (ast_sockaddr_isnull(&remote_address) || (!ast_strlen_zero(p->theirprovtag) && strcmp(p->theirtag, p->theirprovtag))) {
-				ast_log(LOG_WARNING, "Received response: \"200 OK\" from '%s' without SDP\n", p->relatedpeer->name);
-				ast_set_flag(&p->flags[0], SIP_PENDINGBYE);
-				ast_rtp_instance_activate(p->rtp);
-			}
 		}
 
 		if (!req->ignore && p->owner) {
@@ -24209,11 +24200,7 @@
 
 		gettag(req, "To", tag, sizeof(tag));
 		ast_string_field_set(p, theirtag, tag);
-	} else {
-		/* Store theirtag to track for changes when 200 responses to invites are received without SDP */
-		ast_string_field_set(p, theirprovtag, p->theirtag);
-	}
-
+	}
 	/* This needs to be configurable on a channel/peer level,
 	   not mandatory for all communication. Sadly enough, NAT implementations
 	   are not so stable so we can always rely on these headers.

Modified: branches/12/channels/sip/include/sip.h
URL: http://svnview.digium.com/svn/asterisk/branches/12/channels/sip/include/sip.h?view=diff&rev=398991&r1=398990&r2=398991
==============================================================================
--- branches/12/channels/sip/include/sip.h (original)
+++ branches/12/channels/sip/include/sip.h Thu Sep 12 15:20:46 2013
@@ -1019,7 +1019,6 @@
 		AST_STRING_FIELD(rdnis);        /*!< Referring DNIS */
 		AST_STRING_FIELD(redircause);   /*!< Referring cause */
 		AST_STRING_FIELD(theirtag);     /*!< Their tag */
-		AST_STRING_FIELD(theirprovtag); /*!< Provisional their tag, used when evaluating responses to invites */
 		AST_STRING_FIELD(tag);          /*!< Our tag for this session */
 		AST_STRING_FIELD(username);     /*!< [user] name */
 		AST_STRING_FIELD(peername);     /*!< [peer] name, not set if [user] */