- sr-dev - kamailio.org

git:master:9da757be: stirshaken: Fix usage examples [skip ci]
by Piotr Gregor 25 Mar '21

25 Mar '21

Module: kamailio Branch: master Commit: 9da757be8861649cdcc9e03bfaf35e6b257ff18f URL: https://github.com/kamailio/kamailio/commit/9da757be8861649cdcc9e03bfaf35e6… Author: Piotr Gregor <piotr(a)signalwire.com> Committer: Piotr Gregor <piotr(a)signalwire.com> Date: 2021-03-25T02:52:57Z stirshaken: Fix usage examples [skip ci] Modified: src/modules/stirshaken/doc/stirshaken_admin.xml --- Modified: src/modules/stirshaken/doc/stirshaken_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9da757be8861649cdcc9e03bfaf35e6… Patch: https://github.com/kamailio/kamailio/commit/9da757be8861649cdcc9e03bfaf35e6… --- diff --git a/src/modules/stirshaken/doc/stirshaken_admin.xml b/src/modules/stirshaken/doc/stirshaken_admin.xml index 55ef50a837..4634f0b752 100644 --- a/src/modules/stirshaken/doc/stirshaken_admin.xml +++ b/src/modules/stirshaken/doc/stirshaken_admin.xml @@ -24,9 +24,10 @@ <para> stirshaken module exports the functions to check and to generate PASSporT, wrapped into SIP Identity header. For call authentication two functions are available: stirshaken_add_identity(...) and stirshaken_add_identity_with_key(key). - stirshaken_add_identity() uses default key (through Authentication Service), stirshaken_add_identity_with_key(..., key) uses specifoed key. + stirshaken_add_identity() uses default key (through Authentication Service), stirshaken_add_identity_with_key(..., key) uses key specified as argument. For call verification three methods are available: stirshaken_check_identity() (through Verification Service), stirshaken_check_identity_with_key(key) and stirshaken_check_identity_with_cert(cert). + Only stirshaken_check_identity() may download certificate (if needed) and check it with X509 certificate path check algorithm. </para> </section> <section> @@ -291,7 +292,11 @@ modparam("stirshaken", "vs_cache_expire_s", 100) request_route { ... - if(stirshaken_check_identity()) { // bad identity } + if (1 == stirshaken_check_identity()) { + xlog("Shaken Identity is OK\n"); + } else { + xlog("Shaken Identity is invalid\n"); + } ... } ... @@ -326,7 +331,11 @@ request_route { ... request_route { ... - if(stirshaken_check_identity_with_key("/path/to/key")) { // bad identity } + if (1 == stirshaken_check_identity_with_key("/path/to/key")) { + xlog("Shaken Identity is OK\n"); + } else { + xlog("Shaken Identity is invalid\n"); + } ... } ... @@ -352,7 +361,11 @@ request_route { ... request_route { ... - if(stirshaken_check_identity_with_cert("/path/to/cert")) { // bad identity } + if (1 == stirshaken_check_identity_with_cert("/path/to/cert")) { + xlog("Shaken Identity is OK\n"); + } else { + xlog("Shaken Identity is invalid\n"); + } ... } ... @@ -382,7 +395,11 @@ request_route { ... request_route { ... - stirshaken_add_identity("https://sp.com/sp.pem", "B", "+44100", "+44200", "origid"); + if (1 == stirshaken_add_identity("https://sp.com/sp.pem", "B", "+44100", "+44200", "origid")) { + xlog("Shaken authentication added (SIP Identity Header created)\n"); + } else { + xlog("Failed\n"); + } ... } ... @@ -397,7 +414,11 @@ request_route { ... request_route { ... - stirshaken_add_identity("https://sp.com/sp.pem", "B", "+44100", "+44200", ""); + if (1 == stirshaken_add_identity("https://sp.com/sp.pem", "B", "+44100", "+44200", "")) { + xlog("Shaken authentication added (SIP Identity Header created)\n"); + } else { + xlog("Failed\n"); + } ... } ...

1 0

git:master:4e6772d9: github/workflows: fix branch name
by Victor Seva 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: 4e6772d9c519de997901e1451a3a5e845a508628 URL: https://github.com/kamailio/kamailio/commit/4e6772d9c519de997901e1451a3a5e8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-03-25T00:45:13+01:00 github/workflows: fix branch name --- Modified: .github/workflows/main.yml --- Diff: https://github.com/kamailio/kamailio/commit/4e6772d9c519de997901e1451a3a5e8… Patch: https://github.com/kamailio/kamailio/commit/4e6772d9c519de997901e1451a3a5e8… --- diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f4059cd155..9e11148040 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,10 +3,10 @@ name: build 'on': push: branches: - - main + - master pull_request: branches: - - main + - master # Allows you to run this workflow manually from the Actions tab workflow_dispatch: jobs:

