Merge branch 'develop'

.github/workflows/deb-build.yaml

@@ -21,6 +21,7 @@ jobs:
            - "debian:bullseye"
            - "ubuntu:bionic"
            - "ubuntu:focal"
+           - "ubuntu:jammy"
 
      steps:
       - name: Checkout repo

.github/workflows/rpm-build.yaml

@@ -18,9 +18,9 @@ jobs:
         target:
           - "centos:7"
           - "fedora:35"
-          - "fedora:34"
+          - "fedora:36"
           - "rockylinux:8.5"
-          - "almalinux:8.4"
+          - "almalinux:8.5"
 
 
     steps:

README.md

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

configure.ac

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

debian/changelog

@@ -1,3 +1,11 @@
+openli (1.0.15-1) unstable; urgency=medium
+
+  * Fix crash when SDP identities are shared amongst multiple Call-IDs.
+  * Fix bad logic that meant `sipignoresdpo` option was ignored in certain
+    situations.
+
+ -- Shane Alcock <[email protected]>  Wed, 15 Jun 2022 10:27:39 +1200
+
 openli (1.0.14-1) unstable; urgency=medium
 
   * Fix bug where VoIP intercepts would stop collecting media traffic

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.18), libyaml-dev, uthash-dev, libwandder2-dev (>=2.0.4),
+ libtrace4-dev (>= 4.0.19), libyaml-dev, uthash-dev, libwandder2-dev (>=2.0.4),
  libjudy-dev, libzmq3-dev, libgoogle-perftools-dev, libosip2-dev,
  libssl1.0-dev (>=1.0.2r) | libssl-dev, librabbitmq-dev,
  libmicrohttpd-dev, libjson-c-dev, libsqlcipher-dev

debpkg-setup.sh

@@ -40,6 +40,10 @@ case ${DISTRO} in
                 sed -i 's/ dh-systemd (>=1.5),//' debian/control
         ;;
 
+        jammy )
+                sed -i 's/ dh-systemd (>=1.5),//' debian/control
+        ;;
+
         bionic )
                 apt-get install -y debhelper -t bionic-backports
         ;;

rpm/openli.spec

@@ -1,5 +1,5 @@
 Name:           openli
-Version:        1.0.14
+Version:        1.0.15
 Release:        1%{?dist}
 Summary:        Software for performing ETSI-compliant lawful intercept
 
@@ -14,7 +14,7 @@ BuildRequires: bison
 BuildRequires: doxygen
 BuildRequires: flex
 BuildRequires: libyaml-devel
-BuildRequires: libtrace4-devel >= 4.0.17
+BuildRequires: libtrace4-devel >= 4.0.19
 BuildRequires: Judy-devel
 BuildRequires: uthash-devel
 BuildRequires: libwandder2-devel >= 2.0.4
@@ -232,6 +232,9 @@ fi
 
 
 %changelog
+* Wed Jun 15 2022 Shane Alcock <[email protected]> - 1.0.15-1
+- Updated for 1.0.15 release
+
 * Wed Apr 13 2022 Shane Alcock <[email protected]> - 1.0.14-1
 - Updated for 1.0.14 release
 

src/collector/collector_sync_voip.c

@@ -1309,15 +1309,20 @@ static int process_sip_invite(collector_sync_voip_t *sync, char *callid,
         HASH_FIND(hh_callid, vint->cin_callid_map, callid, strlen(callid),
                 findcin);
 
-        HASH_FIND(hh_sdp, vint->cin_sdp_map, sdpo, sizeof(sip_sdp_identifier_t),
-                findsdp);
+        if (!sync->ignore_sdpo_matches) {
+            HASH_FIND(hh_sdp, vint->cin_sdp_map, sdpo,
+                    sizeof(sip_sdp_identifier_t), findsdp);
+        } else {
+            findsdp = NULL;
+        }
 
         if (findcin) {
             if (findsdp) {
                 if (findsdp->shared->cin != findcin->shared->cin) {
                     if (sync->log_bad_sip) {
                         logger(LOG_INFO,
                                 "OpenLI: mismatched CINs for call %s and SDP identifier %u:%u:%s:%s",
+                                callid,
                                 sdpo->sessionid, sdpo->version, sdpo->username,
                                 sdpo->address);
                     }
@@ -1331,8 +1336,10 @@ static int process_sip_invite(collector_sync_voip_t *sync, char *callid,
             vshared = findcin->shared;
             iritype = ETSILI_IRI_CONTINUE;
 
-        } else if (findsdp && !sync->ignore_sdpo_matches) {
-            /* New call ID but already seen this session */
+        } else if (findsdp) {
+            /* New call ID but already seen this session from another
+             * call leg
+             */
             update_cin_callid_map(&(vint->cin_callid_map), callid,
                         findsdp->shared, findsdp->username, findsdp->realm);
             vshared = findsdp->shared;