diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-04-06 11:01:16 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-04-06 11:01:16 -0500 |
| commit | 09ec2dbbf3939b8eb481c589007740b89da15189 (patch) | |
| tree | 29daaa7f67d3ff83455ee8196474109ad65bc66c | |
| parent | 0b00df55fc3d433e1662c370ad8d3f467e57b57d (diff) | |
| parent | 94bd529f9e398c8df9e7855fabd69fa4ec6d2ef6 (diff) | |
Merge "chan_sip: Session Timers required but refused wrongly." into 13
| -rw-r--r-- | channels/chan_sip.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index a67ad634c..96c3b8026 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -25769,8 +25769,7 @@ static int handle_request_update(struct sip_pvt *p, struct sip_request *req) * \retval 0 ok * \retval -1 failure */ -static int handle_request_invite_st(struct sip_pvt *p, struct sip_request *req, - const char *required, int reinvite) +static int handle_request_invite_st(struct sip_pvt *p, struct sip_request *req, int reinvite) { const char *p_uac_se_hdr; /* UAC's Session-Expires header string */ const char *p_uac_min_se; /* UAC's requested Min-SE interval (char string) */ @@ -25850,8 +25849,8 @@ static int handle_request_invite_st(struct sip_pvt *p, struct sip_request *req, case SESSION_TIMER_MODE_REFUSE: if (p->reqsipoptions & SIP_OPT_TIMER) { - transmit_response_with_unsupported(p, "420 Option Disabled", req, required); - ast_log(LOG_WARNING, "Received SIP INVITE with supported but disabled option: %s\n", required); + transmit_response_with_unsupported(p, "420 Option Disabled", req, "timer"); + ast_log(LOG_WARNING, "Received SIP INVITE with supported but disabled option: timer\n"); return -1; } break; @@ -25957,7 +25956,7 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, str * 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 INVITE with unsupported required extension: required:%s unsupported:%s\n", required, unsupported); + ast_log(LOG_WARNING, "Received SIP INVITE with unsupported required extension: %s\n", unsupported); p->invitestate = INV_COMPLETED; if (!p->lastinvite) { sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT); @@ -26395,7 +26394,7 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, str make_our_tag(p); - if (handle_request_invite_st(p, req, required, reinvite)) { + if (handle_request_invite_st(p, req, reinvite)) { p->invitestate = INV_COMPLETED; sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT); res = INV_REQ_ERROR; @@ -26437,7 +26436,7 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, str if (!req->ignore) reinvite = 1; - if (handle_request_invite_st(p, req, required, reinvite)) { + if (handle_request_invite_st(p, req, reinvite)) { p->invitestate = INV_COMPLETED; if (!p->lastinvite) { sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT); |