Merge branch 'develop'

Author: salcock

.github/workflows/dpdk.yaml

@@ -34,7 +34,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04, ubuntu-20.04]
-        dpdk_version: [dpdk-21.11, dpdk-20.11, dpdk-20.02, dpdk-19.11.5, dpdk-18.11.10, dpdk-17.11.10, dpdk-16.11.11]
+        dpdk_version: [dpdk-22.07, dpdk-21.11.2, dpdk-20.11.6, dpdk-19.11.13, dpdk-18.11.11, dpdk-17.11.10, dpdk-16.11.11]
         exclude:
           - os: ubuntu-16.04
             dpdk_version: dpdk-20.11
@@ -54,7 +54,7 @@ jobs:
         sudo mount
     - name: Install dependencies
       run: |
-        sudo apt-get -y install build-essential python3-pyelftools flex bison python3-pip python3-setuptools
+        sudo apt-get -y install build-essential python3-pyelftools flex bison python3-pip python3-setuptools libfl-dev
         sudo apt-get -y install libpcap0.8-dev libtool pkgconf wget m4 autoconf automake gcc libnuma-dev
         sudo apt-get -y install meson ninja-build
         sudo pip3 install meson ninja || true

.github/workflows/libtrace.yaml

@@ -49,7 +49,11 @@ jobs:
     - name: Install Dependencies
       run: |
         sudo apt update
-        sudo apt-get -y install flex bison libpcap0.8-dev libtool pkgconf autoconf automake m4 gcc clang llvm gcc-multilib
+        sudo apt install -y wget software-properties-common gnupg lsb-release
+        sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+        sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
+        sudo apt update
+        sudo apt-get -y install flex bison libpcap0.8-dev libtool pkgconf autoconf automake m4 gcc gcc-multilib
         sudo apt-get -y install build-essential dpdk-dev libelf-dev git libyaml-dev libssl-dev
         sudo apt-get -y install uthash-dev
     - name: Install PF_RING
@@ -61,6 +65,38 @@ jobs:
         sudo apt-get update
         sudo apt-get -y install pfring
         sudo ldconfig
+    - name: Checkout libxdp
+      uses: actions/checkout@v2
+      with:
+        path: xdp-tools
+        repository: xdp-project/xdp-tools
+    - name: Build/Install libxdp
+      run: |
+        cat << "EOF" > /tmp/ln.sh
+        #!/bin/bash
+        function do_lns {
+            LASTVERSION=0
+            for exe in `find /usr/bin/ -name ${1}-* | sort -nr | grep '\-[0-9]*$'`; do
+                newexe=`basename $exe | rev | cut -d '-' -f 1 --complement | rev`
+                version=`basename $exe | rev | cut -d '-' -f 1 | rev`
+
+                if [ ! -f /usr/local/bin/$newexe ]; then
+                    ln -s -v $exe /usr/local/bin/$newexe
+                    LASTVERSION=$version
+                elif [ "$version" -ge "$LASTVERSION" ]; then
+                    ln -f -s -v $exe /usr/local/bin/$newexe
+                    LASTVERSION=$version
+                fi
+            done
+        }
+        do_lns clang
+        do_lns llc
+        EOF
+        /bin/bash /tmp/ln.sh
+        cd xdp-tools
+        ./configure
+        sudo make -j 3 libxdp_install
+        sudo ldconfig
     - name: Checkout Libbpf
       uses: actions/checkout@v2
       with:

.github/workflows/pkg-build.yaml

@@ -16,7 +16,6 @@ jobs:
          arch:
            - amd64
          target:
-           - "debian:stretch"
            - "debian:buster"
            - "debian:bullseye"
            - "ubuntu:bionic"
