Merge branch 'gtpthreads' into develop

debian/changelog

@@ -44,6 +44,12 @@ openli (1.1.6-1) unstable; urgency=medium
   * Added new parameter for IP intercepts: mobileident -- this is
     used to indicate whether the user identifier for a mobile data
     intercept is an MSISDN, IMEI or IMSI.
+<<<<<<< HEAD
+  * VOIP intercepts that are written to pcap files will now include
+    their corresponding SIP packets alongside the RTP streams.
+
+ -- Shane Alcock <[email protected]>  Wed, 22 May 2024 11:08:41 +1200
+=======
   * Add support for including SIP packets in pcapdisk output for
     VoIP intercepts.
   * Fix bug where mediators receiving message from a collector via
@@ -57,6 +63,7 @@ openli (1.1.6-1) unstable; urgency=medium
     blocked.
 
  -- Shane Alcock <[email protected]>  Mon, 1 Jul 2024 09:57:07 +1200
+>>>>>>> master
 
 openli (1.1.5-1) unstable; urgency=medium
 

src/Makefile.am

@@ -71,7 +71,10 @@ openlicollector_SOURCES=collector/collector.c configparser.c configparser.h \
                 collector/etsiencoding/etsiencoding.c \
                 collector/etsiencoding/encryptcontainer.c \
                 collector/etsiencoding/ipmmiri.c \
+                collector/etsiencoding/epsiri.c collector/epsiri.h \
                 collector/sms_worker.c collector/sms_worker.h \
+                collector/gtp_worker.c collector/gtp_worker.h \
+				collector/gtp.h \
                 collector/location.c collector/location.h \
                 collector/collector_util.c collector/collector_util.h \
                 $(PLUGIN_SRCS)