Merge branch 'OpenSIPS:master' into sip2json

Author: vladpaiu

.github/workflows/main.yml

@@ -17,11 +17,13 @@ jobs:
   build:
     # The type of runner that the job will run on
     runs-on: ${{ matrix.os }}
+    continue-on-error: true
     env:
       COMPILER: ${{ matrix.compiler }}
       BUILD_OS: ${{ matrix.os }}
 
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-20.04]
         compiler: ['gcc', 'clang', 'gcc-9', 'gcc-10', 'clang-9', 'clang-10']
@@ -60,6 +62,10 @@ jobs:
       - name: Build
         run: sh -x scripts/build/do_build.sh
 
+  notify:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
       - name: Notify slack fail
         if: failure() && github.repository == 'OpenSIPS/opensips'
         env:

.github/workflows/multiarch.yml

@@ -17,11 +17,13 @@ jobs:
   build_multiarch:
     # The type of runner that the job will run on
     runs-on: ${{ matrix.os }}
+    continue-on-error: true
     env:
       COMPILER: ${{ matrix.compiler }}
       BUILD_OS: ${{ matrix.os }}
 
     strategy:
+      fail-fast: false
       matrix:
         compiler: ['gcc-i386-cross', 'clang-i386-cross', 'gcc-mips64-cross', 'gcc-arm32-cross', 'gcc-arm64-cross',  'gcc-arm32-qemu-cross', 'gcc-arm64-qemu-cross', 'clang-arm32-qemu-cross', 'clang-arm64-qemu-cross']
         os: [ubuntu-22.04]
@@ -61,6 +63,10 @@ jobs:
         if: endsWith(matrix.compiler, '-qemu-cross')
         run: scripts/build/print_ccache_stats.sh
 
+  notify:
+    runs-on: ubuntu-latest
+    needs: build_multiarch
+    steps:
       - name: Notify slack fail
         if: failure() && github.repository == 'OpenSIPS/opensips'
         env:

.github/workflows/unittests.yml

@@ -17,11 +17,13 @@ jobs:
   build_and_test:
     # The type of runner that the job will run on
     runs-on: ${{ matrix.os }}
+    continue-on-error: true
     env:
       COMPILER: ${{ matrix.compiler }}
       BUILD_OS: ${{ matrix.os }}
 
     strategy:
+      fail-fast: false
       matrix:
         compiler: ['gcc', 'clang', 'gcc-9', 'gcc-10', 'clang-9', 'clang-10']
         os: [ubuntu-20.04]
@@ -100,6 +102,17 @@ jobs:
           MAKE_TGT: 'test'
         run: script -e unit_tests.log -c 'sh -x scripts/build/do_build.sh DEFS_EXTRA_OPTS="-DUNIT_TESTS -fPIE -fPIC"'
 
+      - name: Collect test logs
+        uses: actions/upload-artifact@v3
+        with:
+          name: unit_tests-logs_${{ matrix.os }}_${{ matrix.compiler }}
+          path: |
+            unit_tests.log
+
+  notify:
+    runs-on: ubuntu-latest
+    needs: build_and_test
+    steps:
       - name: Notify slack fail
         if: failure() && github.repository == 'OpenSIPS/opensips'
         env:
@@ -110,9 +123,3 @@ jobs:
           status: FAILED
           color: danger
 
-      - name: Collect test logs
-        uses: actions/upload-artifact@v3
-        with:
-          name: unit_tests-logs_${{ matrix.os }}_${{ matrix.compiler }}
-          path: |
-            unit_tests.log

Makefile.conf.template

@@ -28,10 +28,11 @@
 #identity= Adds support for SIP Identity (see RFC 4474). | SSL library, typically libssl
 #jabber= Integrates XODE XML parser for parsing Jabber messages | Expat library.
 #json= Introduces a new type of variable that provides both serialization and de-serialization from JSON format. | JSON library, libjson
-#launch_darkly= Implements an interface to the Launch Darkly feature management cloud
+#launch_darkly= Implements an interface to the Launch Darkly feature management cloud | Launch Darkly C++ server-side SDK (libldserverapi)
 #ldap= Implements an LDAP search interface for OpenSIPS | OpenLDAP library & development files, typically libldap and libldap-dev
 #lua= Easily implement your own OpenSIPS extensions in Lua | liblua5.1-0-dev, libmemcache-dev and libmysqlclient-dev
 #httpd= Provides an HTTP transport layer implementation for OpenSIPS. | libmicrohttpd