1 0

git:master:5ac49634: siptrace: properly terminate logs with '\n'
by Ovidiu Sas 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: 5ac49634c18955ffedd0ad909d2199e5881905c6 URL: https://github.com/kamailio/kamailio/commit/5ac49634c18955ffedd0ad909d2199e… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-03-24T19:35:11-04:00 siptrace: properly terminate logs with '\n' --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/5ac49634c18955ffedd0ad909d2199e… Patch: https://github.com/kamailio/kamailio/commit/5ac49634c18955ffedd0ad909d2199e… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index f62cc91347..31cabefe3b 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -319,7 +319,7 @@ static int mod_init(void) } if(hep_version != 1 && hep_version != 2 && hep_version != 3) { - LM_ERR("unsupported version of HEP"); + LM_ERR("unsupported version of HEP\n"); return -1; } @@ -2154,7 +2154,7 @@ int siptrace_net_data_recv(sr_event_param_t *evp) tmsg.len = sto.body.len; if (parse_msg(tmsg.buf, tmsg.len, &tmsg)!=0) { - LM_DBG("msg buffer parsing failed!"); + LM_DBG("msg buffer parsing failed!\n"); goto afterdb; } @@ -2279,7 +2279,7 @@ int siptrace_net_data_sent(sr_event_param_t *evp) tmsg.len = sto.body.len; if (parse_msg(tmsg.buf, tmsg.len, &tmsg)!=0) { - LM_DBG("msg buffer parsing failed!"); + LM_DBG("msg buffer parsing failed!\n"); goto afterdb; }

1 0

git:master:30f1c7b6: github/workflows: main workflow
by Victor Seva 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: 30f1c7b6521fba17e064262b32e11b33da7678ab URL: https://github.com/kamailio/kamailio/commit/30f1c7b6521fba17e064262b32e11b3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-03-25T00:17:47+01:00 github/workflows: main workflow * migration from travis-ci to github actions --- Added: .github/workflows/main.yml Modified: README.md Removed: .travis.yml --- Diff: https://github.com/kamailio/kamailio/commit/30f1c7b6521fba17e064262b32e11b3… Patch: https://github.com/kamailio/kamailio/commit/30f1c7b6521fba17e064262b32e11b3… --- diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000000..f4059cd155 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,39 @@ +--- +name: build +'on': + push: + branches: + - main + pull_request: + branches: + - main + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: +jobs: + build: + runs-on: ubuntu-latest + container: + image: kamailio/pkg-kamailio-docker:dev-${{ matrix.distribution }} + volumes: + - ${{ github.workspace }}:/code + env: + DIST: ${{ matrix.distribution }} + CC: ${{ matrix.compilier }} + strategy: + matrix: + include: + - distribution: buster + compilier: gcc + - distribution: buster + compilier: clang + - distribution: sid + compilier: gcc + - distribution: sid + compilier: clang + steps: + - uses: actions/checkout@v2 + - name: build + run: | + cd /code + ./test/travis/build_travis.sh + shell: bash diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 73638bb613..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,28 +0,0 @@ -sudo: required -language: c -compiler: - - gcc - - clang -env: - - DIST=buster - - DIST=sid -services: - - docker -before_install: - - docker pull kamailio/pkg-kamailio-docker:dev-$DIST -script: docker run -v $TRAVIS_BUILD_DIR:/code:rw kamailio/pkg-kamailio-docker:dev-$DIST /bin/bash -c "cd /code; CC=$CC DIST=$DIST ./test/travis/build_travis.sh" -branches: - only: - - 'master' - - '/^5\.[0-9]+$/' -notifications: - irc: - channels: - - "chat.freenode.net#kamailio-dev" - on_success: never - on_failure: always - email: - recipients: - - sr-dev(a)lists.kamailio.org - on_success: never - on_failure: always diff --git a/README.md b/README.md index 6649dc692c..ede4d1a3b2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Kamailio - The Open Source SIP Server -[![Build Status](https://travis-ci.org/kamailio/kamailio.svg?branch=master)](https:/… +[![Build Status](https://github.com/kamailio/kamailio/actions/workflows/main.yml/bad… [![Code Triage Badge](https://www.codetriage.com/kamailio/kamailio/badges/users.svg)](http… Project Website:

1 0

Errored: linuxmaniac/kamailio#69 (master - b760564)
by Travis CI 24 Mar '21

24 Mar '21

Build Update for linuxmaniac/kamailio ------------------------------------- Build: #69 Status: Errored Duration: 6 mins and 27 secs Commit: b760564 (master) Author: Victor Seva Message: github/workflows: build View the changeset: https://github.com/linuxmaniac/kamailio/compare/100a4be2b270...b7605647ea27 View the full build log and details: https://travis-ci.org/github/linuxmaniac/kamailio/builds/764300441?utm_medi… -- You can unsubscribe from build emails from the linuxmaniac/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596133&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

