sr-dev January 2023

sr-dev@lists.kamailio.org

14 participants
282 discussions

git:master:5b9f22c0: topoh: added mod param use_mode
by Daniel-Constantin Mierla 20 Jan '23

20 Jan '23

Module: kamailio Branch: master Commit: 5b9f22c0f45e6970e47a972f26eeac920860b4d7 URL: https://github.com/kamailio/kamailio/commit/5b9f22c0f45e6970e47a972f26eeac9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-20T12:22:55+01:00 topoh: added mod param use_mode - if set to 1, the module is initialized only for use as a library, via inter-module api functions - default: 0 - initialized for use to process sip messages --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5b9f22c0f45e6970e47a972f26eeac9… Patch: https://github.com/kamailio/kamailio/commit/5b9f22c0f45e6970e47a972f26eeac9… --- diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index 8f244d6212..c1b2dc51e9 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -82,6 +82,7 @@ int th_param_mask_mode = 0; int th_sanity_checks = 0; int th_uri_prefix_checks = 0; int th_mask_addr_myself = 0; +int _th_use_mode = 0; sanity_api_t scb; @@ -116,6 +117,7 @@ static param_export_t params[]={ {"uri_prefix_checks", PARAM_INT, &th_uri_prefix_checks}, {"event_callback", PARAM_STR, &_th_eventrt_callback}, {"event_mode", PARAM_INT, &_th_eventrt_mode}, + {"use_mode", PARAM_INT, &_th_use_mode}, {0,0,0} }; @@ -147,6 +149,12 @@ static int mod_init(void) sip_uri_t puri; char buri[MAX_URI_SIZE]; + if(_th_use_mode==1) { + /* use in library mode, not for processing sip messages */ + th_mask_init(); + return 0; + } + _th_eventrt_outgoing = route_lookup(&event_rt, _th_eventrt_outgoing_name.s); if(_th_eventrt_outgoing<0 || event_rt.rlist[_th_eventrt_outgoing]==NULL) {

1 0

git:master:bca9c558: topoh: added inter-module api function for masking call-id
by Daniel-Constantin Mierla 20 Jan '23

20 Jan '23

Module: kamailio Branch: master Commit: bca9c5587472df76e61a374d99b7a8dcefd63b2e URL: https://github.com/kamailio/kamailio/commit/bca9c5587472df76e61a374d99b7a8d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-20T12:22:55+01:00 topoh: added inter-module api function for masking call-id --- Modified: src/modules/topoh/api.h Modified: src/modules/topoh/th_msg.c Modified: src/modules/topoh/th_msg.h Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bca9c5587472df76e61a374d99b7a8d… Patch: https://github.com/kamailio/kamailio/commit/bca9c5587472df76e61a374d99b7a8d… --- diff --git a/src/modules/topoh/api.h b/src/modules/topoh/api.h index 7cdf224c149..f499214c238 100644 --- a/src/modules/topoh/api.h +++ b/src/modules/topoh/api.h @@ -29,10 +29,12 @@ #include "../../core/sr_module.h" +typedef int (*topoh_mask_callid_f)(str *icallid, str *ocallid); typedef int (*topoh_unmask_callid_f)(str *icallid, str *ocallid); typedef struct topoh_api { + topoh_mask_callid_f mask_callid; topoh_unmask_callid_f unmask_callid; } topoh_api_t; diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index 46fecb184a0..4762691845a 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -543,6 +543,46 @@ int th_unmask_callid(sip_msg_t *msg) } #define TH_CALLID_SIZE 256 + +int th_mask_callid_str(str *icallid, str *ocallid) +{ + static char th_callid_mbuf[TH_CALLID_SIZE]; + str out; + + if(th_param_mask_callid==0) + return 0; + + if(th_param_mask_callid==0) + return 0; + + if(icallid->s==NULL) { + LM_ERR("invalid call-id value\n"); + return -1; + } + + out.s = th_mask_encode(icallid->s, icallid->len, &th_callid_prefix, &out.len); + if(out.s==NULL) { + LM_ERR("cannot encode call-id\n"); + return -1; + } + + if(out.len>=TH_CALLID_SIZE) { + pkg_free(out.s); + LM_ERR("not enough callid buf size (needed %d)\n", out.len); + return -2; + } + + memcpy(th_callid_mbuf, out.s, out.len); + th_callid_mbuf[out.len] = '\0'; + + pkg_free(out.s); + + ocallid->s = th_callid_mbuf; + ocallid->len = out.len; + + return 0; +} + int th_unmask_callid_str(str *icallid, str *ocallid) { static char th_callid_buf[TH_CALLID_SIZE]; diff --git a/src/modules/topoh/th_msg.h b/src/modules/topoh/th_msg.h index 0616e70617e..5fa6623fc3a 100644 --- a/src/modules/topoh/th_msg.h +++ b/src/modules/topoh/th_msg.h @@ -31,6 +31,7 @@ int th_mask_via(sip_msg_t *msg); int th_mask_callid(sip_msg_t *msg); +int th_mask_callid_str(str *icallid, str *ocallid); int th_mask_contact(sip_msg_t *msg); int th_mask_record_route(sip_msg_t *msg); int th_unmask_via(sip_msg_t *msg, str *cookie); diff --git a/src/modules/topoh/topoh_mod.c b/src/modules/topoh/topoh_mod.c index 55bb18145b0..8f244d62120 100644 --- a/src/modules/topoh/topoh_mod.c +++ b/src/modules/topoh/topoh_mod.c @@ -632,6 +632,7 @@ int bind_topoh(topoh_api_t* api) } memset(api, 0, sizeof(topoh_api_t)); + api->mask_callid = th_mask_callid_str; api->unmask_callid = th_unmask_callid_str; return 0;

