Changeset 41b53c2 for libpacketdump

Timestamp:

11/03/05 17:17:41 (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:

fe3d755

Parents:

117e83b

Message:

2.0.25

Fixes for builds under openbsd:

• pcap uses a struct bpf_filter, not struct timeval. fixed format_pcap to solve this
• #includes in libpacketdump - libpacketdump still not working properly
• rijndael.c and .h conflicted with a system function called 'encrypt' - renamed encrypt and decrypt to r_* within rijndael*
• UINT64_MAX not defined under freebsd

Location:

libpacketdump

Files:

• Makefile.am (modified) (1 diff)
• libpacketdump.cc (modified) (1 diff)

libpacketdump/Makefile.am

@@ -16 +16 @@
 INCLUDES= @ADD_INCLS@ -I../lib -I../
 libpacketdump_la_LIBADD = @ADD_LIBS@  -ldl
-libpacketdump_la_LDFLAGS=-version-info 2:24:0 @ADD_LDFLAGS@
+libpacketdump_la_LDFLAGS=-version-info 2:25:0 @ADD_LDFLAGS@
 
 AM_CXXFLAGS=-g -Wall -DDIRNAME=\"$(PLUGINDIR)\" -rdynamic $(INCLUDES)

libpacketdump/libpacketdump.cc

@@ -3 +3 @@
 #include <time.h>
 #include "libpacketdump.h"
+#include "config.h"
 #include <stdio.h>
+#include <netdb.h>
 #include <stdlib.h>
 #include <getopt.h>
-#include <netinet/ether.h>
+
+#ifdef HAVE_NETINET_ETHER
+#  include <netinet/ether.h>
+#endif
+
+
+#ifdef HAVE_INTTYPES_H
+#  include <inttypes.h>
+#else
+#  error "Can't find inttypes.h"
+#endif
+
+#ifdef HAVE_LIMITS_H
+#  include <limits.h>
+#endif
+
+#ifdef HAVE_SYS_LIMITS_H
+#  include <sys/limits.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#  include <sys/types.h>
+#endif
+#include <net/if.h>
 #include <netinet/in.h>
 #include <stdio.h>
-#include <inttypes.h>
+
+#include <net/if_arp.h>
+#ifdef HAVE_NETINET_IF_ETHER_H
+#  include <netinet/if_ether.h>
+#endif 
 #include <dlfcn.h>
 #include <map>