diff options
| author | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-03 10:29:59 +0000 |
|---|---|---|
| committer | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-03 10:29:59 +0000 |
| commit | efc6e230c375858d135f63db5ea5e3f15a429648 (patch) | |
| tree | fbb9781e2f03df7b243374d0d0ba99181a1b0b1c | |
| parent | d2af5ebe3a4041474768cf620cb9f7bdfe0747fe (diff) | |
Use proper response code when violating Contact ACL's.
Review: https://reviewboard.asterisk.org/r/415/
Thanks kpfleming for a quick review.
(EDVX-003)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@227088 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 7a53c106f..0fdfd4e42 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -283,6 +283,7 @@ enum xmittype { }; enum parse_register_result { + PARSE_REGISTER_DENIED, PARSE_REGISTER_FAILED, PARSE_REGISTER_UPDATE, PARSE_REGISTER_QUERY, @@ -8645,10 +8646,10 @@ static enum parse_register_result parse_register_contact(struct sip_pvt *pvt, st memcpy(&testsin.sin_addr, hp->h_addr, sizeof(testsin.sin_addr)); if ( ast_apply_ha(global_contact_ha, &testsin) != AST_SENSE_ALLOW || ast_apply_ha(peer->contactha, &testsin) != AST_SENSE_ALLOW) { - ast_log(LOG_WARNING, "Host '%s' disallowed by rule\n", n); + ast_log(LOG_WARNING, "Host '%s' disallowed by contact ACL\n", n); *peer->fullcontact = '\0'; ast_string_field_set(pvt, our_contact, ""); - return PARSE_REGISTER_FAILED; + return PARSE_REGISTER_DENIED; } if (!ast_test_flag(&peer->flags[0], SIP_NAT_ROUTE)) { @@ -9270,6 +9271,12 @@ static enum check_auth_result register_verify(struct sip_pvt *p, struct sockaddr /* We have a succesful registration attemp with proper authentication, now, update the peer */ switch (parse_register_contact(p, peer, req)) { + case PARSE_REGISTER_DENIED: + ast_log(LOG_WARNING, "Registration denied because of contact ACL\n"); + transmit_response_with_date(p, "603 Denied", req); + peer->lastmsgssent = -1; + res = 0; + break; case PARSE_REGISTER_FAILED: ast_log(LOG_WARNING, "Failed to parse contact info\n"); transmit_response_with_date(p, "400 Bad Request", req); @@ -9303,6 +9310,12 @@ static enum check_auth_result register_verify(struct sip_pvt *p, struct sockaddr if (sip_cancel_destroy(p)) ast_log(LOG_WARNING, "Unable to cancel SIP destruction. Expect bad things.\n"); switch (parse_register_contact(p, peer, req)) { + case PARSE_REGISTER_DENIED: + ast_log(LOG_WARNING, "Registration denied because of contact ACL\n"); + transmit_response_with_date(p, "403 Forbidden (ACL)", req); + peer->lastmsgssent = -1; + res = 0; + break; case PARSE_REGISTER_FAILED: ast_log(LOG_WARNING, "Failed to parse contact info\n"); transmit_response_with_date(p, "400 Bad Request", req); |