sr-dev April 2023

sr-dev@lists.kamailio.org

15 participants
264 discussions

git:master:d77448b3: websocket: convert to memory logging helper, add missing mem error logging
by Henning Westerholt 29 Apr '23

29 Apr '23

Module: kamailio Branch: master Commit: d77448b3a6a5dc3cf9e9a8ed85aeb7ae743900b6 URL: https://github.com/kamailio/kamailio/commit/d77448b3a6a5dc3cf9e9a8ed85aeb7a… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-04-29T19:16:32Z websocket: convert to memory logging helper, add missing mem error logging --- Modified: src/modules/websocket/ws_conn.c Modified: src/modules/websocket/ws_frame.c Modified: src/modules/websocket/ws_handshake.c --- Diff: https://github.com/kamailio/kamailio/commit/d77448b3a6a5dc3cf9e9a8ed85aeb7a… Patch: https://github.com/kamailio/kamailio/commit/d77448b3a6a5dc3cf9e9a8ed85aeb7a… --- diff --git a/src/modules/websocket/ws_conn.c b/src/modules/websocket/ws_conn.c index 1a4f8ffbb3c..0825d366083 100644 --- a/src/modules/websocket/ws_conn.c +++ b/src/modules/websocket/ws_conn.c @@ -100,7 +100,7 @@ int wsconn_init(void) wsconn_id_hash = (ws_connection_t **)shm_malloc( TCP_ID_HASH_SIZE * sizeof(ws_connection_t *)); if(wsconn_id_hash == NULL) { - LM_ERR("allocating WebSocket hash-table\n"); + SHM_MEM_ERROR_FMT("for WebSocket hash-table\n"); goto error; } memset((void *)wsconn_id_hash, 0, @@ -109,7 +109,7 @@ int wsconn_init(void) wsconn_used_list = (ws_connection_list_t *)shm_malloc( sizeof(ws_connection_list_t)); if(wsconn_used_list == NULL) { - LM_ERR("allocating WebSocket used list\n"); + SHM_MEM_ERROR_FMT("for WebSocket used list\n"); goto error; } memset((void *)wsconn_used_list, 0, sizeof(ws_connection_list_t)); @@ -197,7 +197,7 @@ int wsconn_add(struct receive_info *rcv, unsigned int sub_protocol) /* Allocate and fill in new WebSocket connection */ wsc = shm_malloc(sizeof(ws_connection_t) + BUF_SIZE + 1); if(wsc == NULL) { - LM_ERR("allocating shared memory\n"); + SHM_MEM_ERROR; return -1; } memset(wsc, 0, sizeof(ws_connection_t) + BUF_SIZE + 1); @@ -530,9 +530,10 @@ ws_connection_t **wsconn_get_list(void) /* allocate a NULL terminated list of wsconn pointers */ list_size = (list_len + 1) * sizeof(ws_connection_t *); list = pkg_malloc(list_size); - if(!list) + if(!list) { + PKG_MEM_ERROR; goto end; - + } memset(list, 0, list_size); /* copy */ @@ -618,9 +619,10 @@ ws_connection_id_t *wsconn_get_list_ids(int idx) /* allocate a NULL terminated list of wsconn pointers */ list_size = (list_len + 1) * sizeof(ws_connection_id_t); list = pkg_malloc(list_size); - if(!list) + if(!list) { + PKG_MEM_ERROR; goto end; - + } memset(list, 0, list_size); /* copy */ diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index c7927b16f43..e4f1a8effd5 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -203,7 +203,7 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) /* Allocate send buffer and build frame */ frame_length = frame->payload_len + extended_length + 2; if((send_buf = pkg_malloc(sizeof(char) * frame_length)) == NULL) { - LM_ERR("allocating send buffer from pkg memory\n"); + PKG_MEM_ERROR_FMT("for send buffer\n"); return -1; } memset(send_buf, 0, sizeof(char) * frame_length); @@ -316,7 +316,7 @@ static int close_connection(ws_connection_t **p_wsc, ws_close_type_t type, if(wsc->state == WS_S_OPEN) { data = pkg_malloc(sizeof(char) * (reason.len + 2)); if(data == NULL) { - LM_ERR("allocating pkg memory\n"); + PKG_MEM_ERROR; return -1; } diff --git a/src/modules/websocket/ws_handshake.c b/src/modules/websocket/ws_handshake.c index 878c483f2ab..4566065bd64 100644 --- a/src/modules/websocket/ws_handshake.c +++ b/src/modules/websocket/ws_handshake.c @@ -296,7 +296,7 @@ int ws_handle_handshake(struct sip_msg *msg) reply_key.s = (char *)pkg_malloc((key.len + str_ws_guid.len) * sizeof(char)); if(reply_key.s == NULL) { - LM_ERR("allocating pkg memory\n"); + PKG_MEM_ERROR; ws_send_reply(msg, 500, &str_status_internal_server_error, NULL); goto end; }

