]> Pileus Git - ~andy/fetchmail/blobdiff - interface.c
Fix typo repsonsible -> responsible.
[~andy/fetchmail] / interface.c
index f2e709690af4a53429d713485d3dae2112cc127d..f9445cb8aba1a01948dc50beb25aed0445146ae3 100644 (file)
@@ -44,7 +44,7 @@
 #endif /* defined __FreeBSD_USE_KVM */
 #endif /* defined __FreeBSD__ */
 #include "socket.h"
-#include "i18n.h"
+#include "gettext.h"
 #include "tunable.h"
 
 typedef struct {
@@ -225,14 +225,11 @@ get_ifinfo(const char *ifname, ifinfo_t *ifinfo)
        char                    iname[16];
        struct ifnet            ifnet;
        unsigned long           ifnet_addr = ifnet_savedaddr;
-#if __FreeBSD_version >= 300001
        struct ifnethead        ifnethead;
        struct ifaddrhead       ifaddrhead;
-#endif
        struct ifaddr           ifaddr;
        unsigned long           ifaddr_addr;
        struct sockaddr         sa;
-       unsigned long           sa_addr;
        uint                    i;
        
        if (if_egid)
@@ -254,12 +251,8 @@ get_ifinfo(const char *ifname, ifinfo_t *ifinfo)
                }
        }
 
-#if __FreeBSD_version >= 300001
        kvm_read(kvmfd, ifnet_savedaddr, (char *) &ifnethead, sizeof ifnethead);
        ifnet_addr = (u_long) ifnethead.tqh_first;
-#else
-       ifnet_addr = ifnet_savedaddr;
-#endif
 
        while (ifnet_addr)
        {
@@ -279,11 +272,7 @@ get_ifinfo(const char *ifname, ifinfo_t *ifinfo)
                        ifinfo->rx_packets = ifnet.if_ipackets;
                        ifinfo->tx_packets = ifnet.if_opackets;
 
-#if __FreeBSD_version >= 300001
                        ifaddr_addr = (u_long) ifnet.if_addrhead.tqh_first;
-#else
-                       ifaddr_addr = (u_long) ifnet.if_addrlist;
-#endif
                        
                        while(ifaddr_addr)
                        {
@@ -292,11 +281,7 @@ get_ifinfo(const char *ifname, ifinfo_t *ifinfo)
                                
                                if (sa.sa_family != AF_INET)
                                {
-#if __FreeBSD_version >= 300001
                                        ifaddr_addr = (u_long) ifaddr.ifa_link.tqe_next;
-#else
-                                       ifaddr_addr = (u_long) ifaddr.ifa_next;
-#endif
                                        continue;
                                }
                        
@@ -318,11 +303,7 @@ get_ifinfo(const char *ifname, ifinfo_t *ifinfo)
                        return 0;
                }
 
-#if __FreeBSD_version >= 300001
                ifnet_addr = (u_long) ifnet.if_link.tqe_next;
-#else
-               ifnet_addr = (unsigned long) ifnet.if_next;
-#endif
        }
 
        if (if_egid)
@@ -378,7 +359,7 @@ get_ifinfo(const char *ifname, ifinfo_t *ifinfo)
     char               iname[16];
     int                        mib[6];
 
-    memset(ifinfo, 0, sizeof(ifinfo));
+    memset(ifinfo, 0, sizeof(*ifinfo));
 
     /* trim interface name */