kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use proper response code when violating Contact ACL's.

Browse Source 
Review: https://reviewboard.asterisk.org/r/415/

Thanks kpfleming for a quick review.
(EDVX-003)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@227088 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Olle Johansson
2009-11-03 10:29:59 +00:00
parent e3103c39a7
commit 05390babd0
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
channels/chan_sip.c
View File

@@ -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);