1 0

[kamailio/kamailio] Early Media on Kamailio 5.X w/rtpengine (Issue #3429)
by ibrahmgarip 28 Apr '23

28 Apr '23

Hi, I'm trying to build a script for early media. I've kamailio 5.6 and rtpengine 11.3.1 on my server. I just want to play local media when I get call to my server but its not working as I want. <!-- I've configured kamailio to work with rtpengine and added this snippet to " onreply_route[MANAGE_REPLY] " section. if(status=="100") { rtpengine_manage(); t_reply("183", "Session Progress"); block_dtmf(); play_media("from-tag=$fti file=/usr/share/rtpengine/decode_G711.wav"); I can see the RTP is playing successfuly but the kamailio is not creating SIP messaging with SDP to play on other side. ![image](https://user-images.githubusercontent.com/110819566/235202939-c8e599d3-e5e4-4932-bc84-a46c0fc28e57.png) ![image](https://user-images.githubusercontent.com/110819566/235203260-3841016d-c362-4f90-87bc-c6a096d258b7.png) I couldn't figure out how should I configure, can you please advise me about that? -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3429 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3429(a)github.com>

2 2

git:master:7ae82075: github: PR use Github Packages registry [skip ci]
by Victor Seva 28 Apr '23

28 Apr '23

Module: kamailio Branch: master Commit: 7ae82075ba0b509cdc9c2f5d03e9b055fc3bf117 URL: https://github.com/kamailio/kamailio/commit/7ae82075ba0b509cdc9c2f5d03e9b05… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-04-28T11:48:49+02:00 github: PR use Github Packages registry [skip ci] --- Modified: .github/workflows/pull_request.yml --- Diff: https://github.com/kamailio/kamailio/commit/7ae82075ba0b509cdc9c2f5d03e9b05… Patch: https://github.com/kamailio/kamailio/commit/7ae82075ba0b509cdc9c2f5d03e9b05… --- diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index e2f6416ce42..197361aaf21 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -12,7 +12,7 @@ jobs: build: runs-on: ubuntu-latest container: - image: kamailio/pkg-kamailio-docker:master-${{ matrix.distribution }} + image: ghcr.io/kamailio/pkg-kamailio-docker:master-${{ matrix.distribution }} volumes: - ${{ github.workspace }}:/code env: @@ -27,7 +27,7 @@ jobs: compilier: clang steps: - uses: actions/checkout@v2 - - uses: ammaraskar/gcc-problem-matcher(a)0.1 + - uses: ammaraskar/gcc-problem-matcher(a)0.2.0 - name: build run: | cd /code

1 0

git:master:f27d15ba: auth_db: exported www_authenticate_method() to kemi
by Daniel-Constantin Mierla 28 Apr '23

28 Apr '23

Module: kamailio Branch: master Commit: f27d15ba6e1116a9f47e654d2bd0f4d3b73168a3 URL: https://github.com/kamailio/kamailio/commit/f27d15ba6e1116a9f47e654d2bd0f4d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-28T09:19:31+02:00 auth_db: exported www_authenticate_method() to kemi --- Modified: src/modules/auth_db/auth_db_mod.c Modified: src/modules/auth_db/authorize.c Modified: src/modules/auth_db/authorize.h --- Diff: https://github.com/kamailio/kamailio/commit/f27d15ba6e1116a9f47e654d2bd0f4d… Patch: https://github.com/kamailio/kamailio/commit/f27d15ba6e1116a9f47e654d2bd0f4d… --- diff --git a/src/modules/auth_db/auth_db_mod.c b/src/modules/auth_db/auth_db_mod.c index 5d54bdf4bd4..49556cd71de 100644 --- a/src/modules/auth_db/auth_db_mod.c +++ b/src/modules/auth_db/auth_db_mod.c @@ -452,6 +452,11 @@ static sr_kemi_t sr_kemi_auth_db_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("auth_db"), str_init("www_authenticate_method"), + SR_KEMIP_INT, ki_www_authenticate_method, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; diff --git a/src/modules/auth_db/authorize.c b/src/modules/auth_db/authorize.c index e433534284c..5fd7cce61ad 100644 --- a/src/modules/auth_db/authorize.c +++ b/src/modules/auth_db/authorize.c @@ -444,6 +444,11 @@ int www_authenticate2(struct sip_msg* _m, char* _realm, char* _table, char *_met &smethod); } +int ki_www_authenticate_method(sip_msg_t *msg, str *realm, str *table, str *method) +{ + return digest_authenticate(msg, realm, table, HDR_AUTHORIZATION_T, method); +} + /** * */ diff --git a/src/modules/auth_db/authorize.h b/src/modules/auth_db/authorize.h index fd26f39e75e..b67ba7121f9 100644 --- a/src/modules/auth_db/authorize.h +++ b/src/modules/auth_db/authorize.h @@ -46,6 +46,8 @@ int proxy_authenticate(struct sip_msg* _msg, char* _realm, char* _table); int www_authenticate(struct sip_msg* _msg, char* _realm, char* _table); int www_authenticate2(struct sip_msg* _msg, char* _realm, char* _table, char *_method); +int ki_www_authenticate_method(sip_msg_t *msg, str *realm, str *table, str *method); + /* * Authenticate using WWW/Proxy-Authorize header field */

1 0

Re: hooking mechanism for routing blocks
by Henning Westerholt 27 Apr '23

27 Apr '23

(also added sr-dev) Hello, It probably not exactly what you are looking for, but a common way for modules to provide "hooks" towards the configuration for later extensions is about the event_route facility. You can find many of this event routes used from modules (on simple example is dispatcher module). Inter-module communication or usage is usually facilitated by an API export from the providing module, and an API import/binding on the consuming module. Examples here are the usrloc and registrar modules. The sl module API is also used from many other modules to send messages. Cheers, Henning -----Original Message----- From: Valentin Christoph <Christoph.Valentin(a)kontron.com> Sent: Montag, 24. April 2023 15:44 To: Kamailio (SER) - Users Mailing List <sr-users(a)lists.kamailio.org> Subject: [SR-Users] hooking mechanism for routing blocks Dear all, I am looking for some hooking mechanism for user defined routing blocks. Is something like this already available? 1) a common part of the routing configuration shall not (or only slightly) be changed, after some hooks have been implemented Something like a function "engage_hooks()" of some "hook_module"? : Routing config that should not be changed by application developers engage_hooks(HOOK_TYPE); Routing config that should not be changed by application developers : 2) one application developer may "hook" new parts of the routing configuration into this, by modparam("hook_module", "hook", "name=MY_RB;type=HOOK_TYPE;prio=50); : : Route [MY_RB] { Do something at hook HOOK_TYPE; } : : 3) another application developer might want to "hook" into the same HOOK_TYPE with a higher priority modparam("hook_module", "hook", "name=ANOTHER_RB;type=HOOK_TYPE;prio=20); : : Route [ANOTHER_RB] { Do another thing with higher priority at hook HOOK_TYPE } : : Kr, Christoph __________________________________________________________ Kamailio - Users Mailing List - Non Commercial Discussions To unsubscribe send an email to sr-users-leave(a)lists.kamailio.org Important: keep the mailing list in the recipients, do not reply only to the sender! Edit mailing list options or unsubscribe:

