Change sockaddr util function names for consistency and to eliminate name conflicts

(cherry picked from commit f2a3617778cab1695a09f065840907e1227b6d86)

2 files changed, 12 insertions, 12 deletions

diff --git a/source/lib/interface.c b/source/lib/interface.c
index 2e7c2706a06..15fed9e71b2 100644
--- a/source/lib/interface.c
+++ b/source/lib/interface.c
@@ -33,7 +33,7 @@ bool ismyaddr(const struct sockaddr_storage *ip)
 {
 	struct interface *i;
 	for (i=local_interfaces;i;i=i->next) {
-		if (addr_equal(&i->ip,ip)) {
+		if (sockaddr_equal(&i->ip,ip)) {
 			return true;
 		}
 	}
@@ -65,7 +65,7 @@ static struct interface *iface_find(const struct sockaddr_storage *ip,
 			if (same_net(ip, &i->ip, &i->netmask)) {
 				return i;
 			}
-		} else if (addr_equal(&i->ip, ip)) {
+		} else if (sockaddr_equal(&i->ip, ip)) {
 			return i;
 		}
 	}
@@ -93,7 +93,7 @@ void setup_linklocal_scope_id(struct sockaddr_storage *pss)
 {
 	struct interface *i;
 	for (i=local_interfaces;i;i=i->next) {
-		if (addr_equal(&i->ip,pss)) {
+		if (sockaddr_equal(&i->ip,pss)) {
 			struct sockaddr_in6 *psa6 =
 				(struct sockaddr_in6 *)pss;
 			psa6->sin6_scope_id = if_nametoindex(i->name);
@@ -388,7 +388,7 @@ static void interpret_interface(char *token)
 		}
 
 		for (i=0;i<total_probed;i++) {
-			if (addr_equal(&ss, &probed_ifaces[i].ip)) {
+			if (sockaddr_equal(&ss, &probed_ifaces[i].ip)) {
 				add_interface(&probed_ifaces[i]);
 				return;
 			}
@@ -441,7 +441,7 @@ static void interpret_interface(char *token)
 	make_net(&ss_net, &ss, &ss_mask);
 
 	/* Maybe the first component was a broadcast address. */
-	if (addr_equal(&ss_bcast, &ss) || addr_equal(&ss_net, &ss)) {
+	if (sockaddr_equal(&ss_bcast, &ss) || sockaddr_equal(&ss_net, &ss)) {
 		for (i=0;i<total_probed;i++) {
 			if (same_net(&ss, &probed_ifaces[i].ip, &ss_mask)) {
 				/* Temporarily replace netmask on
diff --git a/source/lib/util_sock.c b/source/lib/util_sock.c
index e20768ed892..e64b0036bfd 100644
--- a/source/lib/util_sock.c
+++ b/source/lib/util_sock.c
@@ -234,7 +234,7 @@ bool interpret_string_addr(struct sockaddr_storage *pss,
 	}
 #endif
 
-	zero_addr(pss);
+	zero_sockaddr(pss);
 
 	if (!interpret_string_addr_internal(&res, str, flags|AI_ADDRCONFIG)) {
 		return false;
@@ -334,7 +334,7 @@ void zero_ip_v4(struct in_addr *ip)
  Set an address to INADDR_ANY.
 ******************************************************************/
 
-void zero_addr(struct sockaddr_storage *pss)
+void zero_sockaddr(struct sockaddr_storage *pss)
 {
 	memset(pss, '\0', sizeof(*pss));
 	/* Ensure we're at least a valid sockaddr-storage. */
@@ -429,8 +429,8 @@ bool same_net(const struct sockaddr_storage *ip1,
  Are two sockaddr_storage's the same family and address ? Ignore port etc.
 ********************************************************************/
 
-bool addr_equal(const struct sockaddr_storage *ip1,
-		const struct sockaddr_storage *ip2)
+bool sockaddr_equal(const struct sockaddr_storage *ip1,
+		    const struct sockaddr_storage *ip2)
 {
 	if (ip1->ss_family != ip2->ss_family) {
 		/* Never the same. */
@@ -1659,7 +1659,7 @@ static bool matchname(const char *remotehost,
 		if (!res->ai_addr) {
 			continue;
 		}
-		if (addr_equal((const struct sockaddr_storage *)res->ai_addr,
+		if (sockaddr_equal((const struct sockaddr_storage *)res->ai_addr,
 					pss)) {
 			freeaddrinfo(ailist);
 			return true;
@@ -1772,7 +1772,7 @@ const char *get_peer_name(int fd, bool force_lookup)
 	p = get_peer_addr_internal(fd, addr_buf, sizeof(addr_buf), &ss, &length);
 
 	/* it might be the same as the last one - save some DNS work */
-	if (addr_equal(&ss, &nc.ss)) {
+	if (sockaddr_equal(&ss, &nc.ss)) {
 		return nc.name ? nc.name : "UNKNOWN";
 	}
 
@@ -2091,7 +2091,7 @@ bool is_myname_or_ipaddr(const char *s)
 		}
 		n = get_interfaces(nics, MAX_INTERFACES);
 		for (i=0; i<n; i++) {
-			if (addr_equal(&nics[i].ip, &ss)) {
+			if (sockaddr_equal(&nics[i].ip, &ss)) {
 				TALLOC_FREE(nics);
 				return true;
 			}