AIX build failures fixed, cause was inclusion of system headers libnet no longer uses (alon.barlev@gmail.com)

6 files changed, 39 insertions, 39 deletions

diff --git a/libnet/configure.in b/libnet/configure.in
index df6262c..5bc7173 100644
--- a/libnet/configure.in
+++ b/libnet/configure.in
@@ -20,6 +20,7 @@ dnl Check for the usual programs
 dnl
 AC_PROG_CC
 AC_PROG_INSTALL
+AC_USE_SYSTEM_EXTENSIONS
 dnl disable shared libraries (for now)
 dnl AC_DISABLE_SHARED
 ifdef(
@@ -67,6 +68,7 @@ AC_ARG_WITH(
 )
 
 AC_CHECK_HEADERS([net/pfilt.h sys/net/nit.h net/raw.h sys/dlpi.h linux/socket.h])
+AC_CHECK_HEADERS([net/bpf.h])
 
 AC_MSG_CHECKING(link-layer packet interface type)
 
diff --git a/libnet/include/libnet.h.in b/libnet/include/libnet.h.in
index a59d8ca..0dee481 100644
--- a/libnet/include/libnet.h.in
+++ b/libnet/include/libnet.h.in
@@ -59,57 +59,52 @@
 extern "C" {
 #endif
 
-#define _GNU_SOURCE
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <stdlib.h>
+
 #if !defined(__WIN32__)
-#include <sys/ioctl.h>
+# include <sys/ioctl.h>
 #endif /* __WIN32__ */
+
 #if defined(HAVE_SYS_SOCKIO_H) && !defined(SIOCGIFADDR)
-#include <sys/sockio.h>
+# include <sys/sockio.h>
 #endif
+
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <ctype.h>
+
 #if !defined(__WIN32__)
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <net/if.h>
+# include <sys/socket.h>
+# include <netinet/in.h>
+# include <net/if.h>
 #else /* __WIN32__ */
-#if (__CYGWIN__)
-#include <sys/socket.h>
-#endif
-#include <ws2tcpip.h>
-#include <windows.h>
-#include <winsock2.h>
-#include <win32/in_systm.h>
+# if (__CYGWIN__)
+#  include <sys/socket.h>
+# endif
+# include <ws2tcpip.h>
+# include <windows.h>
+# include <winsock2.h>
+# include <win32/in_systm.h>
 #endif /* __WIN32__ */
+
 #if !(__linux__) && !(__WIN32__) && !(__APPLE__) && !(__CYGWIN__) && !(__GNU__)
-#include <netinet/ip_var.h>
 #else   /* __linux__ */
-#if (HAVE_NET_ETHERNET_H)
-#include <net/ethernet.h>
-#endif  /* HAVE_NET_ETHERNET_H */
+# if (HAVE_NET_ETHERNET_H)
+#  include <net/ethernet.h>
+# endif  /* HAVE_NET_ETHERNET_H */
 #endif  /* __linux__ */
+
 #if !defined(__WIN32__)
-#include <netinet/tcp.h>
-#include <netinet/udp.h>
-#if (__linux__) && !(__GLIBC__)
-/* we get multiple definitions of IGMP_AGE_THRESHOLD if we include netinet */
-#include <linux/igmp.h>
-#else
-#include <netinet/igmp.h>
-#endif
-#include <arpa/inet.h>
-#include <sys/time.h>
-#include <netdb.h>
+# include <arpa/inet.h>
+# include <sys/time.h>
+# include <netdb.h>
 #endif /* __WIN32__ */
+
 #include <errno.h>
 #include <stdarg.h>
 
diff --git a/libnet/include/libnet/libnet-functions.h b/libnet/include/libnet/libnet-functions.h
index 3d81d43..ad70d12 100644
--- a/libnet/include/libnet/libnet-functions.h
+++ b/libnet/include/libnet/libnet-functions.h
@@ -774,7 +774,7 @@ const uint8_t* payload, uint32_t payload_s, libnet_t *l, libnet_ptag_t ptag);
  */
 libnet_ptag_t
 libnet_build_icmpv4_timestamp(uint8_t type, uint8_t code, uint16_t sum,
-uint16_t id, uint16_t seq, n_time otime, n_time rtime, n_time ttime,
+uint16_t id, uint16_t seq, uint32_t otime, uint32_t rtime, uint32_t ttime,
 const uint8_t* payload, uint32_t payload_s, libnet_t *l, libnet_ptag_t ptag);
 
 /**
diff --git a/libnet/include/libnet/libnet-headers.h b/libnet/include/libnet/libnet-headers.h
index 0345f02..781d850 100644
--- a/libnet/include/libnet/libnet-headers.h
+++ b/libnet/include/libnet/libnet-headers.h
@@ -1014,9 +1014,9 @@ struct libnet_icmpv4_hdr
     {
         struct
         {
-            n_time its_otime;
-            n_time its_rtime;
-            n_time its_ttime;
+            uint32_t its_otime;
+            uint32_t its_rtime;
+            uint32_t its_ttime;
         } ts;
         struct
         {
diff --git a/libnet/src/libnet_build_icmp.c b/libnet/src/libnet_build_icmp.c
index 72e1fd6..90a64bd 100644
--- a/libnet/src/libnet_build_icmp.c
+++ b/libnet/src/libnet_build_icmp.c
@@ -192,7 +192,7 @@ bad:
 
 libnet_ptag_t
 libnet_build_icmpv4_timestamp(uint8_t type, uint8_t code, uint16_t sum,
-uint16_t id, uint16_t seq, n_time otime, n_time rtime, n_time ttime,
+uint16_t id, uint16_t seq, uint32_t otime, uint32_t rtime, uint32_t ttime,
 const uint8_t *payload, uint32_t payload_s, libnet_t *l, libnet_ptag_t ptag)
 {
     uint32_t n, h;
diff --git a/libnet/src/libnet_build_link.c b/libnet/src/libnet_build_link.c
index bf24cfb..298021d 100644
--- a/libnet/src/libnet_build_link.c
+++ b/libnet/src/libnet_build_link.c
@@ -31,19 +31,22 @@
  *
  */
 
-/* OSX? #include <net/bpf.h> */
-
-#include <pcap.h>
-
 #if (HAVE_CONFIG_H)
 #include "../include/config.h"
 #endif
+
 #if (!(_WIN32) || (__CYGWIN__))
 #include "../include/libnet.h"
 #else
 #include "../include/win32/libnet.h"
 #endif
 
+#include <pcap.h>
+
+#ifdef HAVE_NET_BPF_H
+#include <net/bpf.h>
+#endif
+
 libnet_ptag_t
 libnet_build_link(const uint8_t *dst, const uint8_t *src, const uint8_t *oui, uint16_t type,
 const uint8_t *payload, uint32_t payload_s, libnet_t *l, libnet_ptag_t ptag)