Changeset df87f00

Timestamp:

05/18/18 11:39:59 (3 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:

• configure.in (modified) (3 diffs)
• lib/Makefile.am (modified) (3 diffs)
• lib/etsiasn1tab.h (added)
• lib/format_etsilive.c (added)
• lib/libtrace.h.in (modified) (1 diff)
• lib/libtrace_int.h (modified) (1 diff)
• lib/trace.c (modified) (1 diff)

configure.in

@@ -215 +215 @@
         AC_CHECK_HEADER(openssl/evp.h, cryptofound=1, cryptofound=0)
 fi
+AC_CHECK_LIB(tasn1, asn1_array2tree, asn1found=1, asn1found=0)
 
 # Check for libpcap
@@ -516 +517 @@
 fi
 
+if test "$asn1found" = 1; then
+        AC_DEFINE(HAVE_LIBTASN1, 1, [Set to 1 if libtasn1 is available])
+        LIBTRACE_LIBS="$LIBTRACE_LIBS -ltasn1"
+        TOOLS_LIBS="$TOOLS_LIBS -ltasn1"
+        have_asn1=yes
+else
+        have_asn1=no
+fi
+
 if test "$have_nsl" = 1; then
         if test "$ac_cv_search_inet_ntop" != "none required"; then
@@ -695 +705 @@
 fi
 reportopt "Compiled with LLVM BPF JIT support" $JIT
+reportopt "Compiled with live ETSI LI support (requires libtasn1)" $have_asn1
 reportopt "Building man pages/documentation" $libtrace_doxygen
 reportopt "Building tracetop (requires libncurses)" $with_ncurses

lib/Makefile.am

@@ -7 +7 @@
         data-struct/deque.h data-struct/linked_list.h \
         data-struct/buckets.h data-struct/sliding_window.h \
-        data-struct/message_queue.h hash_toeplitz.h
+        data-struct/message_queue.h hash_toeplitz.h \
+        data-struct/simple_circular_buffer.h
 
 AM_CFLAGS=@LIBCFLAGS@ @CFLAG_VISIBILITY@ -pthread
@@ -55 +56 @@
                 format_rt.c format_helper.c format_helper.h format_pcapfile.c \
                 format_duck.c format_tsh.c $(NATIVEFORMATS) $(BPFFORMATS) \
-                format_atmhdr.c format_pcapng.c \
+                format_atmhdr.c format_pcapng.c format_etsilive.c \
                 libtrace_int.h lt_inttypes.h lt_bswap.h \
                 linktypes.c link_wireless.c byteswap.c \
@@ -69 +70 @@
                 data-struct/sliding_window.c data-struct/object_cache.c \
                 data-struct/linked_list.c hash_toeplitz.c combiner_ordered.c \
-                data-struct/buckets.c \
+                data-struct/buckets.c data-struct/simple_circular_buffer.c \
                 combiner_sorted.c combiner_unordered.c \
                 pthread_spinlock.c pthread_spinlock.h

lib/libtrace.h.in

@@ -398 +398 @@
         TRACE_FORMAT_NDAG       =19,    /**< DAG multicast over a network */
         TRACE_FORMAT_DPDK_NDAG       =20,    /**< DAG multicast over a network, received via DPDK */
+        TRACE_FORMAT_ETSILIVE     =21,  /**< ETSI LI over a network */
 };
 

lib/libtrace_int.h

@@ -1242 +1242 @@
 /** Constructor for the network DAG format module */
 void ndag_constructor(void);
+/** Constructor for the live ETSI over TCP format module */
+void etsilive_constructor(void);
 #ifdef HAVE_BPF
 /** Constructor for the BPF format module */

lib/trace.c

@@ -148 +148 @@
                 rt_constructor();
                 ndag_constructor();
+                etsilive_constructor();
 #ifdef HAVE_DAG
                 dag_constructor();