diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-22 16:49:56 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-22 16:49:56 +0000 |
| commit | 37b1259bc48fe301006499188a7697a3e7a039c9 (patch) | |
| tree | b1605da2f0ed1b3ada3f3cdf58c8b4c072ffe7d8 /channels | |
| parent | 0ff9e0d042aead4110957f4e152886f576e8ddb9 (diff) | |
During check_pendings, if the dialog is terminated with a CANCEL, change the invitestate to INV_CANCEL like in sip_hangup.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@288343 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index aac35178e..b9996c1a5 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -13104,11 +13104,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 someting new in-transaction */ if (p->pendinginvite) |