[asterisk-commits] oej: branch 1.4 r227088 - /branches/1.4/channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: oej
Date: Tue Nov  3 04:29:59 2009
New Revision: 227088

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=227088
Log:
Use proper response code when violating Contact ACL's.

https://reviewboard.asterisk.org/r/415/

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

Modified:
    branches/1.4/channels/chan_sip.c

Modified: branches/1.4/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/channels/chan_sip.c?view=diff&rev=227088&r1=227087&r2=227088
==============================================================================
--- branches/1.4/channels/chan_sip.c (original)
+++ branches/1.4/channels/chan_sip.c Tue Nov  3 04:29:59 2009
@@ -283,6 +283,7 @@
 };
 
 enum parse_register_result {
+	PARSE_REGISTER_DENIED,
 	PARSE_REGISTER_FAILED,
 	PARSE_REGISTER_UPDATE,
 	PARSE_REGISTER_QUERY,
@@ -8645,10 +8646,10 @@
 	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 @@
 				/* 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 @@
 			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);