Changeset 3a3aa23


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • examples/tracedump/Makefile

    r183b39e r3a3aa23  
    1212PLUGINS=$(LINK_LAYERS) $(ETH_LAYERS) $(IP_LAYERS) $(TCP_LAYERS)
    1313
    14 all: tracedump $(PLUGINS) asn1-test links
     14all: tracedump $(PLUGINS) links
    1515
    1616tracedump: tracedump.cc tracedump-libtrace.o tracedump-lib.o
     
    1818tracedump-lib.o: CXXFLAGS+=-DLIBDIR=$(LIBDIR)
    1919
    20 tcp_1720.so: tcp_1720.cc asn1.o
     20tcp_1720.so:
    2121
    2222%.so:%.cc
  • lib/Makefile.in

    rfb1de29 r3a3aa23  
    6262ADD_LIBS = @ADD_LIBS@
    6363AMTAR = @AMTAR@
     64AR = @AR@
    6465AS = @AS@
    6566AWK = @AWK@
    6667CC = @CC@
     68CXX = @CXX@
     69CXXCPP = @CXXCPP@
    6770DAG_TOOLS_DIR = @DAG_TOOLS_DIR@
    6871DEPDIR = @DEPDIR@
    6972DLLTOOL = @DLLTOOL@
    7073ECHO = @ECHO@
     74EGREP = @EGREP@
    7175EXEEXT = @EXEEXT@
     76F77 = @F77@
     77GCJ = @GCJ@
     78GCJFLAGS = @GCJFLAGS@
    7279INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
    7380LIBTOOL = @LIBTOOL@
     
    7784PACKAGE = @PACKAGE@
    7885RANLIB = @RANLIB@
     86RC = @RC@
    7987STRIP = @STRIP@
    8088VERSION = @VERSION@
     
    92100libtrace_la_CFLAGS = @ADD_INCLS@
    93101libtrace_la_LIBADD = @ADD_LIBS@ $(top_builddir)/replace/libreplace.a
    94 libtrace_la_LDFLAGS = -version-info 2:12:0 @ADD_LDFLAGS@
     102libtrace_la_LDFLAGS = -version-info 2:13:0 @ADD_LDFLAGS@
    95103subdir = lib
    96104mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  • lib/trace.c

    r9f61296 r3a3aa23  
    8585#if HAVE_PCAP_BPF_H
    8686#  include <pcap-bpf.h>
    87 #  ifndef HAVE_BPF
    88 #    define HAVE_BPF 1
    89 #  endif
    9087#else
    9188#  ifdef HAVE_NET_BPF_H
    9289#    include <net/bpf.h>
    93 #    ifndef HAVE_BPF
    94 #      define HAVE_BPF 1
    95 #    endif
    9690#  endif
    9791#endif
     
    9993#if HAVE_PCAP_H
    10094#  include <pcap.h>
    101 #  ifndef HAVE_PCAP
    102 #    define HAVE_PCAP 1
    103 #  endif
    10495#endif
    10596
    10697#ifdef HAVE_ZLIB_H
    10798#  include <zlib.h>
    108 #  ifndef HAVE_ZLIB
    109 #    define HAVE_ZLIB 1
    110 #  endif
    11199#endif
    112100
     
    117105#  include "dagnew.h"
    118106#  include "dagapi.h"
    119 #  ifndef DAGDEVICE
    120 #    define DAGDEVICE 1
    121 #  endif
    122107#else
    123108#  include "dagformat.h"
     
    222207#endif
    223208       
    224 #ifdef DAGDEVICE
     209#if HAVE_DAG
    225210        } else if (!strncasecmp(scan,"dag",3)) {
    226211                (*libtrace)->format=DAG;
     
    291276                        break;
    292277                case DAG:
    293 #ifdef DAGDEVICE
     278#if HAVE_DAG
    294279                        /*
    295280                         * Can have uridata of the following format:
     
    481466                                                O_RDONLY);
    482467                                        break;
    483 #ifdef DAGDEVICE
     468#if HAVE_DAG
    484469                                case DAG:
    485470                                        if((libtrace->input.fd = dag_open(libtrace->conn_info.path)) < 0) {
     
    524509        } else if (libtrace->sourcetype == SOCKET || libtrace->sourcetype == RT) {
    525510                close(libtrace->input.fd);
    526 #ifdef DAGDEVICE
     511#if HAVE_DAG
    527512        } else if (libtrace->format == DAG) {
    528513                dag_stop(libtrace->input.fd);
     
    575560                        case DEVICE:
    576561                                switch(libtrace->format) {
    577 #ifdef DAGDEVICE
     562#if HAVE_DAG
    578563                                        case DAG:
    579564
     
    706691        }
    707692
    708 #ifdef DAGDEVICE
     693#if HAVE_DAG
    709694        if (libtrace->format == DAG) {
    710695                if (libtrace->dag.diff == 0) {
Note: See TracChangeset for help on using the changeset viewer.