Errored: kamailio/kamailio#10019 (master - 5cc888f)
by Travis CI 24 Mar '21

24 Mar '21

Build Update for kamailio/kamailio ------------------------------------- Build: #10019 Status: Errored Duration: 5 mins and 26 secs Commit: 5cc888f (master) Author: Richard Fuchs Message: rtpengine: fix typo in docs View the changeset: https://github.com/kamailio/kamailio/compare/9efc27964695...5cc888f0e9e3 View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/764284271?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:bac4fe67: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: bac4fe67c7eb6dae96809c1c15a44defb9a2681d URL: https://github.com/kamailio/kamailio/commit/bac4fe67c7eb6dae96809c1c15a44de… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-24T21:16:12+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/bac4fe67c7eb6dae96809c1c15a44de… Patch: https://github.com/kamailio/kamailio/commit/bac4fe67c7eb6dae96809c1c15a44de… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index a9d9626b76..902ffc57da 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -244,7 +244,7 @@ Richard Fuchs 1.76. Set mos_average_roundtrip_leg_B_pv parameter 1.77. Set mos_average_samples_B_pv parameter 1.78. Set control_cmd_tos parameter - 1.79. Set control_cmd_tos parameter + 1.79. Set hash_algo parameter 1.80. set_rtpengine_set usage 1.81. rtpengine_offer usage 1.82. rtpengine_answer usage @@ -1962,7 +1962,7 @@ modparam("rtpengine", "control_cmd_tos", 144) The values not falling into the range “0-2” are ignored. - Example 1.79. Set control_cmd_tos parameter + Example 1.79. Set hash_algo parameter ... ### use SHA1 instead of legacy algorithm modparam("rtpengine", "hash_algo", 1)

1 0

git:master:5cc888f0: rtpengine: fix typo in docs
by Richard Fuchs 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: 5cc888f0e9e305734621c0db1f63a47f2f0c381a URL: https://github.com/kamailio/kamailio/commit/5cc888f0e9e305734621c0db1f63a47… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2021-03-24T16:12:13-04:00 rtpengine: fix typo in docs --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5cc888f0e9e305734621c0db1f63a47… Patch: https://github.com/kamailio/kamailio/commit/5cc888f0e9e305734621c0db1f63a47… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index e615579e08..47516fd74f 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2197,7 +2197,7 @@ modparam("rtpengine", "control_cmd_tos", 144) The values not falling into the range <quote>0-2</quote> are ignored. </para> <example> - <title>Set <varname>control_cmd_tos</varname> parameter</title> + <title>Set <varname>hash_algo</varname> parameter</title> <programlisting format="linespecific"> ... ### use SHA1 instead of legacy algorithm

1 0

Errored: kamailio/kamailio#10018 (master - 3c48266)
by Travis CI 24 Mar '21

24 Mar '21

