[asterisk-commits] mjordan: tag 10.1.3 r356569 - in /tags/10.1.3: ./ channels/

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Feb 23 17:31:06 CST 2012


Author: mjordan
Date: Thu Feb 23 17:31:02 2012
New Revision: 356569

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=356569
Log:
Merge 355733, 356476 for 10.1.3

Removed:
    tags/10.1.3/asterisk-10.1.2-summary.html
    tags/10.1.3/asterisk-10.1.2-summary.txt
Modified:
    tags/10.1.3/   (props changed)
    tags/10.1.3/.version
    tags/10.1.3/ChangeLog
    tags/10.1.3/channels/chan_sip.c

Propchange: tags/10.1.3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 23 17:31:02 2012
@@ -1,1 +1,1 @@
-/branches/10:349732,350553,351289,351308,351505,352015,352228,354496,354543,354548
+/branches/10:349732,350553,351289,351308,351505,352015,352228,354496,354543,354548,355733,356476

Modified: tags/10.1.3/.version
URL: http://svnview.digium.com/svn/asterisk/tags/10.1.3/.version?view=diff&rev=356569&r1=356568&r2=356569
==============================================================================
--- tags/10.1.3/.version (original)
+++ tags/10.1.3/.version Thu Feb 23 17:31:02 2012
@@ -1,1 +1,1 @@
-10.1.2
+10.1.3

