diff options
author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-24 17:05:12 +0000 |
---|---|---|
committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-24 17:05:12 +0000 |
commit | 300387c1c3f9537fb75b89955eb5c191ad869639 (patch) | |
tree | 6af74cd7c941496fbf59a6b3d7ec971a2062722d /channels | |
parent | a78d846e50e23553ce04c0126e01598d749c952d (diff) |
Inspect Require header on BYE transaction according to RFC3261 section 8.2.2.3.
ABE-2293
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@288821 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_sip.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 11473b5de..f3d2c2f03 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -22252,7 +22252,8 @@ static int handle_request_bye(struct sip_pvt *p, struct sip_request *req) struct ast_channel *c=NULL; int res; struct ast_channel *bridged_to; - + const char *required; + /* If we have an INCOMING invite that we haven't answered, terminate that transaction */ if (p->pendinginvite && !ast_test_flag(&p->flags[0], SIP_OUTGOING) && !req->ignore) { transmit_response_reliable(p, "487 Request Terminated", &p->initreq); @@ -22373,7 +22374,23 @@ static int handle_request_bye(struct sip_pvt *p, struct sip_request *req) ast_debug(3, "Received bye, no owner, selfdestruct soon.\n"); } ast_clear_flag(&p->flags[1], SIP_PAGE2_DIALOG_ESTABLISHED); - transmit_response(p, "200 OK", req); + + /* Find out what they require */ + required = get_header(req, "Require"); + if (!ast_strlen_zero(required)) { + char unsupported[256] = { 0, }; + parse_sip_options(required, unsupported, ARRAY_LEN(unsupported)); + /* If there are any options required that we do not support, + * then send a 420 with only those unsupported options listed */ + if (!ast_strlen_zero(unsupported)) { + transmit_response_with_unsupported(p, "420 Bad extension (unsupported)", req, unsupported); + ast_log(LOG_WARNING, "Received SIP BYE with unsupported required extension: required:%s unsupported:%s\n", required, unsupported); + } else { + transmit_response(p, "200 OK", req); + } + } else { + transmit_response(p, "200 OK", req); + } return 1; } |