Build Update for kamailio/kamailio ------------------------------------- Build: #10018 Status: Errored Duration: 7 mins and 12 secs Commit: 3c48266 (master) Author: Daniel-Constantin Mierla Message: lwsc: added loaded field to intermodule api strucure - mark when the structure is filled View the changeset: https://github.com/kamailio/kamailio/compare/1001e9e1dbfd...3c48266d56b5 View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/764252082?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:9efc2796: modules: readme files regenerated - lwsc ... [skip ci]
by Kamailio Dev 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: 9efc27964695d7a637250ac46ecac275fb627b0e URL: https://github.com/kamailio/kamailio/commit/9efc27964695d7a637250ac46ecac27… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-24T17:46:10+01:00 modules: readme files regenerated - lwsc ... [skip ci] --- Modified: src/modules/lwsc/README --- Diff: https://github.com/kamailio/kamailio/commit/9efc27964695d7a637250ac46ecac27… Patch: https://github.com/kamailio/kamailio/commit/9efc27964695d7a637250ac46ecac27… --- diff --git a/src/modules/lwsc/README b/src/modules/lwsc/README index ff0828e7c7..24c19b5568 100644 --- a/src/modules/lwsc/README +++ b/src/modules/lwsc/README @@ -10,7 +10,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2021 asipto.com + Copyright Â© 2021 asipto.com __________________________________________________________________ Table of Contents @@ -28,6 +28,7 @@ Daniel-Constantin Mierla 3.1. protocol (str) 3.2. timeout_init (int) 3.3. timeout_read (int) + 3.4. verbosity (int) 4. Functions @@ -43,9 +44,10 @@ Daniel-Constantin Mierla 1.1. Set protocol parameter 1.2. Set timeout_init parameter 1.3. Set timeout_read parameter - 1.4. lwsc_notify usage - 1.5. lwsc_request usage - 1.6. $lwsc(name) usage + 1.4. Set verbosity parameter + 1.5. lwsc_notify usage + 1.6. lwsc_request usage + 1.7. $lwsc(name) usage Chapter 1. Admin Guide @@ -62,6 +64,7 @@ Chapter 1. Admin Guide 3.1. protocol (str) 3.2. timeout_init (int) 3.3. timeout_read (int) + 3.4. verbosity (int) 4. Functions @@ -102,6 +105,7 @@ Chapter 1. Admin Guide 3.1. protocol (str) 3.2. timeout_init (int) 3.3. timeout_read (int) + 3.4. verbosity (int) 3.1. protocol (str) @@ -138,12 +142,25 @@ modparam("lwsc", "timeout_init", 4000000) modparam("lwsc", "timeout_init", 1000000) ... +3.4. verbosity (int) + + Control the verbosity of debug messages on libwebsockets events, higher + value means more debug messages. It has to be a positive number, + currently 2 or higher results in maximum verbosity. + + Default value is 0. + + Example 1.4. Set verbosity parameter +... +modparam("lwsc", "verbosity", 1) +... + 4. Functions 4.1. lwsc_notify(wsurl, data) 4.2. lwsc_request(wsurl, data) -4.1. lwsc_notify(wsurl, data) +4.1. lwsc_notify(wsurl, data) Send data via websockets to the address specified by wsurl, no response is expected. @@ -156,13 +173,13 @@ modparam("lwsc", "timeout_init", 1000000) This function can be used from ANY_ROUTE. - Example 1.4. lwsc_notify usage + Example 1.5. lwsc_notify usage ... jwt_notify("ws://10.1.1.10:8080/log", "caller=$fU;callee=$tU;callid=$ci"); ... -4.2. lwsc_request(wsurl, data) +4.2. lwsc_request(wsurl, data) Send data via websockets to the address specified by wsurl, a response is expected and made available in $lwsc(rdata). @@ -175,7 +192,7 @@ modparam("lwsc", "timeout_init", 1000000) This function can be used from ANY_ROUTE. - Example 1.5. lwsc_request usage + Example 1.6. lwsc_request usage ... jwt_request("ws://10.1.1.10:8080/log", "caller=$fU;callee=$tU;srcip=$si"); @@ -185,7 +202,7 @@ modparam("lwsc", "timeout_init", 1000000) 5.1. $lwsc(key) -5.1. $lwsc(key) +5.1. $lwsc(key) Get the values and attributes after using LWSC functions. @@ -193,7 +210,7 @@ modparam("lwsc", "timeout_init", 1000000) * rdata - the response retrieved after lwsc_request(). * status - the status of verification after a failed jwt_verify(). - Example 1.6. $lwsc(name) usage + Example 1.7. $lwsc(name) usage ... jwt_request("ws://10.1.1.10:8080/log", "caller=$fU;callee=$tU;srcip=$si");

1 0

git:master:465459f2: lwsc: docs for verbosity parameter [skip ci]
by Daniel-Constantin Mierla 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: 465459f25fe60f3fd5227b31e86e3fb33537d33c URL: https://github.com/kamailio/kamailio/commit/465459f25fe60f3fd5227b31e86e3fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-24T17:42:26+01:00 lwsc: docs for verbosity parameter [skip ci] --- Modified: src/modules/lwsc/doc/lwsc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/465459f25fe60f3fd5227b31e86e3fb… Patch: https://github.com/kamailio/kamailio/commit/465459f25fe60f3fd5227b31e86e3fb… --- diff --git a/src/modules/lwsc/doc/lwsc_admin.xml b/src/modules/lwsc/doc/lwsc_admin.xml index 03bd9a70de..1ecdf927ef 100644 --- a/src/modules/lwsc/doc/lwsc_admin.xml +++ b/src/modules/lwsc/doc/lwsc_admin.xml @@ -113,6 +113,27 @@ modparam("lwsc", "timeout_init", 4000000) ... modparam("lwsc", "timeout_init", 1000000) ... +</programlisting> + </example> + </section> + <section id="lwsc.p.verbosity"> + <title><varname>verbosity</varname> (int)</title> + <para> + Control the verbosity of debug messages on libwebsockets events, + higher value means more debug messages. It has to be a positive + number, currently 2 or higher results in maximum verbosity. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>verbosity</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("lwsc", "verbosity", 1) +... </programlisting> </example> </section>

1 0