1 0

git:master:ca2e3bba: modules: readme files regenerated - websocket ... [skip ci]
by Kamailio Dev 20 Jan '23

20 Jan '23

Module: kamailio Branch: master Commit: ca2e3bbabc4d6fa9ce4ca68d1b102f3aab8b7b3b URL: https://github.com/kamailio/kamailio/commit/ca2e3bbabc4d6fa9ce4ca68d1b102f3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-01-20T12:01:13+01:00 modules: readme files regenerated - websocket ... [skip ci] --- Modified: src/modules/websocket/README --- Diff: https://github.com/kamailio/kamailio/commit/ca2e3bbabc4d6fa9ce4ca68d1b102f3… Patch: https://github.com/kamailio/kamailio/commit/ca2e3bbabc4d6fa9ce4ca68d1b102f3… --- diff --git a/src/modules/websocket/README b/src/modules/websocket/README index 82559a6bde..bc808cbefb 100644 --- a/src/modules/websocket/README +++ b/src/modules/websocket/README @@ -163,6 +163,8 @@ Chapter 1. Admin Guide Example 1.1. event_route[xhttp:request] ... tcp_accept_no_cl=yes +listen=tcp:127.0.0.17:80 +listen=tls:127.0.0.17:443 ... loadmodule "sl.so" loadmodule "xhttp.so" @@ -247,6 +249,7 @@ event_route[xhttp:request] { ... loadmodule "sl.so" loadmodule "tm.so" +loadmodule "xhttp.so" ... loadmodule "websocket.so" ...

1 0

