Changeset 808a478 for lib

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!

Location:

lib

Files:

• Makefile.am (modified) (1 diff)
• pcap_open_dead.c (added)
• strndup.c (added)
• trace.c (modified) (5 diffs)

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");