sr-dev October 2019

sr-dev@lists.kamailio.org

22 participants
437 discussions

Re: [sr-dev] [SR-Users] Routing Blocks - Missing in latest core wiki
by Henning Westerholt 31 Oct '19

31 Oct '19

Hello Joel, thank you – this is another error; on the disk it looks ok.. I need to investigate here as well. To prevent further issues, I’ve switched the user group to read-only for now. I will activate the editing again when the problem is fixed. Cheers, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://skalatan.de/services From: Joel Serrano <joel(a)textplus.com> Sent: Wednesday, October 30, 2019 9:28 PM To: Henning Westerholt <hw(a)skalatan.de> Cc: miconda(a)gmail.com; Kamailio (SER) - Users Mailing List <sr-users(a)lists.kamailio.org> Subject: Re: [SR-Users] Routing Blocks - Missing in latest core wiki Hi guys, This one also needs fixing: https://www.kamailio.org/wiki/cookbooks/devel/pseudovariables I assume caused from the newly created $tcp(c_si), $tcp(c_sp) and $tcp(connid) pseudovars. Please see right after $msrp(srcsock) I also reported this in the ticket: https://github.com/kamailio/kamailio/issues/2103 but being closed I'm not sure if you get the notifications. Thanks, Joel. On Wed, Oct 30, 2019 at 10:23 AM Henning Westerholt <hw(a)skalatan.de<mailto:hw@skalatan.de>> wrote: Hello, the error is still there, just tested it. I will have a look to it, there are some errors in the apache log related to PHP. I just created a local copy to be able to test it easier. Cheers, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://skalatan.de/services From: sr-users <sr-users-bounces(a)lists.kamailio.org<mailto:sr-users-bounces@lists.kamailio.org>> On Behalf Of Daniel-Constantin Mierla Sent: Wednesday, October 30, 2019 9:56 AM To: Joel Serrano <joel(a)textplus.com<mailto:joel@textplus.com>> Cc: Kamailio (SER) - Users Mailing List <sr-users(a)lists.kamailio.org<mailto:sr-users@lists.kamailio.org>> Subject: Re: [SR-Users] Routing Blocks - Missing in latest core wiki Hello, ok, thanks for trying! I added the content directly on the files on the server. We have to dig and see why the content is truncated, maybe some settings need to be adjusted. Cheers, Daniel On 30.10.19 00:40, Joel Serrano wrote: Hi Daniel, I believe you are right, and I don't see the easy fix, I tried to edit myself to fix but no matter what I do, when I save the changes it gets truncated. I also tried to add it in parts (section by section) and save with smaller changes, but when I got to the event_routes section I started getting the same problem and can't continue. I'm attaching to this email the missing parts, because I clicked on "save" for core 5.2.x, that one got truncated too, so currently 5.2.x, 5.3.x and devel need to be fixed. My suggestion is to replace from "Custom Global Parameters" onwards with the contents of the attached file, maybe you can edit the files directly on the wiki server? Or, if you manage to do it via the GUI I'd love to know how you got it working! Sorry, I tried.. :-( Cheers, Joel. On Tue, Oct 29, 2019 at 1:44 PM Daniel-Constantin Mierla <miconda(a)gmail.com<mailto:miconda@gmail.com>> wrote: Hello, that part has to be added back. It was either an accidental change or a hit a limitation/bug of dokuwiki (because it removed last part). Looking back at the history, it happened when I changed the version number in the title: - http://www.kamailio.org/wiki/cookbooks/devel/core?do=diff&rev2%5B0%5D=15663… If you want, you can go ahead and add it yourself, copying from the previous edition, otherwise I will do it tomorrow. Cheers, Daniel On 29.10.19 21:03, Joel Serrano wrote: Hi, I was looking at the documentation and noticed that "Routing Blocks" section is missing in latest releases... http://www.kamailio.org/wiki/cookbooks/5.2.x/core#routing_blocks is OK But: http://www.kamailio.org/wiki/cookbooks/5.3.x/core#routing_blocks http://www.kamailio.org/wiki/cookbooks/devel/core#routing_blocks Don't exist, have they been moved elsewhere? Thanks! Joel. _______________________________________________ Kamailio (SER) - Users Mailing List sr-users(a)lists.kamailio.org<mailto:sr-users@lists.kamailio.org> https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users -- Daniel-Constantin Mierla -- www.asipto.com<http://www.asipto.com> www.twitter.com/miconda<http://www.twitter.com/miconda> -- www.linkedin.com/in/miconda<http://www.linkedin.com/in/miconda> Kamailio Advanced Training, Oct 21-23, 2019, Berlin, Germany -- https://asipto.com/u/kat -- Daniel-Constantin Mierla -- www.asipto.com<http://www.asipto.com> www.twitter.com/miconda<http://www.twitter.com/miconda> -- www.linkedin.com/in/miconda<http://www.linkedin.com/in/miconda> Kamailio World Conference - April 27-29, 2020, in Berlin -- www.kamailioworld.com<http://www.kamailioworld.com>

