Changeset df87f00


Ignore:
Timestamp:
05/18/18 11:39:59 (2 years ago)
Author:
Shane Alcock <salcock@…>
Branches:
cachetimestamps, develop, etsilive, master, rc-4.0.4, ringdecrementfix, ringperformance
Children:
b663d33
Parents:
bd51874
git-author:
Shane Alcock <salcock@…> (11/28/17 16:22:37)
git-committer:
Shane Alcock <salcock@…> (05/18/18 11:39:59)
Message:

First bits of code for an ETSI live format

Will probably remove the dependencies on the ASN.1 stuff
soon, but chucking it all in for now just so everything will
compile nicely.

Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • configure.in

    r62ee4ec rdf87f00  
    215215        AC_CHECK_HEADER(openssl/evp.h, cryptofound=1, cryptofound=0)
    216216fi
     217AC_CHECK_LIB(tasn1, asn1_array2tree, asn1found=1, asn1found=0)
    217218
    218219# Check for libpcap
     
    516517fi
    517518
     519if test "$asn1found" = 1; then
     520        AC_DEFINE(HAVE_LIBTASN1, 1, [Set to 1 if libtasn1 is available])
     521        LIBTRACE_LIBS="$LIBTRACE_LIBS -ltasn1"
     522        TOOLS_LIBS="$TOOLS_LIBS -ltasn1"
     523        have_asn1=yes
     524else
     525        have_asn1=no
     526fi
     527
    518528if test "$have_nsl" = 1; then
    519529        if test "$ac_cv_search_inet_ntop" != "none required"; then
     
    695705fi
    696706reportopt "Compiled with LLVM BPF JIT support" $JIT
     707reportopt "Compiled with live ETSI LI support (requires libtasn1)" $have_asn1
    697708reportopt "Building man pages/documentation" $libtrace_doxygen
    698709reportopt "Building tracetop (requires libncurses)" $with_ncurses
  • lib/Makefile.am

    r49969f2 rdf87f00  
    77        data-struct/deque.h data-struct/linked_list.h \
    88        data-struct/buckets.h data-struct/sliding_window.h \
    9         data-struct/message_queue.h hash_toeplitz.h
     9        data-struct/message_queue.h hash_toeplitz.h \
     10        data-struct/simple_circular_buffer.h
    1011
    1112AM_CFLAGS=@LIBCFLAGS@ @CFLAG_VISIBILITY@ -pthread
     
    5556                format_rt.c format_helper.c format_helper.h format_pcapfile.c \
    5657                format_duck.c format_tsh.c $(NATIVEFORMATS) $(BPFFORMATS) \
    57                 format_atmhdr.c format_pcapng.c \
     58                format_atmhdr.c format_pcapng.c format_etsilive.c \
    5859                libtrace_int.h lt_inttypes.h lt_bswap.h \
    5960                linktypes.c link_wireless.c byteswap.c \
     
    6970                data-struct/sliding_window.c data-struct/object_cache.c \
    7071                data-struct/linked_list.c hash_toeplitz.c combiner_ordered.c \
    71                 data-struct/buckets.c \
     72                data-struct/buckets.c data-struct/simple_circular_buffer.c \
    7273                combiner_sorted.c combiner_unordered.c \
    7374                pthread_spinlock.c pthread_spinlock.h
  • lib/libtrace.h.in

    rc1205bd rdf87f00  
    398398        TRACE_FORMAT_NDAG       =19,    /**< DAG multicast over a network */
    399399        TRACE_FORMAT_DPDK_NDAG       =20,    /**< DAG multicast over a network, received via DPDK */
     400        TRACE_FORMAT_ETSILIVE     =21,  /**< ETSI LI over a network */
    400401};
    401402
  • lib/libtrace_int.h

    re375e0f rdf87f00  
    12421242/** Constructor for the network DAG format module */
    12431243void ndag_constructor(void);
     1244/** Constructor for the live ETSI over TCP format module */
     1245void etsilive_constructor(void);
    12441246#ifdef HAVE_BPF
    12451247/** Constructor for the BPF format module */
  • lib/trace.c

    rdc27de3 rdf87f00  
    148148                rt_constructor();
    149149                ndag_constructor();
     150                etsilive_constructor();
    150151#ifdef HAVE_DAG
    151152                dag_constructor();
Note: See TracChangeset for help on using the changeset viewer.