diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-10-29 17:22:16 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-10-29 17:22:16 +0000 |
| commit | 230e7f0ee09205f656281ee7a77a9eba419d3979 (patch) | |
| tree | 1aa0541109289315328ecb27d4baf75437a6d914 | |
| parent | fab2834579599b592770320dc4e00cb6f63b2a07 (diff) | |
Merged revisions 87342 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r87342 | file | 2007-10-29 14:20:28 -0300 (Mon, 29 Oct 2007) | 6 lines
Fix issue where if both sides of the dialog cancelled the dialog at the same time chan_sip could kepe retransmitting a response for no reason.
(closes issue #9566)
Reported by: atca_pres
Patches:
bug9566.patch uploaded by oej
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87343 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_sip.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index f0187f8d7..2e41ac029 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -4111,6 +4111,7 @@ static int sip_hangup(struct ast_channel *ast) INVITE, but do set an autodestruct just in case we never get it. */ needdestroy = 0; sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT); + p->invitestate = INV_CANCELLED; } if ( p->initid != -1 ) { /* channel still up - reverse dec of inUse counter @@ -4123,6 +4124,7 @@ static int sip_hangup(struct ast_channel *ast) transmit_response_reliable(p, res, &p->initreq); else transmit_response_reliable(p, "603 Declined", &p->initreq); + p->invitestate = INV_TERMINATED; } } else { /* Call is in UP state, send BYE */ if (!p->pendinginvite) { @@ -15560,7 +15562,16 @@ static int handle_request_cancel(struct sip_pvt *p, struct sip_request *req) check_via(p, req); sip_alreadygone(p); - p->invitestate = INV_CANCELLED; + + /* At this point, we could have cancelled the invite at the same time + as the other side sends a CANCEL. Our final reply with error code + might not have been received by the other side before the CANCEL + was sent, so let's just give up retransmissions and waiting for + ACK on our error code. The call is hanging up any way. */ + if (p->invitestate == INV_TERMINATED) + __sip_pretend_ack(p); + else + p->invitestate = INV_CANCELLED; if (p->owner && p->owner->_state == AST_STATE_UP) { /* This call is up, cancel is ignored, we need a bye */ |