sr-dev January 2023

sr-dev@lists.kamailio.org

14 participants
276 discussions

[kamailio/kamailio] dialog.dlg_filter_mode has ambiguous definition with double negation (Issue #3336)

by Дилян Палаузов

https://www.kamailio.org/docs/modules/devel/modules/dialog#dialog.p.dlg_fil… says for dialog.dlg_filter_mode (int) > Set dialog fitering mode, which can specify what dialogs are processed. Its value can be a combination (the sum) of following flags: > > 1 - do not send keepalives and do not execute timeout function if dialog is not local (if the associated bind address is not a local socket). > > Default value is “0”. As you can see, the definition of 1 is a double negation and there is no definition for 0. What means 0: - do not send keepalives and do not execute timeout function if dialog is local - send keepalives and execute timeout function if dialog is not local - send keepalives and execute timeout function if dialog is local Please document the meaning of the default value 0. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3336 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3336(a)github.com>

1 year, 3 months

[kamailio/kamailio] topos: added Call-ID mask support (PR #3323)

by Harish S

Call ID mask with a key similar to topoh insted of swaping with new ID. Call ID masking is dome when a message is received from the upstream and unmasked before sending towords upstream.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3323 -- Commit Summary -- * topos: added Call-ID mask support -- File Changes -- M src/modules/topos/doc/topos_admin.xml (54) M src/modules/topos/topos_mod.c (13) A src/modules/topos/tps_mask.c (189) A src/modules/topos/tps_mask.h (36) M src/modules/topos/tps_msg.c (174) M src/modules/topos/tps_msg.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3323.patch https://github.com/kamailio/kamailio/pull/3323.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3323 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3323(a)github.com>

1 year, 3 months

git:master:a45f4d90: modules: readme files regenerated - topoh ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: a45f4d901371e3ecdfad1652603a761ca30ac05e URL: https://github.com/kamailio/kamailio/commit/a45f4d901371e3ecdfad1652603a761… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-01-20T12:31:20+01:00 modules: readme files regenerated - topoh ... [skip ci] --- Modified: src/modules/topoh/README --- Diff: https://github.com/kamailio/kamailio/commit/a45f4d901371e3ecdfad1652603a761… Patch: https://github.com/kamailio/kamailio/commit/a45f4d901371e3ecdfad1652603a761… --- diff --git a/src/modules/topoh/README b/src/modules/topoh/README index 2bb18d89d2..2fa0f4fd39 100644 --- a/src/modules/topoh/README +++ b/src/modules/topoh/README @@ -38,6 +38,7 @@ Daniel-Constantin Mierla 3.11. uri_prefix_checks (integer) 3.12. event_callback (str) 3.13. event_mode (int) + 3.14. use_mode (int) 4. Event Routes @@ -59,8 +60,9 @@ Daniel-Constantin Mierla 1.11. Set uri_prefix_checks parameter 1.12. Set event_callback parameter 1.13. Set event_mode parameter - 1.14. Usage of event_route[topoh:msg-outgoing] - 1.15. Usage of event_route[topoh:msg-sending] + 1.14. Set use_mode parameter + 1.15. Usage of event_route[topoh:msg-outgoing] + 1.16. Usage of event_route[topoh:msg-sending] Chapter 1. Admin Guide @@ -87,6 +89,7 @@ Chapter 1. Admin Guide 3.11. uri_prefix_checks (integer) 3.12. event_callback (str) 3.13. event_mode (int) + 3.14. use_mode (int) 4. Event Routes @@ -141,6 +144,7 @@ Chapter 1. Admin Guide 3.11. uri_prefix_checks (integer) 3.12. event_callback (str) 3.13. event_mode (int) + 3.14. use_mode (int) 3.1. mask_key (str) @@ -322,6 +326,19 @@ end modparam("topoh", "event_mode", 2) ... +3.14. use_mode (int) + + Control how the module is initialized. If set to 1, the module is only + initialized to be used as a library via inter-module API functions. If + set to 0, the module is initialized for SIP messages processing. + + Default value is 0 (to process SIP messages). + + Example 1.14. Set use_mode parameter +... +modparam("topoh", "use_mode", 1) +... + 4. Event Routes 4.1. event_route[topoh:msg-outgoing] @@ -339,7 +356,7 @@ modparam("topoh", "event_mode", 2) reparsing the outgoing SIP message for the cases when topology hiding is not wanted. - Example 1.14. Usage of event_route[topoh:msg-outgoing] + Example 1.15. Usage of event_route[topoh:msg-outgoing] ... event_route[topoh:msg-outgoing] { if($sndto(ip)=="10.1.1.10") { @@ -358,7 +375,7 @@ event_route[topoh:msg-outgoing] { $sndto(proto) point to the destination. The SIP message is the one to be sent out. - Example 1.15. Usage of event_route[topoh:msg-sending] + Example 1.16. Usage of event_route[topoh:msg-sending] ... event_route[topoh:msg-sending] { if(is_request() and $fU=="alice") {

1 year, 3 months

git:master:3cfbb8f8: topoh: added docs for use_mode parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3cfbb8f8e2be64a2bec02ddc25ca8877c0f778f1 URL: https://github.com/kamailio/kamailio/commit/3cfbb8f8e2be64a2bec02ddc25ca887… 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 docs for use_mode parameter --- Modified: src/modules/topoh/doc/topoh_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3cfbb8f8e2be64a2bec02ddc25ca887… Patch: https://github.com/kamailio/kamailio/commit/3cfbb8f8e2be64a2bec02ddc25ca887… --- diff --git a/src/modules/topoh/doc/topoh_admin.xml b/src/modules/topoh/doc/topoh_admin.xml index c8718b81a79..b6fc2ab0286 100644 --- a/src/modules/topoh/doc/topoh_admin.xml +++ b/src/modules/topoh/doc/topoh_admin.xml @@ -352,6 +352,28 @@ end ... modparam("topoh", "event_mode", 2) ... +</programlisting> + </example> + </section> + <section id="topoh.p.use_mode"> + <title><varname>use_mode</varname> (int)</title> + <para> + Control how the module is initialized. If set to 1, the module is + only initialized to be used as a library via inter-module API + functions. If set to 0, the module is initialized for SIP messages + processing. + </para> + <para> + <emphasis> + Default value is 0 (to process SIP messages). + </emphasis> + </para> + <example> + <title>Set <varname>use_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("topoh", "use_mode", 1) +... </programlisting> </example> </section>

1 year, 3 months

git:master:5b9f22c0: topoh: added mod param use_mode

by Daniel-Constantin Mierla

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 year, 3 months

git:master:bca9c558: topoh: added inter-module api function for masking call-id

by Daniel-Constantin Mierla

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 year, 3 months

git:master:ca2e3bba: modules: readme files regenerated - websocket ... [skip ci]

by Kamailio Dev

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 year, 3 months

[kamailio/kamailio] dialog: Add dlg_get_matches function (PR #3005)

by rhys-hanrahan

#### 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>

1 year, 3 months

[kamailio/kamailio] sipdump: clarify PV must be loaded in advance for mode=2 (PR #3329)

by Дилян Палаузов

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>

1 year, 3 months

[kamailio/kamailio] websocket: example must listen on ports 80 and 443 (PR #3332)

by Дилян Палаузов

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>

1 year, 3 months

← Newer
1
...
15
16
17
18
19
20
21
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2023