2 1

git:master:f16ba6d4: auth: exported auth_get_www_authenticate() to kemi
by Daniel-Constantin Mierla 26 Apr '23

26 Apr '23

Module: kamailio Branch: master Commit: f16ba6d4a5305be84d5a2b9d1e6c6a15368c8c76 URL: https://github.com/kamailio/kamailio/commit/f16ba6d4a5305be84d5a2b9d1e6c6a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-26T20:36:36+02:00 auth: exported auth_get_www_authenticate() to kemi --- Modified: src/modules/auth/auth_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f16ba6d4a5305be84d5a2b9d1e6c6a1… Patch: https://github.com/kamailio/kamailio/commit/f16ba6d4a5305be84d5a2b9d1e6c6a1… --- diff --git a/src/modules/auth/auth_mod.c b/src/modules/auth/auth_mod.c index 5538ffb4f03..8e74d33dd4e 100644 --- a/src/modules/auth/auth_mod.c +++ b/src/modules/auth/auth_mod.c @@ -1260,6 +1260,43 @@ static int fixup_auth_get_www_authenticate(void **param, int param_no) return 0; } +/** + * + */ +static int ki_auth_get_www_authenticate(sip_msg_t* msg, str* realm, + int flags, str *pvdst) +{ + str hf = {0}; + pv_spec_t *pvs; + pv_value_t val; + int ret; + + pvs = pv_cache_get(pvdst); + if(pvs==NULL) { + LM_ERR("cannot get pv spec for [%.*s]\n", pvdst->len, pvdst->s); + return -1; + } + + ret = auth_challenge_helper(NULL, realm, flags, + HDR_AUTHORIZATION_T, &hf); + + if(ret<0) + return ret; + + val.rs.s = pv_get_buffer(); + val.rs.len = 0; + if(hf.s!=NULL) { + memcpy(val.rs.s, hf.s, hf.len); + val.rs.len = hf.len; + val.rs.s[val.rs.len] = '\0'; + pkg_free(hf.s); + } + val.flags = PV_VAL_STR; + pvs->setf(msg, &pvs->pvp, (int)EQ_T, &val); + + return (ret==0)?1:ret; +} + /** * */ @@ -1295,6 +1332,11 @@ static sr_kemi_t sr_kemi_auth_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("auth"), str_init("auth_get_www_authenticate"), + SR_KEMIP_INT, ki_auth_get_www_authenticate, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:1f802a96: tls: fix formatting in tls_select.c
by Daniel-Constantin Mierla 26 Apr '23

