sr-dev June 2018

sr-dev@lists.kamailio.org

26 participants
320 discussions

RFC: dispatcher refactoring to use xavp and options for attributes
by Daniel-Constantin Mierla 06 Jun '18

06 Jun '18

Hello, I am starting a discussion here about my plans to do a bit of refactoring to dispatcher module and gather some feedback if people think of other improvements. 1) First is about moving from using avps to xavps. It should simplify at least the config in terms of modparams, but also makes it more coherent in storing the details of destination record for serial forking. Practically, from a bunch of avp parameters, there will be one to set the root xavp name, and the old "avps" will be fields inside the xavp. 2) The second is about the attributes field. I am considering to add the option to load additional attributes from dedicated columns when using database. So besides the attrs column, one can specify via a mod param additional columns to be loaded and added to attributes, like: modparam("dispatcher", "xattrs", "weight,socket,maxload") The attributes string will be the value of "attrs" column concatenated with "weight=val1;socket=val2;maxload=val3" (the valX being the corresponding values in those columns). This should make easier the management of the database records. For the option with a text file, no changes will be done. 3) Anything else that one thinks would be good to add to dispatcher? Cheers, Daniel PS. I wrote to both sr-dev and sr-users, to get the attention of the two communities. However, you can reply only to sr-users (larger community) if you are not on sr-dev, because this discussion is about features of the module, not technical aspects of coding. -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference -- www.kamailioworld.com

2 2

git:master:d7469674: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 06 Jun '18

06 Jun '18

Module: kamailio Branch: master Commit: d746967485b17d2530418e059da0cd31f10d9396 URL: https://github.com/kamailio/kamailio/commit/d746967485b17d2530418e059da0cd3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-06T18:16:40+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/d746967485b17d2530418e059da0cd3… Patch: https://github.com/kamailio/kamailio/commit/d746967485b17d2530418e059da0cd3…

1 0

git:master:a9c89c4b: dispatcher: docs for ds_attrs_none param
by Daniel-Constantin Mierla 06 Jun '18

06 Jun '18

Module: kamailio Branch: master Commit: a9c89c4b437cf9a7bda2233f050bde702704c82e URL: https://github.com/kamailio/kamailio/commit/a9c89c4b437cf9a7bda2233f050bde7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-06T18:01:56+02:00 dispatcher: docs for ds_attrs_none param --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a9c89c4b437cf9a7bda2233f050bde7… Patch: https://github.com/kamailio/kamailio/commit/a9c89c4b437cf9a7bda2233f050bde7… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 8037184273..19e74978fd 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -975,6 +975,28 @@ end </example> </section> + <section id="dispatcher.p.ds_attrs_none"> + <title><varname>ds_attrs_none</varname> (int)</title> + <para> + If set to 1, "none=yes" is set in the attrs for those records that + have no attrs value, to ensure that corresponding avps for records do + not get mixed up. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set the <quote>ds_attrs_none</quote> parameter</title> + <programlisting format="linespecific"> + ... + modparam("dispatcher", "ds_attrs_none", 1) + ... + </programlisting> + </example> + </section> + </section> <section>

1 0

git:master:d1cb2644: dispatcher: new param ds_attrs_none
by Daniel-Constantin Mierla 06 Jun '18

06 Jun '18