git:master:3c48266d: lwsc: added loaded field to intermodule api strucure
by Daniel-Constantin Mierla 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: 3c48266d56b58d3c1de44f630a88df2092d6d0d5 URL: https://github.com/kamailio/kamailio/commit/3c48266d56b58d3c1de44f630a88df2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-24T17:42:26+01:00 lwsc: added loaded field to intermodule api strucure - mark when the structure is filled --- Modified: src/modules/lwsc/api.h --- Diff: https://github.com/kamailio/kamailio/commit/3c48266d56b58d3c1de44f630a88df2… Patch: https://github.com/kamailio/kamailio/commit/3c48266d56b58d3c1de44f630a88df2… --- diff --git a/src/modules/lwsc/api.h b/src/modules/lwsc/api.h index c76fb8c6b1..87bf0ea87e 100644 --- a/src/modules/lwsc/api.h +++ b/src/modules/lwsc/api.h @@ -37,6 +37,7 @@ typedef int (*lwsc_api_request_f)(str *wsurl, str *wsproto, str *sdata, * @brief Stateless (sl) API structure */ typedef struct lwsc_api { + int loaded; lwsc_api_request_f request; /* send and receice data */ } lwsc_api_t; @@ -54,11 +55,12 @@ static inline int lwsc_load_api(lwsc_api_t *lwscb) LM_ERR("cannot find bind_lwsc exported function\n"); return -1; } - if (bindlwsc(lwscb)==-1) - { + if (bindlwsc(lwscb)==-1) { LM_ERR("cannot bind lwsc api\n"); return -1; } + lwscb->loaded = 1; + return 0; }

1 0

git:master:dfbd4e12: lwsc: added inter-module api
by Daniel-Constantin Mierla 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: dfbd4e12d6c4b3c9664d58ffbc479de9ea68f03e URL: https://github.com/kamailio/kamailio/commit/dfbd4e12d6c4b3c9664d58ffbc479de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-24T17:42:26+01:00 lwsc: added inter-module api - exported lwsc request function to send data to a ws target and proto, then wait for response data for a specific time interval --- Added: src/modules/lwsc/api.h Modified: src/modules/lwsc/lwsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/dfbd4e12d6c4b3c9664d58ffbc479de… Patch: https://github.com/kamailio/kamailio/commit/dfbd4e12d6c4b3c9664d58ffbc479de… --- diff --git a/src/modules/lwsc/api.h b/src/modules/lwsc/api.h new file mode 100644 index 0000000000..c76fb8c6b1 --- /dev/null +++ b/src/modules/lwsc/api.h @@ -0,0 +1,65 @@ +/* + * Copyright (C) 2021 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * @brief LWSC - API definitions + * @ingroup lwsc + * Module: @ref lwsc + */ + +#ifndef _LWSC_API_H_ +#define _LWSC_API_H_ + +#include "../../core/str.h" + +typedef int (*lwsc_api_request_f)(str *wsurl, str *wsproto, str *sdata, + str *rdata, int rtimeout); + +/** + * @brief Stateless (sl) API structure + */ +typedef struct lwsc_api { + lwsc_api_request_f request; /* send and receice data */ +} lwsc_api_t; + +typedef int (*bind_lwsc_f)(lwsc_api_t* api); + +/** + * @brief Load the LWSX API + */ +static inline int lwsc_load_api(lwsc_api_t *lwscb) +{ + bind_lwsc_f bindlwsc; + + bindlwsc = (bind_lwsc_f)find_export("bind_lwsc", 0, 0); + if ( bindlwsc == 0) { + LM_ERR("cannot find bind_lwsc exported function\n"); + return -1; + } + if (bindlwsc(lwscb)==-1) + { + LM_ERR("cannot bind lwsc api\n"); + return -1; + } + return 0; +} + +#endif diff --git a/src/modules/lwsc/lwsc_mod.c b/src/modules/lwsc/lwsc_mod.c index 8e5e068bdd..ada873f215 100644 --- a/src/modules/lwsc/lwsc_mod.c +++ b/src/modules/lwsc/lwsc_mod.c @@ -36,12 +36,15 @@ #include "../../core/kemi.h" #include "../../core/parser/parse_param.h" +#include "api.h" + MODULE_VERSION static int mod_init(void); static int child_init(int); static void mod_destroy(void); +static int bind_lwsc(lwsc_api_t* api); static int w_lwsc_request(sip_msg_t* msg, char* pwsurl, char* pdata); static int w_lwsc_notify(sip_msg_t* msg, char* pwsurl, char* pdata); @@ -57,6 +60,8 @@ static cmd_export_t cmds[]={ fixup_spve_all, 0, ANY_ROUTE}, {"lwsc_notify", (cmd_function)w_lwsc_notify, 2, fixup_spve_all, 0, ANY_ROUTE}, + {"bind_lwsc", (cmd_function)bind_lwsc, 0, + 0, 0, 0}, {0, 0, 0, 0, 0, 0} }; @@ -759,6 +764,20 @@ static int lwsc_pv_parse_name(pv_spec_t *sp, str *in) return 0; } +/** + * @brief bind functions to LWSC API structure + */ +static int bind_lwsc(lwsc_api_t* api) +{ + if (!api) { + LM_ERR("invalid parameter value\n"); + return -1; + } + api->request = lwsc_api_request; + + return 0; +} + /** * */

