sr-dev April 2020

sr-dev@lists.kamailio.org

33 participants
420 discussions

git:master:228c9364: dispatcher: docs for ds_default_sockname parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 228c9364e58620b960f9421cace59685539d384d URL: https://github.com/kamailio/kamailio/commit/228c9364e58620b960f9421cace5968… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-05T10:36:16+02:00 dispatcher: docs for ds_default_sockname parameter --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/228c9364e58620b960f9421cace5968… Patch: https://github.com/kamailio/kamailio/commit/228c9364e58620b960f9421cace5968… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 3a2eaaa49c..d9abd0e556 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -886,6 +886,8 @@ DEST: { script <emphasis>listen</emphasis> directive is used. </emphasis> </para> + <para>If parameter "ds_default_sockname" is set, then this parameter + is ignored.</para>. <example> <title>Set the <quote>ds_default_socket</quote> parameter</title> <programlisting format="linespecific"> @@ -896,6 +898,32 @@ DEST: { </example> </section> + <section id="dispatcher.p.ds_default_sockname"> + <title><varname>ds_default_sockname</varname> (str)</title> + <para> + Default socket name to be used for sending pings and dispatching requests + when a gateway has no send socket configured. + </para> + <para> + <emphasis> + By default no default socket is defined, the first configuration + script <emphasis>listen</emphasis> directive is used. + </emphasis> + </para> + <para>This parameter is used even if "ds_default_socket" parameter is set + (this parameter has higher priority). + <example> + <title>Set the <quote>ds_default_sockname</quote> parameter</title> + <programlisting format="linespecific"> + ... + listen=udp:1.2.3.4:5060 name "sock1" + ... + modparam("dispatcher", "ds_default_sockname", "sock1") + ... + </programlisting> + </example> + </section> + <section id="dispatcher.p.ds_timer_mode"> <title><varname>ds_timer_mode</varname> (int)</title> <para>

4 years, 7 months

