Changeset 795

Timestamp:

05/10/06 09:57:52 (7 years ago)

Author:

spa1

Message:

OpenBSD compatibility fixes - adding in various #defines and #includes that are needed to compile under OpenBSD
Added a replacement pcap_next_ex function for systems that aren't running pcap-0.8 or better

Location:

trunk

Files:

• configure.in (modified) (2 diffs)
• lib/fifo.c (modified) (1 diff)
• lib/format_pcap.c (modified) (1 diff)
• lib/libtrace.h.in (modified) (3 diffs)
• lib/linktypes.c (modified) (1 diff)
• lib/pcap_dump_flush.c (modified) (1 diff)
• lib/pcap_next_ex.c (added)
• lib/protocols.c (modified) (1 diff)
• lib/trace.c (modified) (1 diff)

trunk/configure.in

@@ -158 +158 @@
         fi
    
-        # Versions of libpcap earlier than 0.8 don't have pcap_dump_flush
+        # Versions of libpcap earlier than 0.8 don't have pcap_dump_flush or
+        # pcap_next_ex
         AC_CHECK_LIB(pcap,pcap_dump_flush,
                      have_pcap_dump_flush=true,
@@ -165 +166 @@
         if test "$have_pcap_dump_flush" = false; then
                 AC_REPLACE_FUNCS(pcap_dump_flush)
+        fi
+        
+        AC_CHECK_LIB(pcap,pcap_next_ex,
+                     have_pcap_next_ex=true,
+                     have_pcap_next_ex=false)
+
+        if test "$have_pcap_next_ex" = false; then
+                AC_REPLACE_FUNCS(pcap_next_ex)
         fi
 

trunk/lib/fifo.c

@@ -39 +39 @@
 
 #include "fifo.h"
+
+#ifndef PRIu64
+        #define PRIu64 "llu"
+#endif
+
+#ifndef PRIi64
+        #define PRIi64 "lli"
+#endif
 
 enum which_t { FIFO_PTR_IN, FIFO_PTR_OUT, FIFO_PTR_ACK };

trunk/lib/format_pcap.c

@@ -273 +273 @@
         packet->buf_control = TRACE_CTRL_PACKET;
 
+        /* If we're using the replacement pcap_next_ex() we need to
+         * make sure we have a buffer to *shudder* memcpy into 
+         */
+        if (!packet->buffer) {
+                packet->buffer = malloc(LIBTRACE_PACKET_BUFSIZE);
+                if (!packet->buffer) {
+                        trace_set_err(libtrace, errno, 
+                                        "Cannot allocate memory");
+                        return -1;
+                }
+                        
+                packet->header = packet->buffer;
+                packet->payload = (char *)packet->buffer + 
+                                        sizeof(struct pcap_pkthdr);
+        }
+        
         for(;;) {
 

trunk/lib/libtrace.h.in

@@ -57 +57 @@
 
 #include <sys/types.h>
+#include <sys/time.h>
+
 #ifdef _MSC_VER
     /* define the following from MSVC's internal types */
@@ -98 +100 @@
 #    include <netinet/in.h>
 #    include <stdbool.h>
+#    include <sys/types.h>
+#    include <sys/socket.h>
 #endif
 
@@ -119 +123 @@
 #  define SIMPLE_FUNCTION
 #  define UNUSED
-#  define PACKED __declspec(align(1))
+#  define PACKED 
 #  define CONSTRUCTOR
 #endif

trunk/lib/linktypes.c

@@ -13 +13 @@
 #ifndef WIN32
 #include <net/if_arp.h>
-#else
+#endif
+
+#ifndef ARPHRD_ETHER
 #define ARPHRD_ETHER    1               /* Ethernet 10/100Mbps.  */
+#endif
+
+#ifndef ARPHRD_PPP
 #define ARPHRD_PPP      512
 #endif

trunk/lib/pcap_dump_flush.c

@@ -17 +17 @@
                 return (0);
 }
+
 #endif

trunk/lib/protocols.c

@@ -11 +11 @@
 #ifndef WIN32
 #include <net/if_arp.h>
-#else
+#endif
+
+#ifndef ARPHRD_ETHER
 #define ARPHRD_ETHER    1               /* Ethernet 10/100Mbps.  */
+#endif
+
+#ifndef ARPHRD_PPP
 #define ARPHRD_PPP      512
 #endif
+
 
 /* Returns the payload from 802.3 ethernet.  Type optionally returned in

trunk/lib/trace.c

@@ -50 +50 @@
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/socket.h>
 #include <stdarg.h>