1 0

git:master:39ae2a44: lwsc: added verbosity parameter
by Daniel-Constantin Mierla 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: 39ae2a441ffda8c8df1774917c3385ad7cc78bcf URL: https://github.com/kamailio/kamailio/commit/39ae2a441ffda8c8df1774917c3385a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-24T17:42:26+01:00 lwsc: added verbosity parameter - control debug messages verbosity --- Modified: src/modules/lwsc/lwsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/39ae2a441ffda8c8df1774917c3385a… Patch: https://github.com/kamailio/kamailio/commit/39ae2a441ffda8c8df1774917c3385a… --- diff --git a/src/modules/lwsc/lwsc_mod.c b/src/modules/lwsc/lwsc_mod.c index ada873f215..15d8ea296c 100644 --- a/src/modules/lwsc/lwsc_mod.c +++ b/src/modules/lwsc/lwsc_mod.c @@ -54,6 +54,7 @@ static int _lwsc_timeout_send = 0; static int _lwsc_timeout_read = 2000000; static int _lwsc_timeout_init = 2000000; static str _lwsc_protocol = str_init("kmsg"); +static int _lwsc_verbosity = 0; static cmd_export_t cmds[]={ {"lwsc_request", (cmd_function)w_lwsc_request, 2, @@ -71,6 +72,7 @@ static param_export_t params[]={ { "timeout_read", PARAM_INT, &_lwsc_timeout_read }, { "timeout_init", PARAM_INT, &_lwsc_timeout_init }, { "protocol", PARAM_STR, &_lwsc_protocol }, + { "verbosity", PARAM_INT, &_lwsc_verbosity }, { 0, 0, 0 } }; @@ -215,7 +217,9 @@ static int ksr_lwsc_callback(struct lws *wsi, enum lws_callback_reasons reason, str rbuf = STR_NULL; str wbuf = STR_NULL; - LM_DBG("callback called with reason %d\n", reason); + if(_lwsc_verbosity>1) { + LM_DBG("callback called with reason %d\n", reason); + } switch (reason) { @@ -292,7 +296,9 @@ static int ksr_lwsc_callback(struct lws *wsi, enum lws_callback_reasons reason, break; case LWS_CALLBACK_TIMER: - LM_DBG("LWS_CALLBACK_TIMER - wsi: %p\n", wsi); + if(_lwsc_verbosity>0) { + LM_DBG("LWS_CALLBACK_TIMER - wsi: %p\n", wsi); + } // lws_callback_on_writable(wsi); break; @@ -340,7 +346,9 @@ static int ksr_lwsc_callback(struct lws *wsi, enum lws_callback_reasons reason, ep->wsi = NULL; break; default: - LM_DBG("unhandled reason %d\n", reason); + if(_lwsc_verbosity>1) { + LM_DBG("unhandled reason %d\n", reason); + } break; }

1 0

git:master:8c8080a4: lwsc: store lws protocols structure in endpoint
by Daniel-Constantin Mierla 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: 8c8080a4ce714fc2b7efb3a285c474f8a583e851 URL: https://github.com/kamailio/kamailio/commit/8c8080a4ce714fc2b7efb3a285c474f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-24T17:42:25+01:00 lwsc: store lws protocols structure in endpoint - more flexibility in specifying ws sub-protocols per connection --- Modified: src/modules/lwsc/lwsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8c8080a4ce714fc2b7efb3a285c474f… Patch: https://github.com/kamailio/kamailio/commit/8c8080a4ce714fc2b7efb3a285c474f…

1 0

git:master:1001e9e1: mohqueue: use ptime
by Robert Boisvert 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: 1001e9e1dbfdec525f4a5f96f7dd3fcc22e51888 URL: https://github.com/kamailio/kamailio/commit/1001e9e1dbfdec525f4a5f96f7dd3fc… Author: Robert Boisvert <rdboisvert(a)gmail.com> Committer: Robert Boisvert <rdboisvert(a)gmail.com> Date: 2021-03-24T12:17:20-04:00 mohqueue: use ptime - version 1.7 - match ptime of incoming call; otherwise, default to 20ms - update copyright dates --- Modified: src/modules/mohqueue/mohq_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/1001e9e1dbfdec525f4a5f96f7dd3fc… Patch: https://github.com/kamailio/kamailio/commit/1001e9e1dbfdec525f4a5f96f7dd3fc… --- diff --git a/src/modules/mohqueue/mohq_funcs.c b/src/modules/mohqueue/mohq_funcs.c index c9c8d6704e..dd9f105bfc 100644 --- a/src/modules/mohqueue/mohq_funcs.c +++ b/src/modules/mohqueue/mohq_funcs.c @@ -222,7 +222,7 @@ else return; } } - if (ptm->t_release (ptcell) < 0) + if (ptm->t_release_transaction (ptcell) < 0) { LM_ERR ("%sRelease transaction failed for call (%s)!\n", pfncname, pcall->call_from); @@ -2160,7 +2160,7 @@ int nsession; sdp_session_cell_t *psession; char pflagbuf [5]; strcpy (pflagbuf, "z20"); -fparam_t pzflag [1] = {0, FPARAM_STRING, {pflagbuf}, 0}; +fparam_t pzflag [1] = {"", FPARAM_STRING, {pflagbuf}, 0}; for (nsession = 0; (psession = get_sdp_session (pmsg, nsession)); nsession++) { int nstream;

