network-info 0.2.0.3 → 0.2.0.4

raw patch · 3 files changed

+53/−3 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• cbits/network-unix.c +48/−2
• network-info.cabal +3/−1
• test/network-info-test.cabal +2/−0

@@ -12,8 +12,18 @@ #else #   include <sys/socket.h> #   include <net/if.h>-#   include <net/if_dl.h>-#   define AF_PACKET AF_LINK+#   ifndef __GNU__+#      include <net/if_dl.h>+#      ifndef __sun+#         define AF_PACKET AF_LINK+#      endif+#   endif+#   ifdef __sun+#      include <net/if_arp.h>+#      include <unistd.h>+#      include <stropts.h>+#      include <sys/sockio.h>+#   endif #endif  #ifdef __FreeBSD__@@ -23,7 +33,30 @@ #include "network.h" #include "common.h" +#if defined(__sun) || !defined(AF_PACKET)+int maccopy_arp(unsigned char *dst, struct sockaddr *addr)+{+    // SOURCE DERIVED FROM: http://www.pauliesworld.org/project/getmac.c+    int sock;+    if ((sock=socket(AF_INET,SOCK_DGRAM,0)) > -1) {+        struct arpreq arpreq;+        memset(&arpreq, 0, sizeof (struct arpreq));+        arpreq.arp_pa = *addr;+        if (ioctl(sock,SIOCGARP,(char*)&arpreq) == 0) {+            close (sock);+            memcpy(dst, (unsigned char *)arpreq.arp_ha.sa_data, MAC_SIZE);+            return 0;+        } else {+            close (sock);+            return 1;+        }+    } else {+        return 1;+    }+}+#endif +#ifdef AF_PACKET void maccopy(unsigned char *dst, struct sockaddr *addr) { #ifdef __linux__@@ -35,6 +68,7 @@     memcpy(dst, sdl->sdl_data + sdl->sdl_nlen, MAC_SIZE); #endif }+#endif  struct network_interface *add_interface(struct network_interface *ns, const wchar_t *name, int max_ns) {@@ -96,10 +130,22 @@         family = addr->sa_family;         if (family == AF_INET) {             ipv4copy(&n->ip_address, addr);+#if defined(__sun) || !defined(AF_PACKET)+            if ((ifa->ifa_flags & IFF_LOOPBACK) == 0) {+                maccopy_arp(n->mac_address, addr);+            }+#endif         } else if (family == AF_INET6) {             ipv6copy(&n->ip6_address, addr);+#if defined(__sun) || !defined(AF_PACKET)+            if ((ifa->ifa_flags & IFF_LOOPBACK) == 0) {+                maccopy_arp(n->mac_address, addr);+            }+#endif+#ifdef AF_PACKET         } else if (family == AF_PACKET) {             maccopy(n->mac_address, addr);+#endif         }     } 

@@ -1,5 +1,5 @@ name:           network-info-version:        0.2.0.3+version:        0.2.0.4 synopsis:       Access the local computer's basic network configuration  description:    This library provides simple read-only access to the@@ -50,3 +50,5 @@     extra-libraries: iphlpapi   else     c-sources: cbits/network-unix.c+  if os(solaris)+    extra-libraries: socket, nsl

@@ -19,3 +19,5 @@     extra-libraries: iphlpapi   else     c-sources: ../cbits/network-unix.c+  if os(solaris)+    extra-libraries: socket, nsl