Merge branch 'develop'

Author: salcock

.github/workflows/compile-test.yaml

@@ -0,0 +1,82 @@
+name: OpenLI standard build test
+on:
+  push:
+    branches:
+      - develop
+  pull_request:
+    branches:
+      - master
+      - develop
+  workflow_dispatch:
+
+jobs:
+  pre_job:
+    name: Prerequisite checks
+    runs-on: ubuntu-latest
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@master
+        with:
+          concurrent_skipping: 'same_content'
+          cancel_others: 'true'
+
+  run-build-test-debian:
+    name: Run tests ${{ matrix.target }}
+    needs: pre_job
+    if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
+    runs-on: ubuntu-latest
+    container:
+      image : ${{ matrix.target }}
+    strategy:
+      fail-fast: false
+      matrix:
+        arch:
+          - amd64
+        target:
+          - "debian:latest"
+          - "ubuntu:latest"
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+      - name: Install prereq packages
+        run: |
+          ./debpkg-setup.sh
+          mk-build-deps -i -r -t 'apt-get -f -y --force-yes'
+      - name: Set up build
+        run: |
+          ./bootstrap.sh
+          ./configure
+      - name: Compile
+        run: make
+
+  run-build-test-rpm:
+    name: Run tests ${{ matrix.target }}
+    needs: pre_job
+    if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
+    runs-on: ubuntu-latest
+    container:
+      image : ${{ matrix.target }}
+    strategy:
+      fail-fast: false
+      matrix:
+        arch:
+          - amd64
+        target:
+          - "rockylinux:9"
+          - "rockylinux:8"
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+      - name: Install prereq packages
+        run: |
+          ./rpmpkg-setup.sh ${{ matrix.target }}
+      - name: Set up build
+        run: |
+          ./bootstrap.sh
+          ./configure
+      - name: Compile
+        run: make
+
+

.github/workflows/rpm-build.yaml

@@ -18,8 +18,6 @@ jobs:
          target:
            - "rockylinux:8"
            - "rockylinux:9"
-           - "fedora:39"
-           - "fedora:38"
 
      steps:
       - name: Checkout repo
@@ -53,8 +51,6 @@ jobs:
          target:
            - "rockylinux:8"
            - "rockylinux:9"
-           - "fedora:39"
-           - "fedora:38"
      needs: build
      steps:
        - name: Set environment variables for download
@@ -103,8 +99,6 @@ jobs:
          target:
            - "rockylinux:8"
            - "rockylinux:9"
-           - "fedora:39"
-           - "fedora:38"
      needs: test
      steps:
        - name: Set environment variables for download

README.md

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

configure.ac

@@ -1,6 +1,6 @@
 # Super primitive configure script
 
-AC_INIT([openli],[1.1.6],[shane@alcock.co.nz])
+AC_INIT([openli],[1.1.7],[shane@alcock.co.nz])
 
 AM_INIT_AUTOMAKE([subdir-objects])
 AC_CONFIG_SRCDIR(src/collector/collector.c)

debian/changelog

@@ -1,3 +1,22 @@
+openli (1.1.7-1) unstable; urgency=medium
+
+  * Collector: fix file descriptor leak caused by timers in SMS worker
+    threads.
+  * Collector: fix bug where a forwarder thread would be unable to exit
+    if the collector is trying to shut down due to an error.
+  * Collector: fix another race condition that can cause a collector to
+    hang when it is being halted.
+  * Collector: VoIP sync thread now recognises more SIP keep alive
+    payloads (including eXoSIP keep alives) so will no longer complain
+    about invalid SIP payload when these KAs are observed.
+  * Collector: fix segfault that can occur if an IP data session is
+    assigned to more than 5 IP addresses.
+  * Collector: fix segfault in VoIP sync thread if the expiry timer for
+    a completed call cannot be properly created (e.g. if we run out of
+    file descriptors).
+
+ -- Shane Alcock <salcock@searchlight.nz>  Tue, 23 Jul 2024 09:53:36 +1200
+
 openli (1.1.6-1) unstable; urgency=medium
 
   * Fix incorrect encoding of userLocationInformation field.

rpm/openli.spec

@@ -1,5 +1,5 @@
 Name:           openli
-Version:        1.1.6
+Version:        1.1.7
 Release:        1%{?dist}
 Summary:        Software for performing ETSI-compliant lawful intercept
 
@@ -283,6 +283,9 @@ fi
 
 
 %changelog
+* Tue Jul 23 2024 Shane Alcock <salcock@searchlight.nz> - 1.1.7-1
+- Updated for 1.1.7 release
+
 * Mon Jul 1 2024 Shane Alcock <salcock@searchlight.nz> - 1.1.6-1
 - Updated for 1.1.6 release
 

src/Makefile.am

