s3: Change sockaddr util function names for consistency

[samba.git] / source3 / lib / interface.c

diff --git a/source3/lib/interface.c b/source3/lib/interface.c
index 4536990d284a61adfed58b3cd405e99cfe6913be..48fa4d32a93a1e01669f17c623e592fa602287da 100644 (file)
--- a/source3/lib/interface.c
+++ b/source3/lib/interface.c
@@ -33,7 +33,7 @@ bool ismyaddr(const struct sockaddr *ip)
 {
        struct interface *i;
        for (i=local_interfaces;i;i=i->next) {
-               if (addr_equal((struct sockaddr *)&i->ip,ip)) {
+               if (sockaddr_equal((struct sockaddr *)&i->ip,ip)) {
                        return true;
                }
        }
@@ -65,7 +65,7 @@ static struct interface *iface_find(const struct sockaddr *ip,
                        if (same_net(ip, (struct sockaddr *)&i->ip, (struct sockaddr *)&i->netmask)) {
                                return i;
                        }
-               } else if (addr_equal((struct sockaddr *)&i->ip, ip)) {
+               } else if (sockaddr_equal((struct sockaddr *)&i->ip, ip)) {
                        return i;
                }
        }
@@ -93,7 +93,7 @@ void setup_linklocal_scope_id(struct sockaddr *pss)
 {
        struct interface *i;
        for (i=local_interfaces;i;i=i->next) {
-               if (addr_equal((struct sockaddr *)&i->ip,pss)) {
+               if (sockaddr_equal((struct sockaddr *)&i->ip,pss)) {
                        struct sockaddr_in6 *psa6 =
                                (struct sockaddr_in6 *)pss;
                        psa6->sin6_scope_id = if_nametoindex(i->name);
@@ -289,7 +289,7 @@ const struct sockaddr_storage *iface_ip(const struct sockaddr *ip)
 
 bool iface_local(const struct sockaddr *ip)
 {
-       return iface_find(ip, True) ? true : false;
+       return iface_find(ip, true) ? true : false;
 }
 
 /****************************************************************************
@@ -388,7 +388,7 @@ static void interpret_interface(char *token)
                }
 
                for (i=0;i<total_probed;i++) {
-                       if (addr_equal((struct sockaddr *)&ss, (struct sockaddr *)&probed_ifaces[i].ip)) {
+                       if (sockaddr_equal((struct sockaddr *)&ss, (struct sockaddr *)&probed_ifaces[i].ip)) {
                                add_interface(&probed_ifaces[i]);
                                return;
                        }
@@ -441,8 +441,8 @@ static void interpret_interface(char *token)
        make_net(&ss_net, &ss, &ss_mask);
 
        /* Maybe the first component was a broadcast address. */
-       if (addr_equal((struct sockaddr *)&ss_bcast, (struct sockaddr *)&ss) || 
-               addr_equal((struct sockaddr *)&ss_net, (struct sockaddr *)&ss)) {
+       if (sockaddr_equal((struct sockaddr *)&ss_bcast, (struct sockaddr *)&ss) ||
+               sockaddr_equal((struct sockaddr *)&ss_net, (struct sockaddr *)&ss)) {
                for (i=0;i<total_probed;i++) {
                        if (same_net((struct sockaddr *)&ss, 
                                                 (struct sockaddr *)&probed_ifaces[i].ip,