kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 15:49:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 340577 via svnmerge from

Browse Source 
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
This commit is contained in:
Stefan Schmidt
2011-10-12 21:28:52 +00:00
parent e7ebf7d5ab
commit ee8844782c
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
channels/chan_sip.c
View 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)) { if (!req->ignore && p->invitestate != INV_CANCELLED && sip_cancel_destroy(p)) {
ast_log(LOG_WARNING, "Unable to cancel SIP destruction. Expect bad things.\n"); 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 (!req->ignore && p->owner) {
if (get_rpid(p, req)) { if (get_rpid(p, req)) {
/* Queue a connected line update */ /* 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)) { if (!req->ignore && (p->invitestate != INV_CANCELLED) && sip_cancel_destroy(p)) {
ast_log(LOG_WARNING, "Unable to cancel SIP destruction. Expect bad things.\n"); 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 (!req->ignore && p->owner) {
if (get_rpid(p, req)) { if (get_rpid(p, req)) {
/* Queue a connected line update */ /* Queue a connected line update */