Merge branch 'develop'

Author: salcock

.github/workflows/pkg-build.yaml

@@ -17,7 +17,6 @@ jobs:
            - amd64
          target:
            - "debian:bookworm"
-           - "debian:buster"
            - "debian:bullseye"
            - "ubuntu:noble"
            - "ubuntu:focal"
@@ -53,7 +52,6 @@ jobs:
          arch:
            - amd64
          target:
-           - "debian:buster"
            - "debian:bullseye"
            - "ubuntu:focal"
            - "ubuntu:jammy"
@@ -95,7 +93,6 @@ jobs:
          arch:
            - amd64
          target:
-           - "debian:buster"
            - "debian:bullseye"
            - "debian:bookworm"
            - "ubuntu:focal"

README

@@ -1,4 +1,4 @@
-libtrace 4.0.27
+libtrace 4.0.28
 
 Code and documentation added since version 4.0.20 is
 Copyright (c) 2023-2025 Shane Alcock and has been contributed as per

configure.in

@@ -3,7 +3,7 @@
 # Now you only need to update the version number in two places - below,
 # and in the README
 
-AC_INIT([libtrace],[4.0.27],[[email protected]],[libtrace])
+AC_INIT([libtrace],[4.0.28],[[email protected]],[libtrace])
 
 LIBTRACE_MAJOR=4
 LIBTRACE_MID=0

debian/changelog

@@ -1,3 +1,10 @@
+libtrace4 (4.0.28-1) unstable; urgency=medium
+
+  * libpacketdump: add decoding support for ETSI CC payloads that
+    contain TCP, UDP, or RTP payloads.
+
+ -- Shane Alcock <[email protected]>  Mon, 17 Feb 2025 11:53:49 +1300
+
 libtrace4 (4.0.27-1) unstable; urgency=medium
 
   * Added new API methods: trace_get_uri_format() and trace_get_uri_body().

debian/control

@@ -4,7 +4,7 @@ Maintainer: Shane Alcock <[email protected]>
 Build-Depends: debhelper-compat (= 12), dh-autoreconf,
  libpcap-dev, zlib1g-dev, flex, bison, doxygen, liblzma-dev, graphviz,
  libncurses5-dev, libbz2-dev, libssl-dev, libwandio1-dev (>= 4.0.0),
- libwandder2-dev (>= 2.0.6), dpdk-dev, libnuma-dev, libyaml-dev,
+ libwandder2-dev (>= 2.0.14), dpdk-dev, libnuma-dev, libyaml-dev,
  gcc-multilib
 Standards-Version: 4.1.3
 Section: libs

libpacketdump/Makefile.am

@@ -198,7 +198,7 @@ AM_CPPFLAGS= @ADD_INCLS@ -I../lib
 # a shared library.
 libpacketdump_la_LIBADD = @LIBPKTDUMP_LIBS@ 
 libpacketdump_la_LDFLAGS=\
-        -version-info 5:8:0 \
+        -version-info 5:9:0 \
         @ADD_LDFLAGS@
 
 AM_CXXFLAGS=-g -Wall -DDIRNAME=\"$(plugindir)\" $(AM_CPPFLAGS)

libpacketdump/link_22.c

@@ -48,6 +48,12 @@ DLLEXPORT void decode(int link_type UNUSED, const char *packet, unsigned len)
                                                   : TRACE_ETHERTYPE_IPV6);
         } else if (ccformat == WANDDER_ETSILI_CC_FORMAT_APPLICATION) {
             decode_next((const char *)cchdr, rem, "tcp", 0);
+        } else if (ccformat == WANDDER_ETSILI_CC_FORMAT_TCP) {
+            decode_next((const char *)cchdr, rem, "ip", 6);
+        } else if (ccformat == WANDDER_ETSILI_CC_FORMAT_UDP) {
+            decode_next((const char *)cchdr, rem, "ip", 17);
+        } else if (ccformat == WANDDER_ETSILI_CC_FORMAT_RTP) {
+            decode_next((const char *)cchdr, rem, "udp", 0);
         }
 
         wandder_free_etsili_decoder(dec);

libwandder

@@ -1,5 +1,5 @@
 Name:           libtrace4
-Version:        4.0.27
+Version:        4.0.28
 Release:        1%{?dist}
 Summary:        C Library for capturing and analysing network packets
 
@@ -18,7 +18,7 @@ BuildRequires: numactl-devel
 BuildRequires: ncurses-devel
 BuildRequires: openssl-devel
 BuildRequires: libyaml-devel
-BuildRequires: libwandder2-devel >= 2.0.6
+BuildRequires: libwandder2-devel >= 2.0.14
 BuildRequires: libwandio1-devel
 BuildRequires: dpdk-devel
 BuildRequires: (flex-devel or libfl-static)
@@ -127,6 +127,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %changelog
+* Mon Feb 17 2025 Shane Alcock <[email protected]> - 4.0.28-1
+- Updated for 4.0.28 release
+
 * Tue Feb 4 2025 Shane Alcock <[email protected]> - 4.0.27-1
 - Updated for 4.0.27 release