diff options
author | Mark Michelson <mmichelson@digium.com> | 2008-11-20 17:54:31 +0000 |
---|---|---|
committer | Mark Michelson <mmichelson@digium.com> | 2008-11-20 17:54:31 +0000 |
commit | 2d4e3b21eeec8bd3fc38e20f8b4add83548fea02 (patch) | |
tree | c938dfa9e73cf64664d63b3c054b6f24a04f1ae5 /channels | |
parent | e27f9325ea867d02de1ba348b6cbe3530518b777 (diff) |
Merged revisions 158071 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r158071 | mmichelson | 2008-11-20 11:48:42 -0600 (Thu, 20 Nov 2008) | 16 lines
We don't handle 4XX responses to BYE well. According to
section 15 of RFC 3261, we should terminate a dialog if we
receive a 481 or 408 in response to our BYE. Since I am aware
of at least one phone manufacturer who may sometimes send a
404 as well, I am being liberal and saying that any 4XX response
to a BYE should result in a terminated dialog.
(closes issue #12994)
Reported by: pabelanger
Patches:
12994.patch uploaded by putnopvut (license 60)
Closes AST-129
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158082 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_sip.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index d59339b2f..3bed69966 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -16795,6 +16795,20 @@ static void handle_response(struct sip_pvt *p, int resp, char *rest, struct sip_ Fix assigned to Rizzo :-) */ /* check_via_response(p, req); */ + + /* RFC 3261 Section 15 specifies that if we receive a 408 or 481 + * in response to a BYE, then we should end the current dialog + * and session. There is no mention in the spec of other 4XX responses, + * but it is known that at least one phone manufacturer potentially + * will send a 404 in response to a BYE, so we'll be liberal in what + * we accept and end the dialog and session if we receive any 4XX + * response to a BYE. + */ + if (resp >= 400 && resp < 500 && sipmethod == SIP_BYE) { + ast_set_flag(&p->flags[0], SIP_NEEDDESTROY); + return; + } + if (p->relatedpeer && p->method == SIP_OPTIONS) { /* We don't really care what the response is, just that it replied back. Well, as long as it's not a 100 response... since we might |