+#http2d= Provides HTTP/2 server-side support, using nghttp2 | nghttp2 library (libnghttp2), libevent, libssl and libevent-openssl
 #mi_xmlrpc_ng= New version of the xmlrpc server that handles xmlrpc requests and generates xmlrpc responses. | parsing/building XML library, typically libxml
 #mmgeoip= Lightweight wrapper for the MaxMind GeoIP API | libGeoIP
 #osp= Enables OpenSIPS to support secure, multi-lateral peering using the OSP standard | OSP development kit, typically osptoolkit
@@ -45,12 +46,14 @@
 #presence= Handles PUBLISH and SUBSCRIBE messages and generates NOTIFY messages in a general, event independent way | XML parsing & Building library, typically libxml-dev
 #presence_dialoginfo= Enables the handling of "Event: dialog" (as defined in RFC 4235) |  XML parsing & building library, typically libxml-dev
 #presence_mwi= Does specific handling for notify-subscribe message-summary (message waiting indication) events as specified in RFC 3842 | XML parsing & building library, typically libxml-dev
+#presence_reginfo= Presence handler for "reg"-events according to RFC 3680 | XML parsing & building library,typically libxml-dev
 #presence_xml= Does specific handling for notify-subscribe events using xml bodies. | XML parsing & building library, typically libxml-dev
 #presence_dfks = Does specific handling for DFKS (as-feature-event) events. | XML parsing & building library, typically libxml-dev
 #pua= Offers the functionality of a presence user agent client, sending Subscribe and Publish messages. | XML parsing & building library, typically libxml-dev
 #pua_bla= Enables Bridged Line Appearances support according | XML parsing & building library, typically libxml-dev
 #pua_dialoginfo= Retrieves dialog state information from the dialog module and PUBLISHes the dialog-information using the pua module. | XML parsing & building library,typically libxml-dev
 #pua_mi= Offers the possibility to publish presence information and subscribe to presence information via MI transports. | XML parsing & building library,typically libxml-dev
+#pua_reginfo= Publisher for "reg"-events according to RFC 3680 | XML parsing & building library,typically libxml-dev
 #pua_usrloc= Connector between usrloc and pua modules. | XML parsing & building library,typically libxml-dev
 #pua_xmpp= Gateway for presence between SIP and XMPP. | XML parsing & building library,typically libxml-dev
 #python= Easily implement your own OpenSIPS extensions in Python | Shared Python runtime library, libpython
@@ -68,7 +71,7 @@
 #xmpp= Gateway between OpenSIPS and a jabber server. It enables the exchange of IMs between SIP clients and XMPP(jabber) clients. | parsing/building XML files, typically libexpat1-devel
 #uuid= UUID generator | uuid-dev
 
-exclude_modules?= aaa_diameter aaa_radius auth_jwt b2b_logic_xml cachedb_cassandra cachedb_couchbase cachedb_memcached cachedb_mongodb cachedb_redis carrierroute cgrates compression cpl_c db_berkeley db_http db_mysql db_oracle db_perlvdb db_postgres db_sqlite db_unixodbc dialplan emergency event_rabbitmq event_kafka h350 httpd identity jabber json launch_darkly ldap lua mi_xmlrpc_ng mmgeoip osp perl pi_http presence presence_dialoginfo presence_mwi presence_xml presence_dfks proto_sctp proto_tls proto_wss pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp python regex rabbitmq rabbitmq_consumer rest_client rls siprec sngtc snmpstats stir_shaken tls_mgm tls_openssl tls_wolfssl uuid xcap xcap_client xml xmpp
+exclude_modules?= aaa_diameter aaa_radius auth_jwt b2b_logic_xml cachedb_cassandra cachedb_couchbase cachedb_memcached cachedb_mongodb cachedb_redis carrierroute cgrates compression cpl_c db_berkeley db_http db_mysql db_oracle db_perlvdb db_postgres db_sqlite db_unixodbc dialplan emergency event_rabbitmq event_kafka h350 httpd http2d identity jabber json launch_darkly ldap lua mi_xmlrpc_ng mmgeoip osp perl pi_http presence presence_dialoginfo presence_mwi presence_reginfo presence_xml presence_dfks proto_sctp proto_tls proto_wss pua pua_bla pua_dialoginfo pua_mi pua_reginfo pua_usrloc pua_xmpp python regex rabbitmq rabbitmq_consumer rest_client rls siprec sngtc snmpstats stir_shaken tls_mgm tls_openssl tls_wolfssl uuid xcap xcap_client xml xmpp
 
 include_modules?=
 

aaa/aaa.h

@@ -52,7 +52,8 @@
 #define AAA_AUTH 4
 #define AAA_ACCT 5
 #define AAA_RECV 6
-#define AAA_CUSTOM 7
+#define AAA_CUSTOM_REQ 7
+#define AAA_CUSTOM_RPL 8
 
 #define AAA_GET_FROM_START 8
 #define AAA_GET_FROM_CURRENT 9