26 Apr '23

Module: kamailio Branch: master Commit: 1f802a96f0ce4c376d64be65bca27994bb2742cb URL: https://github.com/kamailio/kamailio/commit/1f802a96f0ce4c376d64be65bca2799… Author: Marcus Orchard <contactmarcusorchard(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-26T20:20:51+02:00 tls: fix formatting in tls_select.c --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/1f802a96f0ce4c376d64be65bca2799… Patch: https://github.com/kamailio/kamailio/commit/1f802a96f0ce4c376d64be65bca2799… --- diff --git a/src/modules/tls/tls_select.c b/src/modules/tls/tls_select.c index 943b7221556..745c005f3ea 100644 --- a/src/modules/tls/tls_select.c +++ b/src/modules/tls/tls_select.c @@ -318,7 +318,7 @@ static int get_version(str* res, sip_msg_t* msg) res->s = buf; res->len = version.len; tcpconn_put(c); - return 0; + return 0; err: if (c) tcpconn_put(c); @@ -1894,7 +1894,3 @@ sr_kemi_xval_t* ki_tls_cget_attr(sip_msg_t* msg, str *aname) sr_kemi_xval_null(&_ksr_kemi_tls_xval, SR_KEMI_XVAL_NULL_EMPTY); return &_ksr_kemi_tls_xval; } - - - -

1 0

git:master:7fd502fe: tls: get san entries by index
by Daniel-Constantin Mierla 26 Apr '23