[kamailio/kamailio] dialog: Add dlg_get_matches function (PR #3005)
by rhys-hanrahan 20 Jan '23

20 Jan '23

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [X] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description I've marked this as a "breaking change" only because it slightly alters the error handling of the RPC dlg.list_match command, to draw attention to it. But the actual functionality is unchanged. This PR adds a new script function to the dialog module: `dlg_get_matches`. This has the same behaviour as the RPC `dlg.list_match` command, but allows use in scripts. The results are returned in an XAVP of a specified name, as an array of fields. ``` dlg_get_matches(mkey, mop, mval, xavp_name[, max_results]); Returns number of matches found. Or -1 if there's an error. ``` An example of use would be: ``` xlog("Extension is: $var(ext)\n"); $avp(dlg_count) = dlg_get_matches("turi", "sw", "sip:nexusone$var(ext)@", "dlg_matches"); xlog("Got $avp(dlg_count) matches.\n"); $var(i) = 0; $var(matched) = 0; while ($var(i) < $avp(dlg_count)) { //Skip dialogs that are not early state if ($xavp(dlg_matches[$var(i)]=>state) == 2) { xlog("Found matching dlg[$var(i)]: $xavp(dlg_matches[$var(i)]=>from_uri)\n"); } } ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3005 -- Commit Summary -- * dialog: Adding dlg_get_matches function based on RPC dlg.list_match command. * dialog: Adding documentation for dlg_get_matches function. * dialog: Refactored dlg_get_matches and dlg.list_match RPC command to use a shared dlg_list_matches function. -- File Changes -- M src/modules/dialog/dialog.c (793) M src/modules/dialog/doc/dialog_admin.xml (92) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3005.patch https://github.com/kamailio/kamailio/pull/3005.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3005 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3005(a)github.com>

3 22

[kamailio/kamailio] sipdump: clarify PV must be loaded in advance for mode=2 (PR #3329)
by Дилян Палаузов 20 Jan '23

20 Jan '23

I hope the example will be properly formatted. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3329 -- Commit Summary -- * sipdump: clarify PV must be loaded in advance for mode=2 -- File Changes -- M src/modules/sipdump/doc/sipdump_admin.xml (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3329.patch https://github.com/kamailio/kamailio/pull/3329.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3329 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3329(a)github.com>

2 3

[kamailio/kamailio] websocket: example must listen on ports 80 and 443 (PR #3332)
by Дилян Палаузов 20 Jan '23

20 Jan '23

otherwise the code below always matches: ``` if ($Rp != 80 && $Rp != 443) { ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3332 -- Commit Summary -- * websocket: example must listen on ports 80 and 443 -- File Changes -- M src/modules/websocket/doc/websocket_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3332.patch https://github.com/kamailio/kamailio/pull/3332.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3332 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3332(a)github.com>

2 1

git:master:3112e49a: websocket: example must listen on ports 80 and 443
by Daniel-Constantin Mierla 20 Jan '23

20 Jan '23

Module: kamailio Branch: master Commit: 3112e49aac274c75cc893693e820da894125403b URL: https://github.com/kamailio/kamailio/commit/3112e49aac274c75cc893693e820da8… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-20T11:49:51+01:00 websocket: example must listen on ports 80 and 443 otherwise the code below always matches: if ($Rp != 80 && $Rp != 443) { --- Modified: src/modules/websocket/doc/websocket_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3112e49aac274c75cc893693e820da8… Patch: https://github.com/kamailio/kamailio/commit/3112e49aac274c75cc893693e820da8… --- diff --git a/src/modules/websocket/doc/websocket_admin.xml b/src/modules/websocket/doc/websocket_admin.xml index f12d109561..5d33184a85 100644 --- a/src/modules/websocket/doc/websocket_admin.xml +++ b/src/modules/websocket/doc/websocket_admin.xml @@ -44,6 +44,8 @@ <programlisting><![CDATA[ ... tcp_accept_no_cl=yes +listen=tcp:127.0.0.17:80 +listen=tls:127.0.0.17:443 ... loadmodule "sl.so" loadmodule "xhttp.so" @@ -135,6 +137,7 @@ event_route[xhttp:request] { ... loadmodule "sl.so" loadmodule "tm.so" +loadmodule "xhttp.so" ... loadmodule "websocket.so" ...

1 0

[kamailio/kamailio] websocket: ignoring keepalive for socket in the removing state (PR #3331)
by sergey-safarov 20 Jan '23

20 Jan '23

#### 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 #3278 #### Description When websocket is closed, then possible race condition websocket removal and websocket keepalive functions. [ws_frame.c:816](https://github.com/kamailio/kamailio/blob/ac4c2d4579f121395… - setting socked state `WS_S_CLOSING` [ws_conn.c:703](https://github.com/kamailio/kamailio/blob/master/src/modules… - setting socket state `WS_S_REMOVING` and updates `rmticks` value. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3331 -- Commit Summary -- * websocket: ignoring keepalive for socket in the removing state (GH #3278) -- File Changes -- M src/modules/websocket/ws_frame.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3331.patch https://github.com/kamailio/kamailio/pull/3331.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3331 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3331(a)github.com>

2 4

[kamailio/kamailio] fedora 37 build warnings with gcc 12.2.1 (Issue #3330)
by sergey-safarov 20 Jan '23

20 Jan '23

``` CC (gcc) [kamailio] core/nonsip_hooks.o CC (gcc) [kamailio] core/onsend.o CC (gcc) [kamailio] core/pass_fd.o CC (gcc) [kamailio] core/ppcfg.o In file included from core/ppcfg.c:37: core/utils/snexpr.h: In function 'snexpr_create': core/utils/snexpr.h:1247:98: warning: '%d' directive output may be truncated writing between 1 and 11 bytes into a region of size 2 [-Wformat-truncation=] 1247 | snprintf(varname, sizeof(varname) - 1, "$%d", | ^~ core/utils/snexpr.h:1247:96: note: directive argument in the range [-2147483646, 2147483647] 1247 | snprintf(varname, sizeof(varname) - 1, "$%d", | ^~~~~ core/utils/snexpr.h:1247:57: note: 'snprintf' output between 3 and 13 bytes into a destination of size 3 1247 | snprintf(varname, sizeof(varname) - 1, "$%d", | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1248 | (j + 1)); | ~~~~~~~~ CC (gcc) [kamailio] core/proxy.o CC (gcc) [kamailio] core/pt.o CC (gcc) [kamailio] core/pv_core.o CC (gcc) [kamailio] core/pvapi.o ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3330 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3330(a)github.com>

2 2

git:master:d5b42fca: core: snexpr - increase local buffer to avoid compile warning
by Daniel-Constantin Mierla 20 Jan '23

20 Jan '23

Module: kamailio Branch: master Commit: d5b42fca13d2107590f9178c5d7c1a9d765adf73 URL: https://github.com/kamailio/kamailio/commit/d5b42fca13d2107590f9178c5d7c1a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-01-20T11:34:14+01:00 core: snexpr - increase local buffer to avoid compile warning - GH #3330 --- Modified: src/core/utils/snexpr.h --- Diff: https://github.com/kamailio/kamailio/commit/d5b42fca13d2107590f9178c5d7c1a9… Patch: https://github.com/kamailio/kamailio/commit/d5b42fca13d2107590f9178c5d7c1a9… --- diff --git a/src/core/utils/snexpr.h b/src/core/utils/snexpr.h index 4fb6e3f3b7..0115a52fd8 100644 --- a/src/core/utils/snexpr.h +++ b/src/core/utils/snexpr.h @@ -1243,7 +1243,7 @@ static struct snexpr *snexpr_create(const char *s, size_t len, int j; /* Assign macro parameters */ for(j = 0; j < sne_vec_len(&arg.args); j++) { - char varname[4]; + char varname[14]; snprintf(varname, sizeof(varname) - 1, "$%d", (j + 1)); struct snexpr_var *v =

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2023