@@ -20,7 +20,7 @@ openliprovisioner_SOURCES=provisioner/provisioner.c provisioner/provisioner.h \
 
 openliprovisioner_LDFLAGS = -lpthread @PROVISIONER_LIBS@
 openliprovisioner_LDADD = @ADD_LIBS@
-openliprovisioner_CFLAGS=-I$(abs_top_srcdir)/extlib/libpatricia/ @PROVISIONER_CFLAGS@
+openliprovisioner_CFLAGS=-I$(abs_top_srcdir)/extlib/libpatricia/ @PROVISIONER_CFLAGS@ -Werror -Wall -Wextra
 
 dist_sbin_SCRIPTS += provisioner/authsetup/openli-prov-authsetup.sh \
                 provisioner/authsetup/openli-prov-adduser.sh
@@ -78,7 +78,7 @@ openlicollector_SOURCES=collector/collector.c configparser.c configparser.h \
 
 openlicollector_LDADD = @ADD_LIBS@ -L$(abs_top_srcdir)/extlib/libpatricia/.libs 
 openlicollector_LDFLAGS=-lpthread -lpatricia @COLLECTOR_LIBS@
-openlicollector_CFLAGS=-I$(abs_top_srcdir)/extlib/libpatricia/ -Icollector/ -I$(builddir)
+openlicollector_CFLAGS=-I$(abs_top_srcdir)/extlib/libpatricia/ -Icollector/ -I$(builddir) -Werror -Wall -Wextra
 
 endif
 
@@ -105,6 +105,6 @@ openlimediator_SOURCES=mediator/mediator.c mediator/mediator.h \
                 coreserver.c coreserver.h
 openlimediator_LDADD = @ADD_LIBS@
 openlimediator_LDFLAGS=-lpthread @MEDIATOR_LIBS@
-openlimediator_CFLAGS=-I$(abs_top_srcdir)/extlib/libpatricia/
+openlimediator_CFLAGS=-I$(abs_top_srcdir)/extlib/libpatricia/ -Werror -Wall -Wextra
 endif
 

src/collector/accessplugins/gtp.c

@@ -345,10 +345,10 @@ static void gtp_destroy_plugin_data(access_plugin_t *p) {
 }
 
 static void gtp_uncouple_parsed_data(access_plugin_t *p) {
-
+    (void)p;
 }
 
-static void gtp_destroy_parsed_data(access_plugin_t *p, void *parsed) {
+static void gtp_destroy_parsed_data(access_plugin_t *p UNUSED, void *parsed) {
 
     gtp_parsed_t *gparsed = (gtp_parsed_t *)parsed;
 
@@ -1332,7 +1332,7 @@ static inline access_session_t *find_matched_session(access_plugin_t *p,
 }
 
 static access_session_t *gtp_update_session_state(access_plugin_t *p,
-        void *parsed, void *plugindata, access_session_t **sesslist,
+        void *parsed, void *plugindata UNUSED, access_session_t **sesslist,
         session_state_t *oldstate, session_state_t *newstate,
         access_action_t *action) {
 
@@ -1819,9 +1819,9 @@ static int gtp_create_context_activation_iri(gtp_parsed_t *gparsed,
     return 0;
 }
 
-static int gtp_generate_iri_data(access_plugin_t *p, void *parseddata,
+static int gtp_generate_iri_data(access_plugin_t *p UNUSED, void *parseddata,
         etsili_generic_t **params, etsili_iri_type_t *iritype,
-        etsili_generic_freelist_t *freelist, int iteration) {
+        etsili_generic_freelist_t *freelist, int iteration UNUSED) {
 
     gtp_parsed_t *gparsed = (gtp_parsed_t *)parseddata;
 
@@ -1893,7 +1893,7 @@ static int gtp_generate_iri_from_session(access_plugin_t *p,
     return 0;
 }
 
-static uint8_t *gtp_get_ip_contents(access_plugin_t *p, void *parseddata,
+static uint8_t *gtp_get_ip_contents(access_plugin_t *p UNUSED, void *parseddata,
         uint16_t *iplen, int iteration) {
 
     gtp_parsed_t *gparsed = (gtp_parsed_t *)parseddata;
@@ -1925,7 +1925,7 @@ static uint8_t *gtp_get_ip_contents(access_plugin_t *p, void *parseddata,
 
 }
 
-static void gtp_destroy_session_data(access_plugin_t *p,
+static void gtp_destroy_session_data(access_plugin_t *p UNUSED,
         access_session_t *sess) {
 
     if (sess->sessionid) {
@@ -1934,7 +1934,8 @@ static void gtp_destroy_session_data(access_plugin_t *p,
 
 }
 
-static uint32_t gtp_get_packet_sequence(access_plugin_t *p, void *parseddata) {
+static uint32_t gtp_get_packet_sequence(access_plugin_t *p UNUSED,
+        void *parseddata) {
 
     gtp_parsed_t *gparsed = (gtp_parsed_t *)parseddata;