1 0

Kamailio mohqueu warning
by Daniel-Constantin Mierla 24 Mar '21

24 Mar '21

Hello, compiling the latest version of Kamailio results in a warning for mohqueue module: CC (gcc) [M mohqueue.so] mohq_funcs.o mohq_funcs.c:225:23: warning: incompatible pointer types passing 'tm_cell_t *' (aka 'struct cell *') to parameter of type 'struct sip_msg *' [-Wincompatible-pointer-types] if (ptm->t_release (ptcell) < 0) I noticed you pushed some changes recently, likely the warning was introduced by them, not noticing it before. Anyhow, it seems something that should be reviewed and fixed, otherwise may result in a crash by passing incorrect structure pointer. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Funding: https://www.paypal.me/dcmierla

2 1

Errored: kamailio/kamailio#10016 (master - 5756225)
by Travis CI 24 Mar '21

24 Mar '21

Build Update for kamailio/kamailio ------------------------------------- Build: #10016 Status: Errored Duration: 7 mins and 13 secs Commit: 5756225 (master) Author: Victor Seva Message: pkg/kamailio/deb: version set 5.5.0~dev5 View the changeset: https://github.com/kamailio/kamailio/compare/868ff72ad175...575622520df0 View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/764219968?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:57562252: pkg/kamailio/deb: version set 5.5.0~dev5
by Victor Seva 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: 575622520df06e769ad6174c36ad142b59cfa96e URL: https://github.com/kamailio/kamailio/commit/575622520df06e769ad6174c36ad142… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-03-24T12:09:08+01:00 pkg/kamailio/deb: version set 5.5.0~dev5 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/575622520df06e769ad6174c36ad142… Patch: https://github.com/kamailio/kamailio/commit/575622520df06e769ad6174c36ad142…

1 0

git:master:868ff72a: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: 868ff72ad17573657ce19239a6f394cb117475c6 URL: https://github.com/kamailio/kamailio/commit/868ff72ad17573657ce19239a6f394c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-24T10:31:18+01:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/868ff72ad17573657ce19239a6f394c… Patch: https://github.com/kamailio/kamailio/commit/868ff72ad17573657ce19239a6f394c… --- diff --git a/src/modules/pv/README b/src/modules/pv/README index 4aaa44c225..10698c1dd4 100644 --- a/src/modules/pv/README +++ b/src/modules/pv/README @@ -194,16 +194,16 @@ Chapter 1. Admin Guide The value of the parameter has the format: _name_ '=' _type_ ':' _value_ - - Note: this is special useful for usage with KEMI scripts, the $shv(...) - variables must be defined during Kamailio initialization in order to - become available in all worker processes. * _name_: shared variable name * _type_: type of the value + “i”: integer value + “s”: string value * _value_: value to be set + Note: this is special useful for usage with KEMI scripts, the $shv(...) + variables must be defined during Kamailio initialization in order to + become available in all worker processes. + Default value is “NULL”. Example 1.1. shvset parameter usage

1 0

git:master:c959a3c5: pv: docs - relocated shvset note outside of param definition details [skip ci]
by Daniel-Constantin Mierla 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: c959a3c5f5efa1158bd53a31476f33d080793928 URL: https://github.com/kamailio/kamailio/commit/c959a3c5f5efa1158bd53a31476f33d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-24T10:21:07+01:00 pv: docs - relocated shvset note outside of param definition details [skip ci] --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c959a3c5f5efa1158bd53a31476f33d… Patch: https://github.com/kamailio/kamailio/commit/c959a3c5f5efa1158bd53a31476f33d… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index 5fbe706c8e..1c4c84e0fb 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -63,11 +63,6 @@ The value of the parameter has the format: _name_ '=' _type_ ':' _value_ </para> - <para> - Note: this is special useful for usage with KEMI scripts, the $shv(...) - variables must be defined during Kamailio initialization in order to - become available in all worker processes. - </para> <itemizedlist> <listitem><para>_name_: shared variable name</para></listitem> @@ -81,6 +76,11 @@ <listitem><para>_value_: value to be set</para></listitem> </itemizedlist> <para> + Note: this is special useful for usage with KEMI scripts, the $shv(...) + variables must be defined during Kamailio initialization in order to + become available in all worker processes. + </para> + <para> Default value is <quote>NULL</quote>. </para> <example>

