Merged revisions 340577 via svnmerge from
authorStefan Schmidt <sst@sil.at>
Wed, 12 Oct 2011 21:28:52 +0000 (21:28 +0000)
committerStefan Schmidt <sst@sil.at>
Wed, 12 Oct 2011 21:28:52 +0000 (21:28 +0000)
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r340577 | schmidts | 2011-10-12 20:33:37 +0000 (Mit, 12 Okt 2011) | 9 lines

  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/trunk@340626 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

index 83af750..8308225 100644 (file)
@@ -19985,6 +19985,13 @@ static void handle_response_invite(struct sip_pvt *p, int resp, const char *rest
                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 */
@@ -20049,6 +20056,13 @@ static void handle_response_invite(struct sip_pvt *p, int resp, const char *rest
                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 */