Modified: tags/10.1.3/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/10.1.3/ChangeLog?view=diff&rev=356569&r1=356568&r2=356569
==============================================================================
--- tags/10.1.3/ChangeLog (original)
+++ tags/10.1.3/ChangeLog Thu Feb 23 17:31:02 2012
@@ -1,3 +1,55 @@
+2012-02-23  Asterisk Development Team <asteriskteam at digium.com>
+
+	* Asterisk 10.1.3 Released.
+
+	* channels/chan_sip.c: Fix ACK routing for non-2xx responses.
+
+	  When we send an ACK for a 2xx response to an INVITE, we are supposed
+	  to use the learned route set. However, when we receive a non-2xx
+	  final response to an INVITE, we are supposed to send the ACK to the
+	  same place we initially sent the INVITE.
+
+	  We had been doing this up until the changes went in that would build
+	  a route set from provisional responses. That introduced a regression
+	  where we would use the learned route set under all circumstances.
+
+	  With this change, we now will set the destination of our ACK based on
+	  the invitestate. If it is INV_COMPLETED then that means that we have
+	  received a non-2xx final response (INV_TERMINATED indicates a 2xx
+	  response was received).  If it is INV_CANCELLED, then that means the
+	  call is being canceled, which means that we should be ACKing a 487
+	  response.
+
+	  The other change introduced here is setting the invitestate to
+	  INV_CONFIRMED when we send an ACK *after* the reqprep instead of
+	  before. This way, we can tell in reqprep more easily what the
+	  invitestate is prior to sending the ACK.
+
+	  (closes issue ASTERISK-19389)
+ 	  reported by Karsten Wemheuer
+	  patches:
+	    ASTERISK-19389v2.patch uploaded by Mark Michelson (license #5049)
+
+	* channels/chan_sip.c: Fix regressions with regards to route-set
+	  creation on early dialogs.
+
+	  This fixes two main issues:
+	  1. Asterisk would send a CANCEL to the route created by the provisional
+	     response instead of using the same destination it did in the initial
+	     INVITE.
+	  2. If a new route set arrives in a 200 OK than was in the 1XX response
+	     (perfectly possible if our outbound INVITE gets forked), then the
+	     route set in the 200 OK needs to overwrite the route set in the 1XX
+	     response.
+	  (closes issue ASTERISK-19358)
+	  Reported by: Karsten Wemheuer
+	  Tested by: Karsten Wemheuer
+	  patches:
+	   ASTERISK-19358.patch uploaded by Mark Michelson (license 5049)
+	   ASTERISK-19358.patch uploaded by Stefan Schmidt (license 6034)
+
+ 	  Review: https://reviewboard.asterisk.org/r/1749
+
 2012-02-09  Asterisk Development Team <asteriskteam at digium.com>
 
 	* Asterisk 10.1.2 Released.

Modified: tags/10.1.3/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/tags/10.1.3/channels/chan_sip.c?view=diff&rev=356569&r1=356568&r2=356569
==============================================================================
--- tags/10.1.3/channels/chan_sip.c (original)
+++ tags/10.1.3/channels/chan_sip.c Thu Feb 23 17:31:02 2012
@@ -1283,7 +1283,7 @@
 static struct sip_pvt *find_call(struct sip_request *req, struct ast_sockaddr *addr, const int intended_method);
 static void free_old_route(struct sip_route *route);
 static void list_route(struct sip_route *route);
-static void build_route(struct sip_pvt *p, struct sip_request *req, int backwards);
+static void build_route(struct sip_pvt *p, struct sip_request *req, int backwards, int resp);
 static enum check_auth_result register_verify(struct sip_pvt *p, struct ast_sockaddr *addr,
 					      struct sip_request *req, const char *uri);
 static struct sip_pvt *get_sip_pvt_byid_locked(const char *callid, const char *totag, const char *fromtag);
@@ -8023,7 +8023,7 @@
 	ast_string_field_set(p, our_contact, original->our_contact);
 	ast_string_field_set(p, fullcontact, original->fullcontact);
 	parse_ok_contact(p, req);
-	build_route(p, req, 1);
+	build_route(p, req, 1, 0);
 
 	transmit_request(p, SIP_ACK, p->ocseq, XMIT_UNRELIABLE, TRUE);
 	transmit_request(p, SIP_BYE, 0, XMIT_RELIABLE, TRUE);
@@ -10473,7 +10473,15 @@
 	snprintf(tmp, sizeof(tmp), "%d %s", seqno, sip_methods[sipmethod].text);
 
 	add_header(req, "Via", p->via);
-	if (p->route) {
+	/*
+	 * Use the learned route set unless this is a CANCEL on an ACK for a non-2xx
+	 * final response. For a CANCEL or ACK, we have to send to the same destination
+	 * as the original INVITE.
+	 */
+	if (sipmethod == SIP_CANCEL ||
+			(sipmethod == SIP_ACK && (p->invitestate == INV_COMPLETED || p->invitestate == INV_CANCELLED))) {
+		set_destination(p, ast_strdupa(p->uri));
+	} else if (p->route) {
 		set_destination(p, p->route->hop);
 		add_route(req, is_strict ? p->route->next : p->route);
 	}
@@ -13708,13 +13716,13 @@
 {
 	struct sip_request resp;
 	
-	if (sipmethod == SIP_ACK) {
-		p->invitestate = INV_CONFIRMED;
-	}
-
 	reqprep(&resp, p, sipmethod, seqno, newbranch);
 	if (sipmethod == SIP_CANCEL && p->answered_elsewhere) {
 		add_header(&resp, "Reason", "SIP;cause=200;text=\"Call completed elsewhere\"");
+	}
+
+	if (sipmethod == SIP_ACK) {
+		p->invitestate = INV_CONFIRMED;
 	}
 
 	return send_request(p, &resp, reliable, seqno ? seqno : p->ocseq);
@@ -14285,8 +14293,9 @@
 	}
 }
 
-/*! \brief Build route list from Record-Route header */
-static void build_route(struct sip_pvt *p, struct sip_request *req, int backwards)
+/*! \brief Build route list from Record-Route header 
+    \param resp the SIP response code or 0 for a request */
+static void build_route(struct sip_pvt *p, struct sip_request *req, int backwards, int resp)
 {
 	struct sip_route *thishop, *head, *tail;
 	int start = 0;
@@ -14304,8 +14313,11 @@
 		p->route = NULL;
 	}
 
-	/* We only want to create the route set the first time this is called */
-	p->route_persistent = 1;
+	/* We only want to create the route set the first time this is called except
+	   it is called from a provisional response.*/
+	if ((resp < 100) || (resp > 199)) {
+		p->route_persistent = 1;
+	}
 
 	/* Build a tailq, then assign it to p->route when done.
 	 * If backwards, we add entries from the head so they end up
@@ -20288,7 +20300,7 @@
 		 * */
 		parse_ok_contact(p, req);
 		if (!reinvite) {
-			build_route(p, req, 1);
+			build_route(p, req, 1, resp);
 		}
 		if (!req->ignore && p->owner) {
 			if (get_rpid(p, req)) {
@@ -20338,7 +20350,7 @@
 		 * */
 		parse_ok_contact(p, req);
 		if (!reinvite) {
-			build_route(p, req, 1);
+			build_route(p, req, 1, resp);
 		}
 		if (!req->ignore && p->owner) {
 			struct ast_party_redirecting redirecting;
@@ -20364,7 +20376,7 @@
 		 * */
 		parse_ok_contact(p, req);
 		if (!reinvite) {
-			build_route(p, req, 1);
+			build_route(p, req, 1, resp);
 		}
 		if (!req->ignore && p->owner) {
 			if (get_rpid(p, req)) {
@@ -20464,7 +20476,7 @@
 			parse_ok_contact(p, req);
 			/* Save Record-Route for any later requests we make on this dialogue */
 			if (!reinvite)
-				build_route(p, req, 1);
+				build_route(p, req, 1, resp);
 
 			if(set_address_from_contact(p)) {
 				/* Bad contact - we don't know how to reach this device */
@@ -23049,7 +23061,7 @@
 			*recount = 1;
 
 			/* Save Record-Route for any later requests we make on this dialogue */
-			build_route(p, req, 0);
+			build_route(p, req, 0, 0);
 
 			if (c) {
 				ast_party_redirecting_init(&redirecting);
@@ -25014,7 +25026,7 @@
 		if (sipdebug)
 			ast_debug(4, "Initializing initreq for method %s - callid %s\n", sip_methods[req->method].text, p->callid);
 		check_via(p, req);
-		build_route(p, req, 0);
+		build_route(p, req, 0, 0);
 	} else if (req->debug && req->ignore)
 		ast_verbose("Ignoring this SUBSCRIBE request\n");
 




More information about the asterisk-commits mailing list