aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-12-03 14:11:53 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-12-03 14:11:53 +0000
commit56ff6e011ec4f10a55234a6e9cebfbb6dc656b4e (patch)
treebe428465bb4b7ef5f3c8c23e5880789aa84c81a3 /channels
parentc874e12308ba26e4c96097d729822653feb646c3 (diff)
Merged revisions 160480 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r160480 | tilghman | 2008-12-03 08:09:35 -0600 (Wed, 03 Dec 2008) | 7 lines Jon Bonilla (Manwe) pointed out on the -dev list: "I guess that having only ip-phones in mind is not a good approach. Since it is possible to have a sip proxy connected to asterisk we could receive a 407 (unauthorized) or 483 (too many hops) as response and dialog ending would not be a good behavior." So modified. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@160481 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d345d9e1b..7dcdf5aa0 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -16802,13 +16802,12 @@ static void handle_response(struct sip_pvt *p, int resp, char *rest, struct sip_
/* 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.
+ * and session. 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 of those responses to a BYE.
*/
- if (resp >= 400 && resp < 500 && sipmethod == SIP_BYE) {
+ if ((resp == 404 || resp == 408 || resp == 481) && sipmethod == SIP_BYE) {
pvt_set_needdestroy(p, "received 4XX response to a BYE");
return;
}