git:master:87f170b2: dispatcher: new parameter ds_default_sockname

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 87f170b2063f488dcf6a54c613044ef1663ef9f1 URL: https://github.com/kamailio/kamailio/commit/87f170b2063f488dcf6a54c613044ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-05T10:29:30+02:00 dispatcher: new parameter ds_default_sockname - allow to set default send socket by name --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/87f170b2063f488dcf6a54c613044ef… Patch: https://github.com/kamailio/kamailio/commit/87f170b2063f488dcf6a54c613044ef… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index b4080168f5..372673a9e7 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -102,13 +102,14 @@ static int ds_ping_interval = 0; int ds_ping_latency_stats = 0; int ds_latency_estimator_alpha_i = 900; float ds_latency_estimator_alpha = 0.9f; -int ds_probing_mode = DS_PROBE_NONE; +int ds_probing_mode = DS_PROBE_NONE; static str ds_ping_reply_codes_str= STR_NULL; static int** ds_ping_reply_codes = NULL; static int* ds_ping_reply_codes_cnt; -str ds_default_socket = STR_NULL; +str ds_default_socket = STR_NULL; +str ds_default_sockname = STR_NULL; struct socket_info * ds_default_sockinfo = NULL; int ds_hash_size = 0; @@ -280,6 +281,7 @@ static param_export_t params[]={ {"ds_hash_check_interval", INT_PARAM, &ds_hash_check_interval}, {"outbound_proxy", PARAM_STR, &ds_outbound_proxy}, {"ds_default_socket", PARAM_STR, &ds_default_socket}, + {"ds_default_sockname",PARAM_STR, &ds_default_sockname}, {"ds_timer_mode", PARAM_INT, &ds_timer_mode}, {"event_callback", PARAM_STR, &ds_event_callback}, {"ds_attrs_none", PARAM_INT, &ds_attrs_none}, @@ -347,23 +349,34 @@ static int mod_init(void) cfg_get(dispatcher, dispatcher_cfg, inactive_threshold) = inactive_threshold; - if(ds_default_socket.s && ds_default_socket.len > 0) { - if(parse_phostport( - ds_default_socket.s, &host.s, &host.len, &port, &proto) - != 0) { - LM_ERR("bad socket <%.*s>\n", ds_default_socket.len, - ds_default_socket.s); - return -1; - } - ds_default_sockinfo = - grep_sock_info(&host, (unsigned short)port, proto); + if(ds_default_sockname.s && ds_default_sockname.len > 0) { + ds_default_sockinfo = ksr_get_socket_by_name(&ds_default_sockname); if(ds_default_sockinfo == 0) { - LM_ERR("non-local socket <%.*s>\n", ds_default_socket.len, - ds_default_socket.s); + LM_ERR("non-local socket name <%.*s>\n", ds_default_sockname.len, + ds_default_sockname.s); return -1; } - LM_INFO("default dispatcher socket set to <%.*s>\n", - ds_default_socket.len, ds_default_socket.s); + LM_INFO("default dispatcher socket set by name to <%.*s>\n", + ds_default_sockname.len, ds_default_sockname.s); + } else { + if(ds_default_socket.s && ds_default_socket.len > 0) { + if(parse_phostport( + ds_default_socket.s, &host.s, &host.len, &port, &proto) + != 0) { + LM_ERR("bad socket <%.*s>\n", ds_default_socket.len, + ds_default_socket.s); + return -1; + } + ds_default_sockinfo = + grep_sock_info(&host, (unsigned short)port, proto); + if(ds_default_sockinfo == 0) { + LM_ERR("non-local socket <%.*s>\n", ds_default_socket.len, + ds_default_socket.s); + return -1; + } + LM_INFO("default dispatcher socket set to <%.*s>\n", + ds_default_socket.len, ds_default_socket.s); + } } if(ds_init_data() != 0) @@ -1559,7 +1572,7 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) rpc->fault(ctx, 500, "Internal error creating dest struct"); return -1; } - if(rpc->struct_add(wh, "SSdddS", + if(rpc->struct_add(wh, "SSdddSS", "BODY", &(node->dlist[j].attrs.body), "DUID", (node->dlist[j].attrs.duid.s) ? &(node->dlist[j].attrs.duid) : &data, @@ -1567,7 +1580,9 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) "WEIGHT", node->dlist[j].attrs.weight, "RWEIGHT", node->dlist[j].attrs.rweight, "SOCKET", (node->dlist[j].attrs.socket.s) - ? &(node->dlist[j].attrs.socket) : &data) + ? &(node->dlist[j].attrs.socket) : &data, + "SOCKNAME", (node->dlist[j].attrs.sockname.s) + ? &(node->dlist[j].attrs.sockname) : &data) < 0) { rpc->fault(ctx, 500, "Internal error creating attrs struct"); return -1;

4 years, 7 months

git:master:90346a28: Merge pull request #2268 from armenb/tls_escaped_ssl_cert

by GitHub

Module: kamailio Branch: master Commit: 90346a287165ac58d2ff5f295b92c5298878e035 URL: https://github.com/kamailio/kamailio/commit/90346a287165ac58d2ff5f295b92c52… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-04-05T09:56:55+02:00 Merge pull request #2268 from armenb/tls_escaped_ssl_cert tls: add support for escaped cert PVs and select --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/90346a287165ac58d2ff5f295b92c52… Patch: https://github.com/kamailio/kamailio/commit/90346a287165ac58d2ff5f295b92c52…

4 years, 7 months

git:master:ae03ce19: tls: add support for urlencoded cert PVs and select

by Armen Babikyan

Module: kamailio Branch: master Commit: ae03ce19333a6ed44fefdc597f785bb1e4f4c04c URL: https://github.com/kamailio/kamailio/commit/ae03ce19333a6ed44fefdc597f785bb… Author: Armen Babikyan <armen(a)firespotter.com> Committer: Armen Babikyan <armen(a)firespotter.com> Date: 2020-04-01T19:32:49-07:00 tls: add support for urlencoded cert PVs and select - new PVs: $tls_peer_raw_cert, $tls_peer_urlencoded_cert, $tls_my_raw_cert, $tls_my_urlencoded_cert - new selects: @tls.peer.raw_cert, @tls.peer.urlencoded_cert, @tls.my.raw_cert, @tls.my.urlencoded_cert --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/ae03ce19333a6ed44fefdc597f785bb… Patch: https://github.com/kamailio/kamailio/commit/ae03ce19333a6ed44fefdc597f785bb…