Module: kamailio Branch: master Commit: d1cb26446742d1734eb8aac1b970e8128a1db041 URL: https://github.com/kamailio/kamailio/commit/d1cb26446742d1734eb8aac1b970e81… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-06T17:56:46+02:00 dispatcher: new param ds_attrs_none - if set to 1, "none=yes" is set in the attrs for those records that have no attrs value, to ensure that corresponding avps for records don't get mixed up --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/d1cb26446742d1734eb8aac1b970e81… Patch: https://github.com/kamailio/kamailio/commit/d1cb26446742d1734eb8aac1b970e81… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 740b678e51..fb095becea 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -89,6 +89,7 @@ extern int ds_force_dst; extern str ds_event_callback; extern int ds_ping_latency_stats; extern float ds_latency_estimator_alpha; +extern int ds_attrs_none; static db_func_t ds_dbf; static db1_con_t *ds_db_handle = NULL; @@ -241,27 +242,35 @@ int init_data(void) /** * */ -int ds_set_attrs(ds_dest_t *dest, str *attrs) +int ds_set_attrs(ds_dest_t *dest, str *vattrs) { param_t *params_list = NULL; param_hooks_t phooks; param_t *pit = NULL; str param; int tmp_rweight = 0; + str sattrs; - if(attrs == NULL || attrs->len <= 0) - return 0; - if(attrs->s[attrs->len - 1] == ';') - attrs->len--; + if(vattrs == NULL || vattrs->len <= 0) { + if(ds_attrs_none==0) { + return 0; + } + sattrs.s = "none=yes"; + sattrs.len = 8; + } else { + sattrs = *vattrs; + } + if(sattrs.s[sattrs.len - 1] == ';') + sattrs.len--; /* clone in shm */ - dest->attrs.body.s = (char *)shm_malloc(attrs->len + 1); + dest->attrs.body.s = (char *)shm_malloc(sattrs.len + 1); if(dest->attrs.body.s == NULL) { LM_ERR("no more shm\n"); return -1; } - memcpy(dest->attrs.body.s, attrs->s, attrs->len); - dest->attrs.body.s[attrs->len] = '\0'; - dest->attrs.body.len = attrs->len; + memcpy(dest->attrs.body.s, sattrs.s, sattrs.len); + dest->attrs.body.s[sattrs.len] = '\0'; + dest->attrs.body.len = sattrs.len; param = dest->attrs.body; if(parse_params(&param, CLASS_ANY, &phooks, &params_list) < 0) diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index f6ab6b1d70..bcb085c624 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -120,6 +120,7 @@ int ds_hash_expire = 7200; int ds_hash_initexpire = 7200; int ds_hash_check_interval = 30; int ds_timer_mode = 0; +int ds_attrs_none = 0; str ds_outbound_proxy = STR_NULL; @@ -259,6 +260,7 @@ static param_export_t params[]={ {"ds_default_socket", PARAM_STR, &ds_default_socket}, {"ds_timer_mode", PARAM_INT, &ds_timer_mode}, {"event_callback", PARAM_STR, &ds_event_callback}, + {"ds_attrs_none", PARAM_INT, &ds_attrs_none}, {0,0,0} };

1 0

git:master:f3f14c6d: dispatcher: safety check for null value of attrs field in database
by Daniel-Constantin Mierla 06 Jun '18

06 Jun '18

Module: kamailio Branch: master Commit: f3f14c6d85a7055c3a729ec46b83ff2a179ac397 URL: https://github.com/kamailio/kamailio/commit/f3f14c6d85a7055c3a729ec46b83ff2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-06T14:34:56+02:00 dispatcher: safety check for null value of attrs field in database --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/f3f14c6d85a7055c3a729ec46b83ff2… Patch: https://github.com/kamailio/kamailio/commit/f3f14c6d85a7055c3a729ec46b83ff2… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index cbda9731e6..740b678e51 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -962,9 +962,9 @@ int ds_load_db(void) attrs.s = 0; attrs.len = 0; - if(nrcols >= 5) { + if(nrcols >= 5 && !VAL_NULL(values + 4)) { attrs.s = VAL_STR(values + 4).s; - attrs.len = strlen(attrs.s); + if(attrs.s) attrs.len = strlen(attrs.s); } if(add_dest2list(id, uri, flags, priority, &attrs, *next_idx, &setn) != 0) {

1 0

git:master:f9477084: tm: free new tm cell in case of error if it was not referenced
by Daniel-Constantin Mierla 06 Jun '18

06 Jun '18

Module: kamailio Branch: master Commit: f94770840029c1c73ab129f4b71fcb0cf146d808 URL: https://github.com/kamailio/kamailio/commit/f94770840029c1c73ab129f4b71fcb0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-06T10:25:27+02:00 tm: free new tm cell in case of error if it was not referenced - part of t_uac_prepare(), reported by GH #1554 --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/f94770840029c1c73ab129f4b71fcb0… Patch: https://github.com/kamailio/kamailio/commit/f94770840029c1c73ab129f4b71fcb0… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index ff466760dd..9b2f51b5f6 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -583,11 +583,18 @@ static inline int t_uac_prepare(uac_req_t *uac_r, error2: #ifdef TM_DEL_UNREF - if (!is_ack) { - UNREF_FREE(new_cell); - }else -#endif + if (is_ack) { free_cell(new_cell); + } else { + if(atomic_get_int(&new_cell->ref_count)==0) { + free_cell(new_cell); + } else { + UNREF_FREE(new_cell); + } + } +#else + free_cell(new_cell); +#endif error3: return ret; }