1 0

git:master:fa136eda: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: fa136edab5e552ed7b9e01af602bc09c98afce35 URL: https://github.com/kamailio/kamailio/commit/fa136edab5e552ed7b9e01af602bc09… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-24T10:16:24+01:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/fa136edab5e552ed7b9e01af602bc09… Patch: https://github.com/kamailio/kamailio/commit/fa136edab5e552ed7b9e01af602bc09… --- diff --git a/src/modules/pv/README b/src/modules/pv/README index a6702afa12..4aaa44c225 100644 --- a/src/modules/pv/README +++ b/src/modules/pv/README @@ -189,11 +189,15 @@ Chapter 1. Admin Guide 3.1. shvset (string) - Set the value of a shared variable ($shv(name)). The parameter can be - set many times. + Set the initial value of a shared variable ($shv(name)). The parameter + can be set many times. The value of the parameter has the format: _name_ '=' _type_ ':' _value_ + + Note: this is special useful for usage with KEMI scripts, the $shv(...) + variables must be defined during Kamailio initialization in order to + become available in all worker processes. * _name_: shared variable name * _type_: type of the value + “i”: integer value

1 0

git:master:bcc6370c: pv: docs - note about use of $shv() in kemi scripts for shvset param [skip ci]
by Daniel-Constantin Mierla 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: bcc6370cdc00f25ce3d0f29e168c20ca880dcda2 URL: https://github.com/kamailio/kamailio/commit/bcc6370cdc00f25ce3d0f29e168c20c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-24T09:46:53+01:00 pv: docs - note about use of $shv() in kemi scripts for shvset param [skip ci] --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bcc6370cdc00f25ce3d0f29e168c20c… Patch: https://github.com/kamailio/kamailio/commit/bcc6370cdc00f25ce3d0f29e168c20c… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index 61df878c3a..5fbe706c8e 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -56,13 +56,18 @@ <section id="pv.p.shvset"> <title><varname>shvset</varname> (string)</title> <para> - Set the value of a shared variable ($shv(name)). The parameter + Set the initial value of a shared variable ($shv(name)). The parameter can be set many times. </para> <para> The value of the parameter has the format: _name_ '=' _type_ ':' _value_ </para> + <para> + Note: this is special useful for usage with KEMI scripts, the $shv(...) + variables must be defined during Kamailio initialization in order to + become available in all worker processes. + </para> <itemizedlist> <listitem><para>_name_: shared variable name</para></listitem>

1 0

git:master:341cb216: Makefile.groups: added group for lwsc module
by Daniel-Constantin Mierla 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: 341cb21618738008cbdea949c532cb61ca89bf15 URL: https://github.com/kamailio/kamailio/commit/341cb21618738008cbdea949c532cb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-24T09:25:33+01:00 Makefile.groups: added group for lwsc module --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/341cb21618738008cbdea949c532cb6… Patch: https://github.com/kamailio/kamailio/commit/341cb21618738008cbdea949c532cb6… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 34bbd98678..42c036d670 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -187,6 +187,9 @@ mod_list_ev=evapi # - modules depending on libjwt library mod_list_jwt=jwt +# - modules depending on libwebsockets library +mod_list_lwsc=lwsc + # - modules depending on libstirshaken library mod_list_stirshaken=stirshaken @@ -263,6 +266,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_mqtt) \ $(mod_list_secsipid) \ $(mod_list_jwt) \ + $(mod_list_lwsc) \ $(mod_list_stirshaken) \ $(mod_list_rtp_media_server) @@ -457,6 +461,9 @@ module_group_kev=$(mod_list_ev) # pkg jwt module module_group_kjwt=$(mod_list_jwt) +# pkg lwsc module +module_group_klwsc=$(mod_list_lwsc) + # pkg stirshaken module module_group_kstirshaken=$(mod_list_stirshaken)

1 0

git:master:cd4f7207: Makefile.defs: version set to 5.5.0-dev5
by Daniel-Constantin Mierla 24 Mar '21

24 Mar '21

Module: kamailio Branch: master Commit: cd4f72075aaaf47184bafdc10358862e03891fcf URL: https://github.com/kamailio/kamailio/commit/cd4f72075aaaf47184bafdc10358862… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-24T09:26:52+01:00 Makefile.defs: version set to 5.5.0-dev5 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/cd4f72075aaaf47184bafdc10358862… Patch: https://github.com/kamailio/kamailio/commit/cd4f72075aaaf47184bafdc10358862… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index b1d4535124..4f5c61ad3f 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 5 SUBLEVEL = 0 -EXTRAVERSION = -dev4 +EXTRAVERSION = -dev5 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev