[asterisk-commits] mmichelson: branch certified-1.8.28 r428430 - in /certified/branches/1.8.28: ...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Nov 20 10:42:31 2014
New Revision: 428430

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=428430
Log:
Fix error with mixed address family ACLs.

Prior to this commit, the address family of the first item in an ACL
was used to compare all incoming traffic. This could lead to traffic
of other IP address families bypassing ACLs.

ASTERISK-24469 #close

Reported by Matt Jordan
Patches:
	ASTERISK-24469-11.diff uploaded by Matt Jordan (License #6283)

AST-2014-012
........

Merged revisions 428402 from http://svn.asterisk.org/svn/asterisk/branches/1.8

Modified:
    certified/branches/1.8.28/   (props changed)
    certified/branches/1.8.28/main/acl.c

Propchange: certified/branches/1.8.28/
------------------------------------------------------------------------------
--- branch-1.8-merged (original)
+++ branch-1.8-merged Thu Nov 20 10:42:31 2014
@@ -1,1 +1,1 @@
-/branches/1.8:1-415260,415841,416066,419630,420434,425985,428331
+/branches/1.8:1-415260,415841,416066,419630,420434,425985,428331,428402

Modified: certified/branches/1.8.28/main/acl.c
URL: http://svnview.digium.com/svn/asterisk/certified/branches/1.8.28/main/acl.c?view=diff&rev=428430&r1=428429&r2=428430
==============================================================================
--- certified/branches/1.8.28/main/acl.c (original)
+++ certified/branches/1.8.28/main/acl.c Thu Nov 20 10:42:31 2014
@@ -533,7 +533,7 @@
 		ast_copy_string(iabuf2, ast_inet_ntoa(ha->netaddr), sizeof(iabuf2));
 		ast_debug(1, "##### Testing %s with %s\n", iabuf, iabuf2);
 #endif
-		if (ast_sockaddr_is_ipv4(&ha->addr)) {
+		if (ast_sockaddr_is_ipv4(&current_ha->addr)) {
 			if (ast_sockaddr_is_ipv6(addr)) {
 				if (ast_sockaddr_is_ipv4_mapped(addr)) {
 					/* IPv4 ACLs apply to IPv4-mapped addresses */