From: Stefan Schmidt <sst@sil.at>
Date: Wed, 12 Oct 2011 20:33:37 +0000 (+0000)
Subject: Merged revisions 340576 via svnmerge from
X-Git-Tag: 10.0.0-rc1~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0482a757c3c142e564440a233c1e2e4a9e987312;p=thirdparty%2Fasterisk.git

Merged revisions 340576 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r340576 | schmidts | 2011-10-12 20:30:37 +0000 (Mit, 12 Okt 2011) | 3 lines

  Store route-set from provisional SIP responses so early-dialog requests can be routed properly
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@340577 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 86c7486b48..16063e3191 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -19947,6 +19947,13 @@ static void handle_response_invite(struct sip_pvt *p, int resp, const char *rest
 	case 182:       /* 182 Queued */
 		if (!req->ignore && p->invitestate != INV_CANCELLED && sip_cancel_destroy(p))
 			ast_log(LOG_WARNING, "Unable to cancel SIP destruction.  Expect bad things.\n");
+		/* Store Route-set from provisional SIP responses so
+		 * early-dialog request can be routed properly
+		 * */
+		parse_ok_contact(p, req);
+		if (!reinvite) {
+			build_route(p, req, 1);
+		}
 		if (!req->ignore && p->owner) {
 			if (get_rpid(p, req)) {
 				/* Queue a connected line update */
@@ -20009,6 +20016,13 @@ static void handle_response_invite(struct sip_pvt *p, int resp, const char *rest
 	case 183:	/* Session progress */
 		if (!req->ignore && (p->invitestate != INV_CANCELLED) && sip_cancel_destroy(p))
 			ast_log(LOG_WARNING, "Unable to cancel SIP destruction.  Expect bad things.\n");
+		/* Store Route-set from provisional SIP responses so
+		 * early-dialog request can be routed properly
+		 * */
+		parse_ok_contact(p, req);
+		if (!reinvite) {
+			build_route(p, req, 1);
+		}
 		if (!req->ignore && p->owner) {
 			if (get_rpid(p, req)) {
 				/* Queue a connected line update */