1 1

git:master:bf3797ce: jsonrpcs: kemi function to get the rpc command response
by Daniel-Constantin Mierla 31 Oct '19

31 Oct '19

Module: kamailio Branch: master Commit: bf3797ce7566fd5d993cbb0b0314f255b66bf662 URL: https://github.com/kamailio/kamailio/commit/bf3797ce7566fd5d993cbb0b0314f25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-31T17:24:24+01:00 jsonrpcs: kemi function to get the rpc command response - shortcut to skip the pv get layer, can be useful for large values --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bf3797ce7566fd5d993cbb0b0314f25… Patch: https://github.com/kamailio/kamailio/commit/bf3797ce7566fd5d993cbb0b0314f25… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index d939be5d0f..5843d87a5f 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -1515,6 +1515,25 @@ static int ki_jsonrpcs_exec(sip_msg_t *msg, str *scmd) return jsonrpc_exec_ex(scmd, NULL); } +/** + * + */ +static sr_kemi_xval_t _sr_kemi_jsonrpcs_xval = {0}; + +/** + * + */ +static sr_kemi_xval_t* ki_jsonrpcs_response(sip_msg_t *msg) +{ + if(_jsonrpc_plain_reply.rbody.s==NULL) { + sr_kemi_xval_null(&_sr_kemi_jsonrpcs_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_sr_kemi_jsonrpcs_xval; + } + _sr_kemi_jsonrpcs_xval.vtype = SR_KEMIP_STR; + _sr_kemi_jsonrpcs_xval.v.s = _jsonrpc_plain_reply.rbody; + return &_sr_kemi_jsonrpcs_xval; +} + /** * */ @@ -1530,6 +1549,11 @@ static sr_kemi_t sr_kemi_jsonrpcs_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("jsonrpcs"), str_init("response"), + SR_KEMIP_XVAL, ki_jsonrpcs_response, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + 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:7470ab6d: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 31 Oct '19

31 Oct '19

Module: kamailio Branch: master Commit: 7470ab6d16200f011dc33aad5ad4e89483af12e6 URL: https://github.com/kamailio/kamailio/commit/7470ab6d16200f011dc33aad5ad4e89… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-10-31T17:16:14+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/7470ab6d16200f011dc33aad5ad4e89… Patch: https://github.com/kamailio/kamailio/commit/7470ab6d16200f011dc33aad5ad4e89… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 1949131062..a460ffff60 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1296,9 +1296,10 @@ if(ds_list_exists("10")) { specific group id. The parameter can be an integer or a variable holding an integer value. * mode - (optional) - a bitmask to specify how the matching should be - done. If is 0, all ip, port and proto are matched. If bit one is - set, then port is ignored. If bit two is set, then protocol is - ignored. The parameter can be an integer or a variable holding an + done. If is 0, all ip, port and proto are matched and active status + is ignored. If bit one is set, then port is ignored. If bit two is + set, then protocol is ignored. If bit three is set, then state must + be active. The parameter can be an integer or a variable holding an integer value. It must be provided if the uri parameter is provided. * uri (optional) - if is empty or missing, the matching is done

