Changeset 3a3aa23
- Timestamp:
- 03/07/05 16:52:41 (16 years ago)
- 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
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
examples/tracedump/Makefile
r183b39e r3a3aa23 12 12 PLUGINS=$(LINK_LAYERS) $(ETH_LAYERS) $(IP_LAYERS) $(TCP_LAYERS) 13 13 14 all: tracedump $(PLUGINS) asn1-testlinks14 all: tracedump $(PLUGINS) links 15 15 16 16 tracedump: tracedump.cc tracedump-libtrace.o tracedump-lib.o … … 18 18 tracedump-lib.o: CXXFLAGS+=-DLIBDIR=$(LIBDIR) 19 19 20 tcp_1720.so: tcp_1720.cc asn1.o20 tcp_1720.so: 21 21 22 22 %.so:%.cc -
lib/Makefile.in
rfb1de29 r3a3aa23 62 62 ADD_LIBS = @ADD_LIBS@ 63 63 AMTAR = @AMTAR@ 64 AR = @AR@ 64 65 AS = @AS@ 65 66 AWK = @AWK@ 66 67 CC = @CC@ 68 CXX = @CXX@ 69 CXXCPP = @CXXCPP@ 67 70 DAG_TOOLS_DIR = @DAG_TOOLS_DIR@ 68 71 DEPDIR = @DEPDIR@ 69 72 DLLTOOL = @DLLTOOL@ 70 73 ECHO = @ECHO@ 74 EGREP = @EGREP@ 71 75 EXEEXT = @EXEEXT@ 76 F77 = @F77@ 77 GCJ = @GCJ@ 78 GCJFLAGS = @GCJFLAGS@ 72 79 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ 73 80 LIBTOOL = @LIBTOOL@ … … 77 84 PACKAGE = @PACKAGE@ 78 85 RANLIB = @RANLIB@ 86 RC = @RC@ 79 87 STRIP = @STRIP@ 80 88 VERSION = @VERSION@ … … 92 100 libtrace_la_CFLAGS = @ADD_INCLS@ 93 101 libtrace_la_LIBADD = @ADD_LIBS@ $(top_builddir)/replace/libreplace.a 94 libtrace_la_LDFLAGS = -version-info 2:1 2:0 @ADD_LDFLAGS@102 libtrace_la_LDFLAGS = -version-info 2:13:0 @ADD_LDFLAGS@ 95 103 subdir = lib 96 104 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -
lib/trace.c
r9f61296 r3a3aa23 85 85 #if HAVE_PCAP_BPF_H 86 86 # include <pcap-bpf.h> 87 # ifndef HAVE_BPF88 # define HAVE_BPF 189 # endif90 87 #else 91 88 # ifdef HAVE_NET_BPF_H 92 89 # include <net/bpf.h> 93 # ifndef HAVE_BPF94 # define HAVE_BPF 195 # endif96 90 # endif 97 91 #endif … … 99 93 #if HAVE_PCAP_H 100 94 # include <pcap.h> 101 # ifndef HAVE_PCAP102 # define HAVE_PCAP 1103 # endif104 95 #endif 105 96 106 97 #ifdef HAVE_ZLIB_H 107 98 # include <zlib.h> 108 # ifndef HAVE_ZLIB109 # define HAVE_ZLIB 1110 # endif111 99 #endif 112 100 … … 117 105 # include "dagnew.h" 118 106 # include "dagapi.h" 119 # ifndef DAGDEVICE120 # define DAGDEVICE 1121 # endif122 107 #else 123 108 # include "dagformat.h" … … 222 207 #endif 223 208 224 #if def DAGDEVICE209 #if HAVE_DAG 225 210 } else if (!strncasecmp(scan,"dag",3)) { 226 211 (*libtrace)->format=DAG; … … 291 276 break; 292 277 case DAG: 293 #if def DAGDEVICE278 #if HAVE_DAG 294 279 /* 295 280 * Can have uridata of the following format: … … 481 466 O_RDONLY); 482 467 break; 483 #if def DAGDEVICE468 #if HAVE_DAG 484 469 case DAG: 485 470 if((libtrace->input.fd = dag_open(libtrace->conn_info.path)) < 0) { … … 524 509 } else if (libtrace->sourcetype == SOCKET || libtrace->sourcetype == RT) { 525 510 close(libtrace->input.fd); 526 #if def DAGDEVICE511 #if HAVE_DAG 527 512 } else if (libtrace->format == DAG) { 528 513 dag_stop(libtrace->input.fd); … … 575 560 case DEVICE: 576 561 switch(libtrace->format) { 577 #if def DAGDEVICE562 #if HAVE_DAG 578 563 case DAG: 579 564 … … 706 691 } 707 692 708 #if def DAGDEVICE693 #if HAVE_DAG 709 694 if (libtrace->format == DAG) { 710 695 if (libtrace->dag.diff == 0) {
Note: See TracChangeset
for help on using the changeset viewer.