[asterisk-commits] schmidts: trunk r340626 - /trunk/channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: schmidts
Date: Wed Oct 12 16:28:52 2011
New Revision: 340626

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=340626
Log:
Merged revisions 340577 via svnmerge from 
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
  ........
................

Modified:
    trunk/channels/chan_sip.c

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=340626&r1=340625&r2=340626
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Oct 12 16:28:52 2011
@@ -19985,6 +19985,13 @@
 		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 */
@@ -20048,6 +20055,13 @@
 	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)) {