Changeset 3a3aa23

Timestamp:

03/07/05 16:52: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:

6659ffb

Parents:

5ed52b8

Message:

.

Files:

• examples/tracedump/Makefile (modified) (2 diffs)
• lib/Makefile.in (modified) (3 diffs)
• lib/trace.c (modified) (9 diffs)

examples/tracedump/Makefile

@@ -12 +12 @@
 PLUGINS=$(LINK_LAYERS) $(ETH_LAYERS) $(IP_LAYERS) $(TCP_LAYERS)
 
-all: tracedump $(PLUGINS) asn1-test links
+all: tracedump $(PLUGINS) links
 
 tracedump: tracedump.cc tracedump-libtrace.o tracedump-lib.o
@@ -18 +18 @@
 tracedump-lib.o: CXXFLAGS+=-DLIBDIR=$(LIBDIR)
 
-tcp_1720.so: tcp_1720.cc asn1.o
+tcp_1720.so: 
 
 %.so:%.cc

lib/Makefile.in

@@ -62 +62 @@
 ADD_LIBS = @ADD_LIBS@
 AMTAR = @AMTAR@
+AR = @AR@
 AS = @AS@
 AWK = @AWK@
 CC = @CC@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
 DAG_TOOLS_DIR = @DAG_TOOLS_DIR@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 ECHO = @ECHO@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+F77 = @F77@
+GCJ = @GCJ@
+GCJFLAGS = @GCJFLAGS@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LIBTOOL = @LIBTOOL@
@@ -77 +84 @@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
+RC = @RC@
 STRIP = @STRIP@
 VERSION = @VERSION@
@@ -92 +100 @@
 libtrace_la_CFLAGS = @ADD_INCLS@
 libtrace_la_LIBADD = @ADD_LIBS@ $(top_builddir)/replace/libreplace.a
-libtrace_la_LDFLAGS = -version-info 2:12:0 @ADD_LDFLAGS@
+libtrace_la_LDFLAGS = -version-info 2:13:0 @ADD_LDFLAGS@
 subdir = lib
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

lib/trace.c

@@ -85 +85 @@
 #if HAVE_PCAP_BPF_H
 #  include <pcap-bpf.h>
-#  ifndef HAVE_BPF 
-#    define HAVE_BPF 1
-#  endif
 #else
 #  ifdef HAVE_NET_BPF_H
 #    include <net/bpf.h>
-#    ifndef HAVE_BPF
-#      define HAVE_BPF 1
-#    endif
 #  endif
 #endif
@@ -99 +93 @@
 #if HAVE_PCAP_H
 #  include <pcap.h>
-#  ifndef HAVE_PCAP
-#    define HAVE_PCAP 1
-#  endif
 #endif 
 
 #ifdef HAVE_ZLIB_H
 #  include <zlib.h>
-#  ifndef HAVE_ZLIB
-#    define HAVE_ZLIB 1
-#  endif 
 #endif
 
@@ -117 +105 @@
 #  include "dagnew.h"
 #  include "dagapi.h"
-#  ifndef DAGDEVICE
-#    define DAGDEVICE 1
-#  endif
 #else
 #  include "dagformat.h"
@@ -222 +207 @@
 #endif
         
-#ifdef DAGDEVICE
+#if HAVE_DAG
         } else if (!strncasecmp(scan,"dag",3)) {
                 (*libtrace)->format=DAG;
@@ -291 +276 @@
                         break;
                 case DAG:
-#ifdef DAGDEVICE
+#if HAVE_DAG
                         /* 
                          * Can have uridata of the following format:
@@ -481 +466 @@
                                                 O_RDONLY);
                                         break;
-#ifdef DAGDEVICE
+#if HAVE_DAG
                                 case DAG:
                                         if((libtrace->input.fd = dag_open(libtrace->conn_info.path)) < 0) {
@@ -524 +509 @@
         } else if (libtrace->sourcetype == SOCKET || libtrace->sourcetype == RT) {
                 close(libtrace->input.fd);
-#ifdef DAGDEVICE
+#if HAVE_DAG
         } else if (libtrace->format == DAG) {
                 dag_stop(libtrace->input.fd);
@@ -575 +560 @@
                         case DEVICE:
                                 switch(libtrace->format) {
-#ifdef DAGDEVICE
+#if HAVE_DAG
                                         case DAG:
 
@@ -706 +691 @@
         }
 
-#ifdef DAGDEVICE
+#if HAVE_DAG
         if (libtrace->format == DAG) {
                 if (libtrace->dag.diff == 0) {