Changeset dce95f3 for lib


Ignore:
Timestamp:
11/19/04 12:45:04 (17 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:
1f284e7
Parents:
79ffccd
Message:

fixed part of the conditional codepath for pcap

Location:
lib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lib/Makefile.in

    rad7c782 rdce95f3  
    6262ADD_LIBS = @ADD_LIBS@
    6363AMTAR = @AMTAR@
    64 AR = @AR@
    6564AS = @AS@
    6665AWK = @AWK@
    6766CC = @CC@
    68 CXX = @CXX@
    69 CXXCPP = @CXXCPP@
    7067DEPDIR = @DEPDIR@
    7168DLLTOOL = @DLLTOOL@
    7269ECHO = @ECHO@
    73 EGREP = @EGREP@
    7470EXEEXT = @EXEEXT@
    75 F77 = @F77@
    76 GCJ = @GCJ@
    77 GCJFLAGS = @GCJFLAGS@
    7871INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
    7972LIBTOOL = @LIBTOOL@
     
    8376PACKAGE = @PACKAGE@
    8477RANLIB = @RANLIB@
    85 RC = @RC@
    8678STRIP = @STRIP@
    8779VERSION = @VERSION@
  • lib/trace.c

    r624a2f5 rdce95f3  
    8181#include "libtrace.h"
    8282#include "fifo.h"
     83
     84#define HAVE_BPF 0
     85#define HAVE_PCAP 0
     86#define HAVE_ZLIB 0
     87#define DAGDEVICE 0
    8388
    8489#if HAVE_PCAP_BPF_H
     
    368373        struct sockaddr_in remote;
    369374        struct sockaddr_un unix_sock;
     375#if HAVE_PCAP
    370376        char errbuf[PCAP_ERRBUF_SIZE];
     377#endif
    371378
    372379        if(init_trace(&libtrace,uri) == 0) {
     
    620627        int size;
    621628        char buf[RP_BUFSIZE];
     629#if HAVE_PCAP
    622630        struct pcap_pkthdr pcaphdr;
     631        const u_char *pcappkt;
     632#endif
    623633        dag_record_t *erfptr;
    624         const u_char *pcappkt;
    625634        int read_required = 0;
    626635
     
    976985                        timestamp = erfptr->ts;
    977986                        break;
     987#if HAVE_PCAP
    978988                case PCAPINT:
    979989                case PCAP:
     
    982992                                (pcapptr->ts.tv_usec*UINT_MAX/1000000));
    983993                        break;
     994#endif
    984995                case WAGINT:
    985996                case WAG:
Note: See TracChangeset for help on using the changeset viewer.