Merged revisions 288345 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r288345 | dvossel | 2010-09-22 11:59:14 -0500 (Wed, 22 Sep 2010) | 16 lines Merged revisions 288344 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r288344 | dvossel | 2010-09-22 11:53:28 -0500 (Wed, 22 Sep 2010) | 9 lines Merged revisions 288343 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r288343 | dvossel | 2010-09-22 11:49:56 -0500 (Wed, 22 Sep 2010) | 2 lines During check_pendings, if the dialog is terminated with a CANCEL, change the invitestate to INV_CANCEL like in sip_hangup. ........ ................ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288346 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
cbabf4c6f7
commit
e6382a2dcb
1 changed files with 3 additions and 2 deletions
|
@ -18610,11 +18610,12 @@ static void check_pendings(struct sip_pvt *p)
|
|||
{
|
||||
if (ast_test_flag(&p->flags[0], SIP_PENDINGBYE)) {
|
||||
/* if we can't BYE, then this is really a pending CANCEL */
|
||||
if (p->invitestate == INV_PROCEEDING || p->invitestate == INV_EARLY_MEDIA)
|
||||
if (p->invitestate == INV_PROCEEDING || p->invitestate == INV_EARLY_MEDIA) {
|
||||
p->invitestate = INV_CANCELLED;
|
||||
transmit_request(p, SIP_CANCEL, p->lastinvite, XMIT_RELIABLE, FALSE);
|
||||
/* Actually don't destroy us yet, wait for the 487 on our original
|
||||
INVITE, but do set an autodestruct just in case we never get it. */
|
||||
else {
|
||||
} else {
|
||||
/* We have a pending outbound invite, don't send something
|
||||
new in-transaction */
|
||||
if (p->pendinginvite)
|
||||
|
|
Loading…
Reference in a new issue