4 years, 7 months

[kamailio/kamailio] kamctl: added secfilter to dbtext (#2261)

by Igor Olhovskiy

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Added secfilter module scheme to dbtext, as per using `kamdbctl create` with DBTEXT, was getting following error ``` cp: cannot stat '/usr/share/kamailio//dbtext/kamailio/secfilter': No such file or directory ``` With this patch error is gone. Secfilter DBTEXT scheme is taken from SQLite scheme. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2261 -- Commit Summary -- * kamctl: added secfilter to dbtext -- File Changes -- A utils/kamctl/dbtext/kamailio/secfilter (1) M utils/kamctl/dbtext/kamailio/version (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2261.patch https://github.com/kamailio/kamailio/pull/2261.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2261

4 years, 7 months

[kamailio/kamailio] kex: added process description for rpc command pkg.stats (#2270)

by goharahmed

#### 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) - [ ] 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  Minor addition to output of RPC command pkg.stats, the description available next to PID and its memory utilization will help during monitoring of memory utilization(or leaks) by specific modules. Without name printed the PID was required to be matched with the output of "kamctl ps" **Old output**: ``` { entry: 2 pid: 13723 used: 2616752 free: 13180048 real_used: 3597168 total_size: 16777216 total_frags: 2 } ``` **New output:** ``` { entry: 14 pid: 29413 rank: -1 used: 2615808 free: 13181200 real_used: 3596016 total_size: 16777216 total_frags: 1 desc: USRLOC Timer } ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2270 -- Commit Summary -- * kex: added process description for rpc command pkg.stats -- File Changes -- M src/modules/kex/pkg_stats.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2270.patch https://github.com/kamailio/kamailio/pull/2270.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2270

4 years, 7 months

git:master:5966b55b: Merge pull request #2270 from goharahmed/master

by GitHub

Module: kamailio Branch: master Commit: 5966b55bdfd87025bd4459007ffe9eb0558bc16f URL: https://github.com/kamailio/kamailio/commit/5966b55bdfd87025bd4459007ffe9eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-04-04T19:50:40+02:00 Merge pull request #2270 from goharahmed/master kex: added process description for rpc command pkg.stats --- Modified: src/modules/kex/pkg_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/5966b55bdfd87025bd4459007ffe9eb… Patch: https://github.com/kamailio/kamailio/commit/5966b55bdfd87025bd4459007ffe9eb… --- diff --git a/src/modules/kex/pkg_stats.c b/src/modules/kex/pkg_stats.c index d44f465410..9a2f4a2d37 100644 --- a/src/modules/kex/pkg_stats.c +++ b/src/modules/kex/pkg_stats.c @@ -240,7 +240,7 @@ static void rpc_pkg_stats(rpc_t* rpc, void* ctx) _pkg_proc_stats_list[i].total_size = _pkg_proc_stats_list[0].total_size; _pkg_proc_stats_list[i].rank = PROC_NOCHLDINIT; } - if(rpc->struct_add(th, "dddddddd", + if(rpc->struct_add(th, "dddddddds", "entry", i, "pid", _pkg_proc_stats_list[i].pid, "rank", _pkg_proc_stats_list[i].rank, @@ -248,7 +248,8 @@ static void rpc_pkg_stats(rpc_t* rpc, void* ctx) "free", _pkg_proc_stats_list[i].available, "real_used", _pkg_proc_stats_list[i].real_used, "total_size", _pkg_proc_stats_list[i].total_size, - "total_frags", _pkg_proc_stats_list[i].total_frags + "total_frags", _pkg_proc_stats_list[i].total_frags, + "desc",pt[i].desc )<0) { rpc->fault(ctx, 500, "Internal error creating rpc");

4 years, 7 months

git:master:80dfbefe: kex: added process description for rpc command pkg.stats

by Gohar Ahmed

Module: kamailio Branch: master Commit: 80dfbefe7d20299a0fbe9515c0d074e874f6fccb URL: https://github.com/kamailio/kamailio/commit/80dfbefe7d20299a0fbe9515c0d074e… Author: Gohar Ahmed <scribedfor(a)gmail.com> Committer: Gohar Ahmed <scribedfor(a)gmail.com> Date: 2020-04-02T03:53:00Z kex: added process description for rpc command pkg.stats --- Modified: src/modules/kex/pkg_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/80dfbefe7d20299a0fbe9515c0d074e… Patch: https://github.com/kamailio/kamailio/commit/80dfbefe7d20299a0fbe9515c0d074e… --- diff --git a/src/modules/kex/pkg_stats.c b/src/modules/kex/pkg_stats.c index d44f465410..9a2f4a2d37 100644 --- a/src/modules/kex/pkg_stats.c +++ b/src/modules/kex/pkg_stats.c @@ -240,7 +240,7 @@ static void rpc_pkg_stats(rpc_t* rpc, void* ctx) _pkg_proc_stats_list[i].total_size = _pkg_proc_stats_list[0].total_size; _pkg_proc_stats_list[i].rank = PROC_NOCHLDINIT; } - if(rpc->struct_add(th, "dddddddd", + if(rpc->struct_add(th, "dddddddds", "entry", i, "pid", _pkg_proc_stats_list[i].pid, "rank", _pkg_proc_stats_list[i].rank, @@ -248,7 +248,8 @@ static void rpc_pkg_stats(rpc_t* rpc, void* ctx) "free", _pkg_proc_stats_list[i].available, "real_used", _pkg_proc_stats_list[i].real_used, "total_size", _pkg_proc_stats_list[i].total_size, - "total_frags", _pkg_proc_stats_list[i].total_frags + "total_frags", _pkg_proc_stats_list[i].total_frags, + "desc",pt[i].desc )<0) { rpc->fault(ctx, 500, "Internal error creating rpc");

4 years, 7 months

git:master:0517925a: modules: readme files regenerated - nat_traversal ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 0517925aceae25f0d71e7f30ea0d5f849949e6e8 URL: https://github.com/kamailio/kamailio/commit/0517925aceae25f0d71e7f30ea0d5f8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-04T10:01:12+02:00 modules: readme files regenerated - nat_traversal ... [skip ci] --- Modified: src/modules/nat_traversal/README --- Diff: https://github.com/kamailio/kamailio/commit/0517925aceae25f0d71e7f30ea0d5f8… Patch: https://github.com/kamailio/kamailio/commit/0517925aceae25f0d71e7f30ea0d5f8…

4 years, 7 months

git:master:91c30dc8: nat_traversal: docs for contact_match parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 91c30dc8650d778851fcf439904557bc7363fcc4 URL: https://github.com/kamailio/kamailio/commit/91c30dc8650d778851fcf439904557b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-04T09:59:06+02:00 nat_traversal: docs for contact_match parameter --- Modified: src/modules/nat_traversal/doc/nat_traversal_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/91c30dc8650d778851fcf439904557b… Patch: https://github.com/kamailio/kamailio/commit/91c30dc8650d778851fcf439904557b… --- diff --git a/src/modules/nat_traversal/doc/nat_traversal_admin.xml b/src/modules/nat_traversal/doc/nat_traversal_admin.xml index f5e8ef00f5..1143e4a90b 100644 --- a/src/modules/nat_traversal/doc/nat_traversal_admin.xml +++ b/src/modules/nat_traversal/doc/nat_traversal_admin.xml @@ -493,6 +493,36 @@ modparam("nat_traversal", "keepalive_extra_headers", "User-Agent: &kamailio;\r\n <programlisting format="linespecific"> ... modparam("nat_traversal", "keepalive_state_file", "/run/kamailio/keepalive_state") +... + </programlisting> + </example> + </section> + + <section> + <title><varname>contact_match</varname> (integer)</title> + <para> + Control how to match the contact URIs between requests and replies. + </para> + <para> + If set to 0, do string comparison. Use this mode when the contact URI + is not changed by registrar or proxy servers. + </para> + <para> + If set to 1, do light URI comparison (match URI type, user, host, + port and proto). Use this mode when the contact URI can be changed + by registrar or proxy servers (e.g., new parameters added, or the + order of parameters changed). + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Setting the <varname>contact_match</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("nat_traversal", "contact_match", 1) ... </programlisting> </example>

4 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2020