Merge branch 'develop'

Author: salcock

README.md

@@ -1,6 +1,6 @@
 OpenLI -- open source ETSI-compliant Lawful Intercept software
 
-Version: 1.1.10
+Version: 1.1.11
 
 ---------------------------------------------------------------------------
 

configure.ac

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

debian/changelog

@@ -1,3 +1,34 @@
+openli (1.1.11-1) unstable; urgency=medium
+
+  * SIP: fix crash when processing an INVITE where the SDP address is
+    missing but the SDP username is present.
+  * SIP: add ability to extract target usernames from tel: URIs.
+  * RADIUS: fix memory leak when RADIUS sessions have multiple usable
+    identities.
+  * Collector: add ability to use multiple threads for SIP parsing.
+  * Collector: merged capabilities of SMS threads into the new SIP parsing
+    threads. Standalone SMS interception threads now no longer exist.
+  * Collector: add configuration option to specify a coremap for an
+    individual input.
+  * Collector: improved packet processing thread performance by avoiding
+    fragment offset calculations if the packet is clearly not a fragment.
+  * Collector: improved encoding performance by pre-encoding certain
+    members of the IPAddress structure that are likely to occur frequently.
+  * Collector: improved TCP reassembly performance by replacing regular
+    sorting of TCP segments with an in-order insertion.
+  * SIP: improved SIP parsing performance by avoiding CSeq extraction from
+    responses when there are no relevant unresponded requests.
+  * Collector: improved TCP reassembly performance by automatically skipping
+    ACKs without data.
+  * Collector: fix deadlock on exit problems caused when threads exited in
+    a bad order.
+  * SIP: fix crashes when a TCP stream had to be reset due to packet loss.
+  * Collector: improved packet processing performance by skipping the
+    static IP intercept code path for IP packets in situations where there
+    were no static IP intercepts configured.
+
+ -- Shane Alcock <[email protected]>  Sat, 11 Jan 2025 15:32:04 +1300
+
 openli (1.1.10-2) unstable; urgency=medium
 
   * Add explicit version to libwandder2 dependency to force upgraded

debian/openli-mediator.service

@@ -1,6 +1,7 @@
 [Unit]
 Description=OpenLI mediator daemon
 After=network.target
+Wants=rabbitmq-server.service
 
 [Service]
 Type=forking

doc/CollectorDoc.md

@@ -222,9 +222,8 @@ The basic option keys are:
 * gtpthreads        -- set the number of threads to use for processing GTP
                        traffic (defaults to 1, can be set to zero to disable
                        GTP session tracking).
-* smsthreads        -- set the number of threads to use for intercepting SMS
-                       messages (defaults to 1, can be set to zero to disable
-                       SMS interception).
+* sipthreads        -- set the number of threads to use for processing SIP
+                       traffic (defaults to 1, cannot be set to zero).
 * emailthreads      -- set the number of threads to use for processing email
                        traffic (defaults to 1, can be set to zero to disable
                        email interception).

doc/exampleconfigs/collector-example.yaml

@@ -29,12 +29,12 @@ encoderthreads: 2
 forwardingthreads: 1
 
 # Number of threads to use for parsing GTP traffic to intercept mobile
-# data session. Can be set to zero if the collector will not see GTP traffic.
+# data sessions. Can be set to zero if the collector will not see GTP traffic.
 gtpthreads: 1
 
-# Number of threads to use for intercepting SMS messages sent over SIP
-# Can be set to zero if the collector will not see SMS over SIP.
-smsthreads: 1
+# Number of threads to use for parsing SIP traffic to intercept voice calls
+# and SMS messages over SIP. You must have at least one SIP thread.
+sipthreads: 2
 
 # Number of threads to use for parsing email traffic (SMTP, IMAP, and POP3).
 # Can be set to zero if the collector will not see email traffic, or you are

rpm/openli.spec

@@ -1,6 +1,6 @@
 Name:           openli
-Version:        1.1.10
-Release:        2%{?dist}
+Version:        1.1.11
+Release:        1%{?dist}
 Summary:        Software for performing ETSI-compliant lawful intercept
 
 License:        GPLv3
@@ -284,6 +284,9 @@ fi
 
 
 %changelog
+* Wed Nov 20 2024 Shane Alcock <[email protected]> - 1.1.11-1
+- Updated for 1.1.11 release
+
 * Mon Nov 4 2024 Shane Alcock <[email protected]> - 1.1.10-1
 - Updated for 1.1.10 release
 

src/Makefile.am

@@ -49,8 +49,7 @@ openlicollector_SOURCES=collector/collector.c configparser.c configparser.h \
 		collector/alushim_parser.c collector/alushim_parser.h \
 		collector/cisco_parser.c collector/cisco_parser.h \
                 collector/ipiri.c collector/ipiri.h \
-		collector/collector_sync_voip.c \
-		collector/collector_sync_voip.h collector/export_shared.h \
+				collector/export_shared.h \
                 collector/reassembler.h collector/reassembler.c \
                 collector/collector_publish.c collector/collector_publish.h \
                 collector/encoder_worker.c collector/encoder_worker.h \
@@ -73,11 +72,14 @@ openlicollector_SOURCES=collector/collector.c configparser.c configparser.h \
                 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/sip_worker.c collector/sip_worker.h \
+				collector/sip_update_state.c \
                 collector/gtp_worker.c collector/gtp_worker.h \
-				collector/gtp.h \
+				collector/gtp.h collector/sms_masking.c \
                 collector/location.c collector/location.h \
                 collector/collector_util.c collector/collector_util.h \
+                collector/sip_worker_redirection.c \
+				collector/sip_worker_redirection.h \
                 $(PLUGIN_SRCS)
 
 openlicollector_LDADD = @ADD_LIBS@ -L$(abs_top_srcdir)/extlib/libpatricia/.libs 

src/collector/accessplugins/radius.c

@@ -1638,14 +1638,25 @@ static access_session_t *radius_update_session_state(access_plugin_t *p,
     }
 
     if (raddata->msgtype == RADIUS_CODE_ACCOUNT_REQUEST) {
+        reqid = DERIVE_REQUEST_ID(raddata, raddata->msgtype);
+
+        if (raddata->savedreq) {
+            if (raddata->savedreq->reqid == reqid) {
+                goto usessupdate;
+            }
+            release_attribute_list(&(glob->freeattrs),
+                    raddata->savedreq->attrs);
+            release_saved_request(&(glob->freeaccreqs), raddata->savedreq);
+            raddata->savedreq = NULL;
+        }
+
         if (glob->freeaccreqs == NULL) {
             req = (radius_saved_req_t *)malloc(
                     sizeof(radius_saved_req_t));
         } else {
             req = glob->freeaccreqs;
             glob->freeaccreqs = req->next;
         }
-        reqid = DERIVE_REQUEST_ID(raddata, raddata->msgtype);
 
         req->reqid = reqid;
         req->statustype = raddata->accttype;
@@ -1736,6 +1747,7 @@ static access_session_t *radius_update_session_state(access_plugin_t *p,
         }
     }
 
+usessupdate:
     JLG(pval, raduser->sessions, raddata->acctsess_hash);
     if (pval == NULL) {
         usess = calloc(1, sizeof(radius_user_session_t));