Changes in / [9d00fb13:5732e9b]


Ignore:
Location:
lib
Files:
2 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • lib/Makefile.am

    rea75ec2 red5b2ce  
    6262                protocols_transport.c protocols.h protocols_ospf.c \
    6363                protocols_application.c \
    64                 $(DAGSOURCE) format_erf.h format_ndag.c format_ndag.h \
     64                $(DAGSOURCE) format_erf.h \
    6565                $(BPFJITSOURCE) \
    6666                libtrace_arphrd.h \
  • lib/format_erf.c

    r0317e3c ree6e802  
    126126static int erf_get_padding(const libtrace_packet_t *packet)
    127127{
    128         if (packet->trace->format->type==TRACE_FORMAT_ERF ||
    129                         packet->trace->format->type == TRACE_FORMAT_NDAG ||
    130                         packet->trace->format->type == TRACE_FORMAT_RAWERF) {
     128        if (packet->trace->format->type==TRACE_FORMAT_ERF) {
    131129                dag_record_t *erfptr = (dag_record_t *)packet->header;
    132130                switch((erfptr->type & 0x7f)) {
  • lib/libtrace.h.in

    rea75ec2 red5b2ce  
    393393        TRACE_FORMAT_DPDK     =17, /**< The Intel Data Plane Development Kit format */
    394394        TRACE_FORMAT_PCAPNG     =18,    /**< PCAP-NG trace file */
    395         TRACE_FORMAT_NDAG       =19,    /**< DAG multicast over a network */
    396395};
    397396
     
    14001399        X(dropped) \
    14011400        X(captured) \
    1402         X(missing) \
    14031401        X(errors)
    14041402
     
    14191417         * was alloc'd by us. We can easily decrease the no. bits without
    14201418         * problems as long as we update any asserts as needed */
    1421         LT_BITFIELD64 reserved1: 25; /**< Bits reserved for future fields */
     1419        LT_BITFIELD64 reserved1: 26; /**< Bits reserved for future fields */
    14221420        LT_BITFIELD64 reserved2: 24; /**< Bits reserved for future fields */
    14231421        LT_BITFIELD64 magic: 8; /**< A number stored against the format to
     
    14711469         */
    14721470        uint64_t captured;
    1473 
    1474         /** The number of packets (or aggregated records) that have been
    1475          *  lost between the original capture device and the current input
    1476          *  trace.
    1477          *
    1478          *  @note Only relevant for input formats that use a network to
    1479          *  transfer live captured packets from one host to another (e.g.
    1480          *  nDAG).
    1481          */
    1482         uint64_t missing;
    14831471
    14841472        /** The number of packets that have been discarded by the network card
  • lib/libtrace_int.h

    rea75ec2 red5b2ce  
    12761276/** Constructor for the ATM Header format module */
    12771277void atmhdr_constructor(void);
    1278 /** Constructor for the network DAG format module */
    1279 void ndag_constructor(void);
    12801278#ifdef HAVE_BPF
    12811279/** Constructor for the BPF format module */
  • lib/trace.c

    rea75ec2 red5b2ce  
    147147                pcapng_constructor();
    148148                rt_constructor();
    149                 ndag_constructor();
    150149#ifdef HAVE_DAG
    151150                dag_constructor();
  • lib/trace_parallel.c

    rea75ec2 red5b2ce  
    17471747        /* Try start the format - we prefer parallel over single threaded, as
    17481748         * these formats should support messages better */
    1749 
    17501749        if (trace_supports_parallel(libtrace) &&
    17511750            !trace_has_dedicated_hasher(libtrace)) {
Note: See TracChangeset for help on using the changeset viewer.