Changeset 228 for branches/samba-3.2.x/source/lib/util_sock.c

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

• branches/samba-3.2.x/source/lib/util_sock.c (modified) (6 diffs)

branches/samba-3.2.x/source/lib/util_sock.c

@@ -235 +235 @@
 #endif
 
-        zero_addr(pss);
+        zero_sockaddr(pss);
 
         if (!interpret_string_addr_internal(&res, str, flags|AI_ADDRCONFIG)) {
@@ -335 +335 @@
 ******************************************************************/
 
-void zero_addr(struct sockaddr_storage *pss)
+void zero_sockaddr(struct sockaddr_storage *pss)
 {
         memset(pss, '\0', sizeof(*pss));
@@ -430 +430 @@
 ********************************************************************/
 
-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) {
@@ -1660 +1660 @@
                         continue;
                 }
-                if (addr_equal((const struct sockaddr_storage *)res->ai_addr,
+                if (sockaddr_equal((const struct sockaddr_storage *)res->ai_addr,
                                         pss)) {
                         freeaddrinfo(ailist);
@@ -1773 +1773 @@
 
         /* 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";
         }
@@ -2097 +2097 @@
                 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;