Merge branch 'develop'

README

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

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.22],[[email protected]],[libtrace])
+AC_INIT([libtrace],[4.0.23],[[email protected]],[libtrace])
 
 LIBTRACE_MAJOR=4
 LIBTRACE_MID=0
-LIBTRACE_MINOR=22
+LIBTRACE_MINOR=23
 
 # 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 
@@ -102,8 +102,10 @@ ADD_LDFLAGS="$ADD_LDFLAGS -L\$(abs_top_srcdir)/lib"
 LIBTRACE_LIBS=""
 TOOLS_LIBS=""
 
-CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wextra -DLT_BUILDING_DLL=1"
-CXXFLAGS="$CXXFLAGS -Wall -DLT_BUILDING_DLL=1"
+CFLAGS="$CFLAGS  -Wall -Wmissing-prototypes -Wextra -DLT_BUILDING_DLL=1"
+CXXFLAGS="$CXXFLAGS  -Wall -DLT_BUILDING_DLL=1"
+#CFLAGS="$CFLAGS -fsanitize=address -Wall -Wmissing-prototypes -Wextra -DLT_BUILDING_DLL=1"
+#CXXFLAGS="$CXXFLAGS -fsanitize=address -Wall -DLT_BUILDING_DLL=1"
 
 AC_ARG_ENABLE(address-san, AS_HELP_STRING(--enable-address-san, Enable address and memory sanitisation),
 [

debian/changelog

@@ -1,3 +1,19 @@
+libtrace4 (4.0.23-1) unstable; urgency=medium
+
+  * Add new tool: traceucast, a TCP unicast variant of tracemcast.
+  * Add new input format: ndagtcp, for receiving packets sent by
+    traceucast.
+  * libpacketdump: fix premature free when decoding IPMM IRIs
+    received via an etsilive input.
+  * tracemcast: fix bug where the sequence number was not being
+    incremented for each sent datagram.
+  * object cache data structure: fix potential segfault after
+    resizing the cache.
+  * pcapfile: fix issue where packets owned by "dead" pcapfile trace
+    would have an invalid pcap version.
+
+ -- Shane Alcock <[email protected]>  Fri, 10 Nov 2023 09:40:41 +1300
+
 libtrace4 (4.0.22-1) unstable; urgency=medium
 
   * Fix segmentation fault when closing an ndag input that had

lib/Makefile.am

@@ -146,7 +146,7 @@ endif
 
 AM_CPPFLAGS= @ADD_INCLS@
 libtrace_la_LIBADD = @LIBTRACE_LIBS@ @LTLIBOBJS@ $(DPDKLIBS)
-libtrace_la_LDFLAGS=-version-info 7:6:0 @ADD_LDFLAGS@
+libtrace_la_LDFLAGS=-version-info 7:7:0 @ADD_LDFLAGS@
 dagapi.c:
 	cp @DAG_TOOLS_DIR@/dagapi.c .
 

lib/data-struct/object_cache.c

@@ -146,7 +146,7 @@ static void resize_memory_caches(struct local_caches *lcs) {
 		fprintf(stderr, "Expected lcs->t_mem_caches_total to be greater or equal to 0 in resize_memory_caches()\n");
 		return;
 	}
-	lcs->t_mem_caches += 0x10;
+	lcs->t_mem_caches_total += 0x10;
 	lcs->t_mem_caches = realloc(lcs->t_mem_caches,
 	                            lcs->t_mem_caches_total * sizeof(struct local_cache));
 }