ctdb-common: Drop unused function ctdb_sys_find_ifname()

The ioctl SIOCGIFCONF does not return IPv6 addresses, so this function
does not work for IPv6 addresses.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

diff --git a/ctdb/common/system.h b/ctdb/common/system.h
index e6f65b5e621fdaf3e93f57e7f9a7263c494767fe..5865a1a690edd0821b1821883b098e808cb7197c 100644 (file)
--- a/ctdb/common/system.h
+++ b/ctdb/common/system.h
@@ -26,7 +26,6 @@
 
 uint32_t uint16_checksum(uint16_t *data, size_t n);
 bool ctdb_sys_have_ip(ctdb_sock_addr *_addr);
-char *ctdb_sys_find_ifname(ctdb_sock_addr *addr);
 
 /* From system_<os>.c */
 

diff --git a/ctdb/common/system_common.c b/ctdb/common/system_common.c
index a80189cd6c88cd46a0b42b8eb089f7583199c59c..49afbf34469085c3a8815b894445dd0fd454777f 100644 (file)
--- a/ctdb/common/system_common.c
+++ b/ctdb/common/system_common.c
@@ -80,87 +80,3 @@ bool ctdb_sys_have_ip(ctdb_sock_addr *_addr)
        close(s);
        return ret == 0;
 }
-
-
-/* find which interface an ip address is currently assigned to */
-char *ctdb_sys_find_ifname(ctdb_sock_addr *addr)
-{
-       int s;
-       int size;
-       struct ifconf ifc;
-       char *ptr;
-
-       s = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
-       if (s == -1) {
-               DEBUG(DEBUG_CRIT,(__location__ " failed to open raw socket (%s)\n",
-                        strerror(errno)));
-               return NULL;
-       }
-
-
-       size = sizeof(struct ifreq);
-       ifc.ifc_buf = NULL;
-       ifc.ifc_len = size;
-
-       while(ifc.ifc_len > (size - sizeof(struct ifreq))) {
-               size *= 2;
-
-               free(ifc.ifc_buf);      
-               ifc.ifc_len = size;
-               ifc.ifc_buf = malloc(size);
-               memset(ifc.ifc_buf, 0, size);
-               if (ioctl(s, SIOCGIFCONF, (caddr_t)&ifc) < 0) {
-                       DEBUG(DEBUG_CRIT,("Failed to read ifc buffer from socket\n"));
-                       free(ifc.ifc_buf);      
-                       close(s);
-                       return NULL;
-               }
-       }
-
-       for (ptr =(char *)ifc.ifc_buf; ptr < ((char *)ifc.ifc_buf) + ifc.ifc_len; ) {
-               char *ifname;
-               struct ifreq *ifr;
-
-               ifr = (struct ifreq *)ptr;
-
-#ifdef HAVE_SOCKADDR_LEN
-               if (ifr->ifr_addr.sa_len > sizeof(struct sockaddr)) {
-                       ptr += sizeof(ifr->ifr_name) + ifr->ifr_addr.sa_len;
-               } else {
-                       ptr += sizeof(ifr->ifr_name) + sizeof(struct sockaddr);
-               }
-#else
-               ptr += sizeof(struct ifreq);
-#endif
-
-               if (ifr->ifr_addr.sa_family != addr->sa.sa_family) {
-                       continue;
-               }
-
-               switch (addr->sa.sa_family) {
-               case AF_INET:
-
-
-                       if (memcmp(&addr->ip.sin_addr, &((struct sockaddr_in *)&ifr->ifr_addr)->sin_addr, sizeof(addr->ip.sin_addr))) {
-                               continue;
-                       }
-                       break;
-               case AF_INET6:
-                       if (memcmp(&addr->ip6.sin6_addr, &((struct sockaddr_in6 *)&ifr->ifr_addr)->sin6_addr, sizeof(addr->ip6.sin6_addr))) {
-                               continue;
-                       }
-                       break;
-               }
-
-               ifname = strdup(ifr->ifr_name);
-               free(ifc.ifc_buf);      
-               close(s);
-               return ifname;
-       }
-
-
-       free(ifc.ifc_buf);      
-       close(s);
-
-       return NULL;
-}