From: Stefan Schmidt <sst@sil.at>
Date: Thu, 13 Oct 2011 07:05:43 +0000 (+0000)
Subject: Merged revisions 340718 via svnmerge from
X-Git-Tag: 11.0.0-beta1~1036
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c48bee8e820bc0c43d1ae232554f33a7683e90f3;p=thirdparty%2Fasterisk.git

Merged revisions 340718 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r340718 | schmidts | 2011-10-13 06:59:50 +0000 (Thu, 13 Oct 2011) | 9 lines

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

  ........
    r340717 | schmidts | 2011-10-13 06:58:00 +0000 (Thu, 13 Oct 2011) | 3 lines

    storing the route-set also on a 181 response not only on 180,182 or 183.
  ........
................


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 387c1e7005..2d340f735a 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -20036,6 +20036,13 @@ static void handle_response_invite(struct sip_pvt *p, int resp, const char *rest
 	case 181:	/* Call Is Being Forwarded */
 		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) {
 			struct ast_party_redirecting redirecting;
 			struct ast_set_party_redirecting update_redirecting;