26 Apr '23

Module: kamailio Branch: master Commit: 7fd502fe433695b798249404cae144365d08b9c7 URL: https://github.com/kamailio/kamailio/commit/7fd502fe433695b798249404cae1443… Author: root <contactmarcusorchard(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-04-26T20:20:51+02:00 tls: get san entries by index - adds count pv and sel for DNS, EMAIL, IP, URI - adds ability to access SAN entries by index fix #3400 --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/7fd502fe433695b798249404cae1443… Patch: https://github.com/kamailio/kamailio/commit/7fd502fe433695b798249404cae1443…

1 0

[kamailio/kamailio] TLS Module does not expose all entries in the subject alternative name (Issue #3400)
by Marcus Orchard 26 Apr '23

26 Apr '23

### Description Have a certificate with the following Subject Alternative Name value: DNS:www.company.net, DNS:company.com, DNS: company.net Calling `$tls_peer_san_hostname` (and the other pv's/select that reference SAN) only returns `www.company.net` (first entry) This does not support the spec which allows multiple entries (rfc2459 I believe). ### Troubleshooting Logged values of different SAN back select and pseudovariables and only appears to return the first entries. #### Reproduction Create a self signed certificate with multiple alt names (I used this as a guide: https://support.citrix.com/article/CTX135602/how-to-create-a-selfsigned-san…) Updated my Kamailio config to log different tls pv and selects (eg tls_peer_san_hostname, @tls.peer.dns select, but others as well) Confirm only one value is provided. #### Debugging Data ``` [www.company.net] is the only value present in the corresponding variables ``` ### Possible Solutions Update variables to provide access to SAN entries to return all the values Create new variable to provide access to all SAN entries ### Additional Information https://www.kamailio.org/wiki/cookbooks/5.1.x/pseudovariables#tls_peer_san_… http://www.kamailio.org/wiki/cookbooks/5.2.x/selects#tlspeerdns -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3400 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3400(a)github.com>

4 3

[kamailio/kamailio] tls: get san entries by index (PR #3408)
by Marcus Orchard 26 Apr '23

26 Apr '23

- adds count pv and sel for DNS, EMAIL, IP, URI - adds ability to access SAN entries by index fix #3400  #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #3400 #### Description Fix issue #3400 that describes that tls module cannot properly handle certificates with multiple SAN entries. Add ability to access SAN entries by index. Add ability to get count of supported SAN entries by type of entry. If index is not provided will return first entry (current behavior to remain backwards compatible. Tested by creating a self signed SAN cert with 3 DNS entries and confirmed expected results for: $(tls_peer_san_hostname[2]) $(tls_peer_san_hostname); $tls_peer_san_count(DNS) $tls_peer_san_count(URI) $tls_peer_san_count(EMAIL) $tls_peer_san_count(IP) $sel(tls.peer.dns[1]) $sel(tls.peer.dns) $sel(tls.peer.count[\"DNS\"]) $(tls_peer_san_ip[0]) $(tls_peer_san_uri) $sel(tls.peer.ip[0]) $sel(tls.peer.count[\"EMAIL\"]) $(tls_my_san_hostname[2]) $(tls_my_san_hostname) $tls_my_san_count(DNS) $tls_my_san_count(URI) $tls_my_san_count(EMAIL) $tls_my_san_count(IP) $sel(tls.my.dns[1]) $sel(tls.my.dns) $sel(tls.my.count[\"DNS\"] $(tls_my_san_ip[0])] $(tls_my_san_uri) $sel(tls.my.ip[0]) $sel(tls.my.count[\"EMAIL\"]) Also repeated the test with a self signed cert with 3 DNS entries, 1 IP entry, 1 EMAIL entry and 1 URI entry You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3408 -- Commit Summary -- * tls: get san entries by index -- File Changes -- M src/modules/tls/tls_select.c (314) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3408.patch https://github.com/kamailio/kamailio/pull/3408.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3408 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3408(a)github.com>

3 7

← Newer
1
...
11
12
13
14
15
16
17
...
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2023