Changeset 808a478

Timestamp:

04/21/05 09:54:40 (16 years ago)

Author:

Daniel Lawson <dlawson@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

4b30586

Parents:

7bb7dda

Message:

Ported to OpenBSD

Changes were mostly with header changes, although openbsd's pcap doesn't have pcap_open_dead, so we provide our own. To this end, I fixed the libreplace shit that wasn't working at all well, and ended up putting strndup.c and pcap_open_dead.c into lib/, and adding @LTLIBOBJS@ to the libtrace source file line. Seems to work fine now!

Files:

• ChangeLog (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• configure.in (modified) (5 diffs)
• lib/Makefile.am (modified) (1 diff)
• lib/pcap_open_dead.c (added)
• lib/strndup.c (added)
• lib/trace.c (modified) (5 diffs)

ChangeLog

@@ -30 +30 @@
 
 - Version 2.0.16
+        * Ported to OpenBSD
         * Fixed a bug in the event api where it would die instantly
           for offline traces.

Makefile.am

@@ -1 @@
-SUBDIRS=replace lib
+SUBDIRS=lib
 EXTRA_DIST=examples docs
 
@@ -9 +9 @@
         $(RM) -rf autom4te.cache/
         
+docs:
+        doxygen libtrace.doxygen
+

configure.in

@@ -4 +4 @@
 AM_INIT_AUTOMAKE(libtrace,2.0.16)
 
-AC_CONFIG_FILES([Makefile replace/Makefile lib/Makefile])
+AC_CONFIG_FILES([Makefile lib/Makefile])
 dnl GNU C library
 dnl AC_GNU_SOURCE
@@ -20 +20 @@
 AC_HEADER_STDC
 dnl AC_CHECK_HEADERS(errno.h stdlib.h stdio.h assert.h string.h netinet/in.h assert.h errno.h fcntl.h net/ethernet.h netdb.h pcap.h stdio.h stdlib.h string.h sys/stat.h sys/types.h sys/socket.h sys/un.h unistd.h time.h sys/ioctl.h net/bpf.h pcap.h zlib.h pcap-bpf.h)
-AC_CHECK_HEADERS(pcap.h pcap-bpf.h net/bpf.h zlib.h sys/limits.h stddef.h inttypes.h limits.h dagapi.h )
+AC_CHECK_HEADERS(pcap.h pcap-int.h pcap-bpf.h net/bpf.h zlib.h sys/limits.h stddef.h inttypes.h limits.h dagapi.h net/ethernet.h )
+
+AC_CHECK_HEADERS(netinet/in.h)
+
+AC_CHECK_HEADER(net/if.h,
+                AC_DEFINE(HAVE_NET_IF_H,1,[We have net/if.h]), [],
+[#include <sys/types.h>
+ #include <sys/socket.h>
+])
+
+
+AC_CHECK_HEADER(netinet/if_ether.h,
+                AC_DEFINE(HAVE_NETINET_IF_ETHER_H,1,[We have netinet/if_ether.h]), [],
+[
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <net/if.h>
+])
+
+AC_CHECK_HEADER(net/if_arp.h, 
+                AC_DEFINE(HAVE_NET_IF_ARP_H,1,[We have net/if_arp.h]), [],
+[
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <net/if.h>
+])
+
         
 # Checking for the right bpf header to include
@@ -42 +70 @@
 
 
+# *BSD doesn't have strndup. Currently provide our own.
 AC_REPLACE_FUNCS(strndup)
+
+# Earlier versions of pcap don't have pcap_open_dead. EG: the one OpenBSD
+# ships with. Even Debian Woody is more up to date.
+AC_CHECK_LIB(pcap,pcap_open_dead,[],[AC_REPLACE_FUNCS([pcap_open_dead])])
+    
 
 # Checks for typedefs, structures, and compiler characteristics.
@@ -149 +183 @@
 
 if test x"$ac_cv_use_pcap" != xno; then
-        ADD_LIBS="$ADD_LIBS  -l$ac_cv_use_pcap"
-        ADD_LDFLAGS="$ADD_LDFLAGS -L$ac_cv_use_pcap_path"
-
+    ADD_LIBS="$ADD_LIBS  -l$ac_cv_use_pcap"
+    
     pcap_lib_file="${ac_cv_use_pcap_path}/lib${ac_cv_use_pcap}.so"
-    if test ! -r "$ac_cv_use_pcap_path" -o ! -r "$pcap_lib_file"; then
-        AC_MSG_NOTICE([Cannot find pcap library $pcap_lib_file.])
-        AC_MSG_ERROR([Exiting]);
-    fi  
+    
+    # if the library is in /usr/lib, then just use 
+    # AC_CHECK_LIB. 
+    if test x"${ac_cv_use_pcap_path}" != x"/usr/lib"; then
+            AC_CHECK_LIB(${ac_cv_use_pcap},pcap_open_live,
+                         have_libpcap=yes,
+                         have_libpcap=no)
+
+            if test x"${have_libpcap}" != xno; then
+                AC_MSG_NOTICE([Cannot find pcap library $pcap_lib_file.])
+                AC_MSG_ERROR([Exiting]);
+            fi
+    else
+        ADD_LDFLAGS="$ADD_LDFLAGS -L$ac_cv_use_pcap_path"
+        # if it's not in /usr/lib/, check manually. This isn't nice,
+        # and will probably break.
+        if test ! -r "$ac_cv_use_pcap_path" -o ! -r "$pcap_lib_file"; then
+                AC_MSG_NOTICE([Cannot find pcap library $pcap_lib_file.])
+                AC_MSG_ERROR([Exiting]);
+        fi  
+    fi
     AC_DEFINE(HAVE_PCAP,1,[Conditional for building PCAP support])
 else
@@ -176 +226 @@
 
 if test "$ac_cv_use_zlib" != no; then
-        ADD_LIBS="$ADD_LIBS -l$ac_cv_use_zlib"
+    ADD_LIBS="$ADD_LIBS -l$ac_cv_use_zlib"
+    
+    zlib_lib_file="${ac_cv_use_zlib_path}/lib${ac_cv_use_zlib}.so"
+
+    # if the library is in /usr/lib/, then just use AC_CHECK_LIB
+    if test x"${ac_cv_use_zlib_path}" != x"/usr/lib"; then
+            AC_CHECK_LIB(${ac_cv_use_zlib}, gzopen,
+                         have_libzlib=yes,
+                         have_libzlib=no)
+            if test x"{have_libzlib}" != xno; then
+                AC_MSG_NOTICE([Cannot find zlib library $zlib_lib_file.])
+                AC_MSG_ERROR([Exiting]);
+            fi
+    else
         ADD_LDFLAGS="$ADD_LDFLAGS -L$ac_cv_use_zlib_path"
-    
-    zlib_lib_file="${ac_cv_use_zlib_path}/lib${ac_cv_use_zlib}.so"
-    
-    if test ! -r "$ac_cv_use_zlib_path" -o ! -r "$zlib_lib_file"; then
-        AC_MSG_NOTICE([Cannot find zlib library $zlib_lib_file.])
-        AC_MSG_ERROR([Exiting]);
+        # if it's not in /usr/lib/, check manually. This isn't nice
+        # and will probably break.
+        if test ! -r "$ac_cv_use_zlib_path" -o ! -r "$zlib_lib_file"; then
+                AC_MSG_NOTICE([Cannot find zlib library $zlib_lib_file.])
+                AC_MSG_ERROR([Exiting]);
+        fi
     fi
-    
     AC_DEFINE(HAVE_ZLIB,1,[Conditional for building zlib support])
 else

lib/Makefile.am

@@ -4 +4 @@
 #libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h dagapi.c dagopts.c
 #else
-libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h
+libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h 
 #endif
 libtrace_la_CFLAGS = @ADD_INCLS@
-libtrace_la_LIBADD = @ADD_LIBS@ $(top_builddir)/replace/libreplace.a
+libtrace_la_LIBADD = @ADD_LIBS@ @LTLIBOBJS@
 libtrace_la_LDFLAGS=-version-info 2:16:0 @ADD_LDFLAGS@
 

lib/trace.c

@@ -64 +64 @@
 #include <sys/mman.h>
 #include <unistd.h>
-#include <net/ethernet.h>
+
+#ifdef HAVE_NET_IF_ARP_H
+#  include <net/if_arp.h>
+#endif
+
+#ifdef HAVE_NET_IF_H
+#  include <net/if.h>
+#endif
+
+#ifdef HAVE_NETINET_IN_H
+#  include <netinet/in.h>
+#endif
+
+#ifdef HAVE_NET_ETHERNET_H
+#  include <net/ethernet.h>
+#endif
+
+#ifdef HAVE_NETINET_IF_ETHER_H
+#  include <netinet/if_ether.h>
+#endif
+
 #include <time.h>
 #include <sys/ioctl.h>
@@ -93 +113 @@
 #if HAVE_PCAP_H
 #  include <pcap.h>
+#  ifdef HAVE_PCAP_INT_H
+#    include <pcap-int.h>
+#  endif
 #endif 
 
@@ -894 +917 @@
                         assert(0);
         }
-        return ethptr;
+        return (void *)ethptr;
 }
 
@@ -1222 +1245 @@
                 case PCAP:
                         pcapptr = (struct pcap_pkthdr *)packet->buffer;
-                        tv = pcapptr->ts;
+                        // ick. FIXME
+                        tv.tv_sec = pcapptr->ts.tv_sec;
+                        tv.tv_usec = pcapptr->ts.tv_usec;
                         break;
 #endif
@@ -1616 +1641 @@
                 switch (trace_get_link_type(packet)) {
                         case TRACE_TYPE_ETH:
-                                pcap = pcap_open_dead(DLT_EN10MB, 1500);
+                                pcap = (pcap_t *)pcap_open_dead(DLT_EN10MB, 1500);
                                 break;
+#ifdef DLT_LINUX_SLL
                         case TRACE_TYPE_LINUX_SLL:
                                 pcap = pcap_open_dead(DLT_LINUX_SLL, 1500);
                                 break;
+#endif
                         default:
                                 printf("only works for ETH and LINUX_SLL (ppp) at the moment\n");