1 0

git:master:226a6aa0: examples: remove execute mode from text file
by Victor Seva 06 Jun '18

06 Jun '18

Module: kamailio Branch: master Commit: 226a6aa06fc46ead24e262afd382af64452ae080 URL: https://github.com/kamailio/kamailio/commit/226a6aa06fc46ead24e262afd382af6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-06-06T09:45:54+02:00 examples: remove execute mode from text file --- Modified: misc/examples/ims/pcscf/dispatcher.list.sample --- Diff: https://github.com/kamailio/kamailio/commit/226a6aa06fc46ead24e262afd382af6… Patch: https://github.com/kamailio/kamailio/commit/226a6aa06fc46ead24e262afd382af6… --- diff --git a/misc/examples/ims/pcscf/dispatcher.list.sample b/misc/examples/ims/pcscf/dispatcher.list.sample old mode 100755 new mode 100644

1 0

git:master:657d2699: core: kemi - is_method_in() support for kdmq, get, post, put, delete
by Daniel-Constantin Mierla 06 Jun '18

06 Jun '18

Module: kamailio Branch: master Commit: 657d2699784d9fc35f66382f9f137f0b80301018 URL: https://github.com/kamailio/kamailio/commit/657d2699784d9fc35f66382f9f137f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-06T09:02:15+02:00 core: kemi - is_method_in() support for kdmq, get, post, put, delete --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/657d2699784d9fc35f66382f9f137f0… Patch: https://github.com/kamailio/kamailio/commit/657d2699784d9fc35f66382f9f137f0… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index ac31b1beb0..9b1d0050a5 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -814,6 +814,36 @@ static int sr_kemi_core_is_method_in(sip_msg_t *msg, str *vmethod) return SR_KEMI_TRUE; } break; + case 'G': + case 'g': + if(imethod==METHOD_GET) { + return SR_KEMI_TRUE; + } + break; + case 'K': + case 'k': + if(imethod==METHOD_KDMQ) { + return SR_KEMI_TRUE; + } + break; + case 'D': + case 'd': + if(imethod==METHOD_DELETE) { + return SR_KEMI_TRUE; + } + break; + case 'T': + case 't': + if(imethod==METHOD_POST) { + return SR_KEMI_TRUE; + } + break; + case 'V': + case 'v': + if(imethod==METHOD_PUT) { + return SR_KEMI_TRUE; + } + break; } } return SR_KEMI_FALSE;

1 0

Fwd: Sharing static variables in external library across child proceses
by User 721 06 Jun '18

06 Jun '18

Hi, I am adding a kamailio module that references an external C library that maintains a hashtable in global scope. I am wondering what practice I should follow so that: - This hashtable (which I don't control directly) is shared by all child processes - The hashtable is changed by one child process at a time Thanks in advance

2 1

git:master:e9be2021: topos: fix condition to match KDMQ method
by Daniel-Constantin Mierla 06 Jun '18

06 Jun '18

Module: kamailio Branch: master Commit: e9be20215b8e995bac698b54b7960cdaa9b60798 URL: https://github.com/kamailio/kamailio/commit/e9be20215b8e995bac698b54b7960cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-06T08:10:15+02:00 topos: fix condition to match KDMQ method --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e9be20215b8e995bac698b54b7960cd… Patch: https://github.com/kamailio/kamailio/commit/e9be20215b8e995bac698b54b7960cd… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 408c964e62..5d3e4aec9c 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -405,7 +405,7 @@ int tps_msg_sent(sr_event_param_t *evp) goto done; } if(get_cseq(&msg)->method.len==4 - && strncmp(get_cseq(&msg)->method.s, "KDMQ", 4)) { + && strncmp(get_cseq(&msg)->method.s, "KDMQ", 4)==0) { goto done; } }

1 0

← Newer
1
...
24
25
26
27
28
29
30
31
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2018