1 0

[kamailio/kamailio] dispatcher: add state to mode in ds_list_exists (#2117)
by lazedo 31 Oct '19

31 Oct '19

#### 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  adds Bit 3 to mode parameter in ds_list_exists to allow the check of active/inactive entries in a list You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2117 -- Commit Summary -- * dispatcher: add state to mode in ds_list_exists -- File Changes -- M src/modules/dispatcher/dispatch.c (4) M src/modules/dispatcher/dispatch.h (1) M src/modules/dispatcher/doc/dispatcher_admin.xml (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2117.patch https://github.com/kamailio/kamailio/pull/2117.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/2117

2 2

git:master:2945ba44: dispatcher: add state to mode in ds_list_exists
by lazedo 31 Oct '19

31 Oct '19

Module: kamailio Branch: master Commit: 2945ba448c6365728b49c10ba98824be357f85b3 URL: https://github.com/kamailio/kamailio/commit/2945ba448c6365728b49c10ba98824b… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2019-10-31T16:12:31Z dispatcher: add state to mode in ds_list_exists adds Bit 3 to allow the check of active/inactive entries in ds_list --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2945ba448c6365728b49c10ba98824b… Patch: https://github.com/kamailio/kamailio/commit/2945ba448c6365728b49c10ba98824b… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 18b713ce02..75b3b56f3a 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2998,7 +2998,9 @@ int ds_is_addr_from_set(sip_msg_t *_m, struct ip_addr *pipaddr, && ((mode & DS_MATCH_NOPORT) || node->dlist[j].port == 0 || tport == node->dlist[j].port) && ((mode & DS_MATCH_NOPROTO) - || tproto == node->dlist[j].proto)) { + || tproto == node->dlist[j].proto) + && (((mode & DS_MATCH_ACTIVE) && !ds_skip_dst(node->dlist[j].flags)) + || !(mode & DS_MATCH_ACTIVE))) { if(export_set_pv && ds_setid_pvname.s != 0) { memset(&val, 0, sizeof(pv_value_t)); val.flags = PV_VAL_INT | PV_TYPE_INT; diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 3a6a5aedc6..e4a54944aa 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -57,6 +57,7 @@ #define DS_MATCH_ALL 0 #define DS_MATCH_NOPORT 1 #define DS_MATCH_NOPROTO 2 +#define DS_MATCH_ACTIVE 4 #define DS_SETOP_DSTURI 0 #define DS_SETOP_RURI 1 diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 11881bbed5..94e7062705 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1569,8 +1569,10 @@ if(ds_list_exists("10")) { <listitem> <para><emphasis>mode</emphasis> - (optional) - a bitmask to specify how the matching should be done. If is 0, all ip, port and - proto are matched. If bit one is set, then port is ignored. - If bit two is set, then protocol is ignored. The parameter + proto are matched and active status is ignored. + If bit one is set, then port is ignored. + If bit two is set, then protocol is ignored. + If bit three is set, then state must be active. The parameter can be an integer or a variable holding an integer value. It must be provided if the uri parameter is provided. </para>

1 0

[kamailio/kamailio] Add optional parameter to ds_is_from_list() to check only active GW (#1908)
by pwakano 31 Oct '19

31 Oct '19

### Description Currently ds_is_from_list() matches all GWs in the dispatcher list, not considering if the GW is disabled or not. It might have situation where a GW is permanently disabled but can't be removed (because of CDR references for instance). In this case it is not desired to match a disabled GW in the test. The function should accept a new parameter which will tell if it should or not match disabled GWs. For backward compatibility, it should not be a mandatory parameter and its default value should be to match disabled GW (as it is today). ### Expected behavior ds_is_from_list() should return false in case it matches a disabled GW and the new parameter tells not to match disabled GWs. -- 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/issues/1908

3 4

git:5.2:c24bd9e7: ims_ipsec_pcscf: fix non-close mnl_socket when a bind error
by Henning Westerholt 31 Oct '19

31 Oct '19

Module: kamailio Branch: 5.2 Commit: c24bd9e7e449275fa9b9b7a05960e264edb15fac URL: https://github.com/kamailio/kamailio/commit/c24bd9e7e449275fa9b9b7a05960e26… Author: Stanislav S. Litvinenko <litvinenko(a)protei.ru> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-31T16:36:03+01:00 ims_ipsec_pcscf: fix non-close mnl_socket when a bind error (cherry picked from commit 8cae623c7051d529d779c4bf072225c44154e403) --- Modified: src/modules/ims_ipsec_pcscf/ipsec.c --- Diff: https://github.com/kamailio/kamailio/commit/c24bd9e7e449275fa9b9b7a05960e26… Patch: https://github.com/kamailio/kamailio/commit/c24bd9e7e449275fa9b9b7a05960e26… --- diff --git a/src/modules/ims_ipsec_pcscf/ipsec.c b/src/modules/ims_ipsec_pcscf/ipsec.c index 55eced727f..5576e6234e 100644 --- a/src/modules/ims_ipsec_pcscf/ipsec.c +++ b/src/modules/ims_ipsec_pcscf/ipsec.c @@ -65,6 +65,7 @@ struct mnl_socket* init_mnl_socket() if(mnl_socket_bind(mnl_socket, 0, MNL_SOCKET_AUTOPID) < 0) { LM_ERR("Error binding a MNL socket\n"); + close_mnl_socket(mnl_socket); return NULL; }

1 0

git:5.3:50dcbdf4: ims_ipsec_pcscf: fix gcc warning about misleading indention
by Henning Westerholt 31 Oct '19

31 Oct '19

Module: kamailio Branch: 5.3 Commit: 50dcbdf4f6f2a99d1a60aa0d676612c782285133 URL: https://github.com/kamailio/kamailio/commit/50dcbdf4f6f2a99d1a60aa0d676612c… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-31T16:42:18+01:00 ims_ipsec_pcscf: fix gcc warning about misleading indention (cherry picked from commit 08e451066aad2ed14a70a72a18733788a48224ef) --- Modified: src/modules/ims_ipsec_pcscf/spi_gen.c --- Diff: https://github.com/kamailio/kamailio/commit/50dcbdf4f6f2a99d1a60aa0d676612c… Patch: https://github.com/kamailio/kamailio/commit/50dcbdf4f6f2a99d1a60aa0d676612c… --- diff --git a/src/modules/ims_ipsec_pcscf/spi_gen.c b/src/modules/ims_ipsec_pcscf/spi_gen.c index 997cb866e9..5e329028c9 100644 --- a/src/modules/ims_ipsec_pcscf/spi_gen.c +++ b/src/modules/ims_ipsec_pcscf/spi_gen.c @@ -42,27 +42,28 @@ int init_spi_gen(uint32_t start_val, uint32_t range) return 1; } - if(UINT32_MAX - range < start_val) + if(UINT32_MAX - range < start_val) { return 2; + } - if(spi_data){ - return 3; - } + if(spi_data){ + return 3; + } - spi_data = shm_malloc(sizeof(spi_generator_t)); - if(spi_data == NULL){ - return 4; - } + spi_data = shm_malloc(sizeof(spi_generator_t)); + if(spi_data == NULL){ + return 4; + } - if(pthread_mutex_init(&spi_data->spis_mut, NULL)){ - shm_free(spi_data); - return 5; - } + if(pthread_mutex_init(&spi_data->spis_mut, NULL)){ + shm_free(spi_data); + return 5; + } - spi_data->used_spis = create_list(); + spi_data->used_spis = create_list(); - spi_data->spi_val = spi_data->min_spi = start_val; - spi_data->max_spi = start_val + range; + spi_data->spi_val = spi_data->min_spi = start_val; + spi_data->max_spi = start_val + range; return 0; }

1 0

git:5.3:543fbbf9: ims_ipsec_pcscf: fix non-close mnl_socket when a bind error
by Henning Westerholt 31 Oct '19

31 Oct '19

Module: kamailio Branch: 5.3 Commit: 543fbbf9b1dd2429be910b27566bf273381cbf78 URL: https://github.com/kamailio/kamailio/commit/543fbbf9b1dd2429be910b27566bf27… Author: Stanislav S. Litvinenko <litvinenko(a)protei.ru> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-31T16:35:49+01:00 ims_ipsec_pcscf: fix non-close mnl_socket when a bind error (cherry picked from commit 8cae623c7051d529d779c4bf072225c44154e403) --- Modified: src/modules/ims_ipsec_pcscf/ipsec.c --- Diff: https://github.com/kamailio/kamailio/commit/543fbbf9b1dd2429be910b27566bf27… Patch: https://github.com/kamailio/kamailio/commit/543fbbf9b1dd2429be910b27566bf27… --- diff --git a/src/modules/ims_ipsec_pcscf/ipsec.c b/src/modules/ims_ipsec_pcscf/ipsec.c index 171d884151..5306af84ae 100644 --- a/src/modules/ims_ipsec_pcscf/ipsec.c +++ b/src/modules/ims_ipsec_pcscf/ipsec.c @@ -63,6 +63,7 @@ struct mnl_socket* init_mnl_socket() if(mnl_socket_bind(mnl_socket, 0, MNL_SOCKET_AUTOPID) < 0) { LM_ERR("Error binding a MNL socket\n"); + close_mnl_socket(mnl_socket); return NULL; }

1 0

git:master:08e45106: ims_ipsec_pcscf: fix gcc warning about misleading indention
by Henning Westerholt 31 Oct '19

31 Oct '19

Module: kamailio Branch: master Commit: 08e451066aad2ed14a70a72a18733788a48224ef URL: https://github.com/kamailio/kamailio/commit/08e451066aad2ed14a70a72a1873378… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-31T16:39:59+01:00 ims_ipsec_pcscf: fix gcc warning about misleading indention --- Modified: src/modules/ims_ipsec_pcscf/spi_gen.c --- Diff: https://github.com/kamailio/kamailio/commit/08e451066aad2ed14a70a72a1873378… Patch: https://github.com/kamailio/kamailio/commit/08e451066aad2ed14a70a72a1873378… --- diff --git a/src/modules/ims_ipsec_pcscf/spi_gen.c b/src/modules/ims_ipsec_pcscf/spi_gen.c index 997cb866e9..5e329028c9 100644 --- a/src/modules/ims_ipsec_pcscf/spi_gen.c +++ b/src/modules/ims_ipsec_pcscf/spi_gen.c @@ -42,27 +42,28 @@ int init_spi_gen(uint32_t start_val, uint32_t range) return 1; } - if(UINT32_MAX - range < start_val) + if(UINT32_MAX - range < start_val) { return 2; + } - if(spi_data){ - return 3; - } + if(spi_data){ + return 3; + } - spi_data = shm_malloc(sizeof(spi_generator_t)); - if(spi_data == NULL){ - return 4; - } + spi_data = shm_malloc(sizeof(spi_generator_t)); + if(spi_data == NULL){ + return 4; + } - if(pthread_mutex_init(&spi_data->spis_mut, NULL)){ - shm_free(spi_data); - return 5; - } + if(pthread_mutex_init(&spi_data->spis_mut, NULL)){ + shm_free(spi_data); + return 5; + } - spi_data->used_spis = create_list(); + spi_data->used_spis = create_list(); - spi_data->spi_val = spi_data->min_spi = start_val; - spi_data->max_spi = start_val + range; + spi_data->spi_val = spi_data->min_spi = start_val; + spi_data->max_spi = start_val + range; return 0; }

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2019