@@ -36,7 +35,7 @@ jobs:
           mkdir -p packages/${DIRNAME}
           cp ../*.deb packages/${DIRNAME}/
       - name: Publish packages to cloudsmith
-        uses: wanduow/action-cloudsmith-upload-packages@v1
+        uses: wandnz/action-cloudsmith-upload-packages@v1.6
         with:
           path: packages/
           repo: ${{ secrets.CLOUDSMITH_OWNER }}/libtrace

.github/workflows/rpm-build.yaml

@@ -19,8 +19,8 @@ jobs:
           - "centos:7"
           - "fedora:35"
           - "fedora:36"
-          - "rockylinux:8.5"
-          - "almalinux:8.5"
+          - "rockylinux:8.6"
+          - "rockylinux:9.0"
 
 
     steps:
@@ -36,7 +36,7 @@ jobs:
           mkdir -p packages/${DIRNAME}
           cp ~/rpmbuild/RPMS/x86_64/*.rpm packages/${DIRNAME}/
       - name: Publish packages to cloudsmith
-        uses: salcock/action-cloudsmith-upload-packages@1.6
+        uses: salcock/action-cloudsmith-upload-packages@v1.7
         with:
           path: packages/
           repo: ${{ secrets.CLOUDSMITH_OWNER }}/libtrace

Intel DPDK Patches/README

@@ -3,7 +3,7 @@ turn on some features for the Intel 82580 Controller. These can then be enabled
 by setting the related define to 1 in the libtrace dpdk.c source file.
 
 For more information on the DPDK format check out the notes on the libtrace
-wiki https://secure.wand.net.nz/trac/libtrace/wiki/UserDocumentation.
+wiki https://github.com/LibtraceTeam/libtrace/wiki.
 
 These can be applied from the directory a level above /DPDK using this command:
 ~patch -p0 < name.patch

README

@@ -1,10 +1,10 @@
-libtrace 4.0.19
+libtrace 4.0.20
 
 ---------------------------------------------------------------------------
 Copyright (c) 2007-2022 The University of Waikato, Hamilton, New Zealand.
 All rights reserved.
 
-This code has been developed by the University of Waikato WAND
+This code was originally developed by the University of Waikato WAND
 research group. For further information please see http://www.wand.net.nz/.
 ---------------------------------------------------------------------------
 
@@ -22,14 +22,11 @@ In version 4.0, we have introduced an API for processing packets in parallel
 using multiple threads. See libtrace_parallel.h for a detailed description
 of the API.
 
-Further information about libtrace, see
-http://research.wand.net.nz/software/libtrace.php
+For further information about libtrace or to report bugs in libtrace,
+please go to https://github.com/LibtraceTeam/libtrace
 
-Bugs should be reported by either emailing contact@wand.net.nz or filing
-an issue at https://github.com/LibtraceTeam/libtrace
-
-It is licensed under the GNU Lesser General Public License (GPL) version 3.
-Please see the included files COPYING and COPYING.LESSER for details of this
+Libtrace is licensed under the GNU Lesser General Public License (GPL) version
+3. Please see the included files COPYING and COPYING.LESSER for details of this
 license.
 
 A detailed ChangeLog can be found on the libtrace wiki:
@@ -38,5 +35,3 @@ https://github.com/LibtraceTeam/libtrace/wiki/ChangeLog
 Documentation, usage instructions and a detailed tutorial can also found
 on the libtrace wiki.
 
-For further information, please contact the WAND group. See
-http://www.wand.net.nz/ for details.

configure.in

@@ -3,11 +3,11 @@
 # Now you only need to update the version number in two places - below,
 # and in the README
 
-AC_INIT([libtrace],[4.0.19],[contact@wand.net.nz],[libtrace])
+AC_INIT([libtrace],[4.0.20],[shane@alcock.co.nz],[libtrace])
 
 LIBTRACE_MAJOR=4
 LIBTRACE_MID=0
-LIBTRACE_MINOR=19
+LIBTRACE_MINOR=20
 
 # OpenSolaris hides libraries like libncurses in /usr/gnu/lib, which is not
 # searched by default - add it to LDFLAGS so we at least have a chance of 
@@ -61,7 +61,7 @@ AC_CACHE_CHECK([whether the C++ compiler works],
 ])
 
 # Put all our automake definitions in config.h
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
 
 # Checks for C and C++ compilers
 AC_PROG_CC
@@ -73,11 +73,11 @@ if test "$rw_cv_prog_cxx_works" = "no"; then
 fi
 
 # Checking for 'install'
-AC_PROG_INSTALL
+LT_INIT
 
 # Checking for bison and flex
 AC_CHECK_PROGS(YACC, 'bison -y' byacc yacc) 
-AM_PROG_LEX
+AC_PROG_LEX(yywrap)
 
 PKG_PROG_PKG_CONFIG
 
@@ -93,7 +93,8 @@ AC_C_CONST
 AC_C_INLINE
 AC_C_BIGENDIAN
 AC_TYPE_SIZE_T
-AC_HEADER_TIME
+AC_CHECK_HEADERS_ONCE([sys/time.h])
+
 AC_SYS_LARGEFILE
 
 LIBPKTDUMP_LIBS="-ltrace "
@@ -147,7 +148,7 @@ gcc_FORMAT
 gcc_TLS
 
 # Check for libtool
-AC_PROG_LIBTOOL
+LT_INIT
 
 # Checks for library functions.
 AC_PROG_GCC_TRADITIONAL
@@ -160,7 +161,6 @@ AC_CHECK_SIZEOF([long int])
 
 
 # Checks for header files.
-AC_HEADER_STDC
 AC_CHECK_HEADERS(pcap.h pcap-bpf.h net/bpf.h sys/limits.h stddef.h inttypes.h limits.h net/ethernet.h sys/prctl.h)
 
 
@@ -238,7 +238,7 @@ AC_CHECK_HEADER(gdc.h,AC_DEFINE(HAVE_LIBGDC,1,[has gdc.h]))
 # Check for libwandio (no longer bundled with libtrace)
 AC_CHECK_LIB(wandio,wandio_wflush,wandiofound=1,wandiofound=0)
 if test "$wandiofound" = 0; then
-	AC_MSG_ERROR(libwandio 4.0.0 or better is required to compile this version of libtrace. If you have installed libwandio in a non-standard location please use LDFLAGS to specify the location of the library. WANDIO can be obtained from http://research.wand.net.nz/software/libwandio.php)
+	AC_MSG_ERROR(libwandio 4.0.0 or better is required to compile this version of libtrace. If you have installed libwandio in a non-standard location please use LDFLAGS to specify the location of the library. WANDIO can be obtained from https://github.com/LibtraceTeam/wandio)
 else
 	LIBTRACE_LIBS="$LIBTRACE_LIBS -lwandio"
         TOOLS_LIBS="$TOOLS_LIBS -lwandio"
@@ -307,32 +307,58 @@ AC_ARG_WITH(xdp, AS_HELP_STRING(--with-xdp, include XDP capture support),
 
 if test "$want_xdp" != no; then
     AC_CHECK_LIB(elf, elf_begin, elffound=1, elffound=0)
+
     if test "$elffound" = 1; then
-        # check for libbpf
-        AC_CHECK_LIB(bpf, xsk_socket__create, bpffound=1, bpffound=0, -lelf)
-
-        if test "$bpffound" = 1; then
-            AC_DEFINE(HAVE_LIBBPF, 1, [Set to 1 if libbpf is available])
-            ADD_LDFLAGS="$ADD_LDFLAGS -lbpf -lelf"
-            libtrace_xdp=true
-
-            # check for requirements to build XDP eBPF kernel
-            AC_CHECK_PROG(CLANG, [clang], [clang], [no])
-            if test "$CLANG" != "no"; then
-
-                AC_SUBST(CLANG)
-                llc_candidates=$($CLANG --version | \
-                    awk '/^clang version/ {
-                    split($3, v, ".");
-                    printf("llc-%s.%s llc-%s llc", v[[1]], v[[2]], v[[1]])
-                }')
-                AC_CHECK_PROGS([LLC], [$llc_candidates], [no])
-                if test "$LLC" != "no"; then
-                    AC_SUBST(LLC)
-                    build_ebpf=true
+        AC_CHECK_LIB(xdp, xsk_socket__create, xdpfound=1, xdpfound=0, -lelf)
+
+        if test "$xdpfound" = 1; then
+            # check for libbpf
+            AC_CHECK_LIB(bpf, bpf_map_update_elem, bpffound=1, bpffound=0,
+            -lelf -lxdp)
+
+            if test "$bpffound" = 1; then
+                AC_DEFINE(HAVE_LIBBPF, 1, [Set to 1 if libbpf is available])
+                ADD_LDFLAGS="$ADD_LDFLAGS -lbpf -lelf -lxdp"
+                libtrace_xdp=true
+
+                AC_CHECK_LIB(bpf, bpf_xdp_query_id, bpfnewer=1, bpfnewer=0,
+                        -lelf -lxdp)
+                if test "$bpffound" = 1; then
+                    AC_DEFINE(HAVE_LIBBPF_XDP_QUERYID, 1, [Set to 1 if libbpf supports bpf_xdp_query_id])
                 fi
 
-            fi
+                # check for requirements to build XDP eBPF kernel
+                AC_CHECK_PROG(CLANG, [clang], [clang], [no])
+                if test "$CLANG" != "no"; then
+
+                    AC_SUBST(CLANG)
+                    llc_candidates=$($CLANG --version | \
+                        awk '/^clang version/ {
+                        split($3, v, ".");
+                        printf("llc-%s.%s llc-%s llc", v[[1]], v[[2]], v[[1]])
+                    }')
+                    AC_CHECK_PROGS([LLC], [$llc_candidates], [no])
+                    if test "$LLC" != "no"; then
+                        AC_SUBST(LLC)
+                        build_ebpf=true
+                    else
+                        llc_candidates=$($CLANG --version | \
+                            awk '/ clang version/ {
+                            split($4, v, ".");
+                            printf("llc-%s.%s llc-%s llc", v[[1]], v[[2]], v[[1]])
+                        }')
+                        LLC=""
+                        AC_CHECK_PROGS([LLC], [$llc_candidates], [no])
+                        if test "$LLC" != "no"; then
+                            AC_SUBST(LLC)
+                            build_ebpf=true
+                        fi
+                    fi
+
+                 fi
+             else
+                 libtrace_xdp=false
+             fi
         else
             libtrace_xdp=false
         fi
@@ -341,7 +367,7 @@ fi
 
 # was xdp build explicitly specified and failed
 if test "$want_xdp" = yes -a "$libtrace_xdp" = false; then
-    AC_MSG_ERROR([libelf and libbpf are required for XDP support])
+    AC_MSG_ERROR([libelf, libxdp and libbpf are required for XDP support])
 fi
 
 # was ebpf build explicitly specified and failed
@@ -413,7 +439,7 @@ fi
 # Configure options for use of DAG cards
 # Originally borrowed from libpcap, but extended quite a bit :)
 # More details on how this check works: 
-#	http://wand.net.nz/trac/libtrace/wiki/DAGNotes
+#	https://github.com/LibtraceTeam/libtrace/wiki
 
 AC_ARG_WITH(dag, 
 	    AS_HELP_STRING(--with-dag[=DIR],include DAG live capture support (located in directory DIR, if supplied)),
@@ -539,7 +565,7 @@ if test "$want_numa" != no; then
 fi
 
 # Need libwandder for ETSI live decoding
-AC_CHECK_LIB(wandder, init_wandder_decoder, have_wandder=1, have_wandder=0)
+AC_CHECK_LIB(wandder, wandder_etsili_get_cc_format, have_wandder=1, have_wandder=0)
 
 # Checks for various "optional" libraries
 AC_CHECK_LIB(pthread, pthread_create, have_pthread=1, have_pthread=0)
@@ -878,8 +904,7 @@ LIBS=
 # For now, the user has to explicitly ask for the LLVM stuff, as it's a bit
 # rough around the edges :(
 AC_ARG_WITH([llvm],
-	[AC_HELP_STRING([--with-llvm],
-		[support Just In Time compiler])],
+	[AS_HELP_STRING([--with-llvm],[support Just In Time compiler])],
 	use_llvm="yes",
 	use_llvm="no")
 JIT=no
@@ -921,7 +946,7 @@ fi
 PKG_CHECK_MODULES(ncurses,ncurses,have_ncurses=yes,have_ncurses=no)
 
 AC_ARG_WITH([ncurses],
-	AC_HELP_STRING([--with-ncurses], [build tracetop (requires ncurses)]))
+	AS_HELP_STRING([--with-ncurses],[build tracetop (requires ncurses)]))
 
 AS_IF([test "x$with_ncurses" != "xno"],
 	[AC_SEARCH_LIBS(mvprintw, ncurses, have_ncurses=yes, have_ncurses=no)
@@ -1075,7 +1100,7 @@ else
 fi
 
 reportopt "Compiled with LLVM BPF JIT support" $JIT
-reportopt "Compiled with live ETSI LI support (requires libwandder)" $wandder_avail
+reportopt "Compiled with live ETSI LI support (requires libwandder >= 2.0.6)" $wandder_avail
 reportopt "Building man pages/documentation" $libtrace_doxygen
 reportopt "Building tracetop (requires libncurses)" $with_ncurses
 reportopt "Building traceanon (requires libyaml)" $have_yaml

debian/changelog

@@ -1,3 +1,10 @@
+libtrace4 (4.0.20-1) unstable; urgency=medium
+
+  * Updated XDP module to be able to build against recent libxdp
+  * Updated libpacketdump to be able to decode ETSI LI email CCs and IRIs
+
+ -- Shane Alcock <shane@alcock.co.nz>  Mon, 07 Nov 2022 11:09:47 +1300
+
 libtrace4 (4.0.19-1) unstable; urgency=medium
 
   * Fixed issues with compiling against DPDK 21.11