diff options
| author | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-03 16:46:39 +0000 |
|---|---|---|
| committer | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-03 16:46:39 +0000 |
| commit | 32d931ea0d8292fba2d30dc073d2756a85132657 (patch) | |
| tree | 3a7c94dc992ee7b11d4d2625f00aeb56440fa6fc /channels | |
| parent | 71ce4314724a9eb34be6c971620031b2b8537a62 (diff) | |
Merged revisions 102142 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r102142 | oej | 2008-02-03 17:38:12 +0100 (Sön, 03 Feb 2008) | 8 lines
Use the same CSEQ on CANCEL as on INVITE (according to RFC 3261)
(closes issue #9492)
Reported by: kryptolus
Patches:
bug9492.txt uploaded by oej (license 306)
Tested by: oej
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@102143 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index ff18ee88e..0287e6f6b 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -4619,7 +4619,7 @@ static int sip_hangup(struct ast_channel *ast) append_history(p, "DELAY", "Not sending cancel, waiting for timeout"); } else { /* Send a new request: CANCEL */ - transmit_request(p, SIP_CANCEL, p->ocseq, XMIT_RELIABLE, FALSE); + 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. */ needdestroy = 0; @@ -14202,7 +14202,7 @@ 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) - transmit_request(p, SIP_CANCEL, p->ocseq, XMIT_RELIABLE, FALSE); + 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 { |