Merge branch 'develop'

Author: salcock

.github/workflows/deb-build.yaml

@@ -17,7 +17,6 @@ jobs:
            - amd64
          target:
            - "debian:bookworm"
-           - "debian:buster"
            - "debian:bullseye"
            - "ubuntu:focal"
            - "ubuntu:jammy"
@@ -54,7 +53,6 @@ jobs:
          arch:
            - amd64
          target:
-           - "debian:buster"
            - "debian:bullseye"
            - "ubuntu:focal"
            - "ubuntu:jammy"
@@ -100,7 +98,6 @@ jobs:
          arch:
            - amd64
          target:
-           - "debian:buster"
            - "debian:bullseye"
            - "debian:bookworm"
            - "ubuntu:focal"

README.md

@@ -1,10 +1,10 @@
 OpenLI -- open source ETSI-compliant Lawful Intercept software
 
-Version: 1.1.8
+Version: 1.1.9
 
 ---------------------------------------------------------------------------
 
-Copyright (c) 2018 - 2024 The University of Waikato, Hamilton, New Zealand.
+Copyright (c) 2024 SearchLight Ltd, New Zealand.
 All rights reserved.
 
 OpenLI was originally developed by the University of Waikato WAND research
@@ -78,11 +78,11 @@ will be more than happy to accept your contribution.
 
 ## Dependencies for building from source
 
-* [libtrace 4.0.18 or later](https://github.com/LibtraceTeam/libtrace/)
+* [libtrace 4.0.24 or later](https://github.com/LibtraceTeam/libtrace/)
   (packages for Debian / Ubuntu are available
   [from WAND](https://cloudsmith.io/~wand/repos/libtrace/packages/) as well).
 
-* [libwandder 2.0.4 or later](https://github.com/LibtraceTeam/libwandder/)
+* [libwandder 2.0.13 or later](https://github.com/LibtraceTeam/libwandder/)
   (packages for Debian / Ubuntu are available
   [from WAND](https://cloudsmith.io/~wand/repos/libwandder/packages/) as well).
 

configure.ac

@@ -1,6 +1,6 @@
 # Super primitive configure script
 
-AC_INIT([openli],[1.1.8],[[email protected]])
+AC_INIT([openli],[1.1.9],[[email protected]])
 
 AM_INIT_AUTOMAKE([subdir-objects])
 AC_CONFIG_SRCDIR(src/collector/collector.c)

debian/changelog

@@ -1,3 +1,35 @@
+openli (1.1.9-1) unstable; urgency=medium
+
+  * RADIUS: fix crash that can occur under very rare circumstances due to
+    a dangling user record pointer in an old unmatched request.
+  * RADIUS: fix bug where CINs for all RADIUS sessions were zero.
+  * Fix potential silent exit in collector if a packet cannot be
+    copied to be sent to another thread.
+  * Mobile data: move processing of GTP traffic / sessions into separate worker
+    threads.
+  * Mobile data: add (experimental) support for intercepting GTP-U traffic for
+    sessions where the GTP-C identity matches an intercept target.
+    Only applies to GTPv2 sessions -- no CC interception is performed for
+    GTPv1 sessions (i.e UMTS-CCs).
+  * Mobile data: add support for intercepting GTP-C traffic for intercept
+    targets and encoding it as either EPS-IRIs (for GTPv2) or UMTS-IRIs
+    (for GTPv1).
+  * Mobile data: IP-based mobile intercepts are now encoded as EPS-CCs,
+    instead of UMTS-CCs.
+  * Mediator: allow RabbitMQ internal password to be specified using
+    either "RMQlocalpass" OR "RMQinternalpass" config options, so
+    as to match the existing documentation.
+  * SIP: fix bug where RTP would not be intercepted if the SIP traffic
+    is proxied back to the original source IP.
+  * SIP: fix assertion failure when reassembling TCP SIP traffic that
+    happens to have trailing bytes (such as an extra '\r\n' sequence).
+  * SIP: fix double frees that could occur when reassembling TCP SIP
+    traffic.
+  * Removed some internally defined OID consts and replaced them with
+    ones defined by libwandder.
+
+ -- Shane Alcock <[email protected]>  Fri, 27 Sep 2024 10:47:19 +1200
+
 openli (1.1.8-1) unstable; urgency=medium
 
   * Collector: fix crash in sync_voip thread if an invalid SIP packet

debian/control

@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Shane Alcock <[email protected]>
 Build-Depends: debhelper-compat (= 12), dh-autoreconf, dh-systemd (>=1.5),
- libtrace4-dev (>= 4.0.24), libyaml-dev, uthash-dev, libwandder2-dev (>=2.0.10),
+ libtrace4-dev (>= 4.0.24), libyaml-dev, uthash-dev, libwandder2-dev (>=2.0.13),
  libjudy-dev, libzmq3-dev, libgoogle-perftools-dev, libosip2-dev (>=5.0.0),
  libssl1.0-dev (>=1.0.2r) | libssl-dev, librabbitmq-dev, libb64-dev,
  libmicrohttpd-dev, libjson-c-dev, libsqlcipher-dev, zlib1g-dev

rpm/openli.spec

@@ -1,5 +1,5 @@
 Name:           openli
-Version:        1.1.8
+Version:        1.1.9
 Release:        1%{?dist}
 Summary:        Software for performing ETSI-compliant lawful intercept
 
@@ -17,7 +17,7 @@ BuildRequires: libyaml-devel
 BuildRequires: libtrace4-devel >= 4.0.24
 BuildRequires: Judy-devel
 BuildRequires: uthash-devel
-BuildRequires: libwandder2-devel >= 2.0.10
+BuildRequires: libwandder2-devel >= 2.0.13
 BuildRequires: zeromq-devel
 BuildRequires: gperftools-devel
 BuildRequires: libosip2-devel >= 5.0.0
@@ -283,6 +283,9 @@ fi
 
 
 %changelog
+* Wed Sep 18 2024 Shane Alcock <[email protected]> - 1.1.9-1
+- Updated for 1.1.9 release
+
 * Thu Jul 25 2024 Shane Alcock <[email protected]> - 1.1.8-1
 - Updated for 1.1.8 release
 

src/Makefile.am

@@ -71,7 +71,11 @@ 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/etsiencoding/epscc.c collector/epscc.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)

src/agency.c

@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2018 The University of Waikato, Hamilton, New Zealand.
+ * Copyright (c) 2024 SearchLight Ltd, New Zealand.
  * All rights reserved.
  *
  * This file is part of OpenLI.

src/agency.h

@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2018 The University of Waikato, Hamilton, New Zealand.
+ * Copyright (c) 2024 SearchLight Ltd, New Zealand.
  * All rights reserved.
  *
  * This file is part of OpenLI.