sr-dev June 2018

sr-dev@lists.kamailio.org

26 participants
320 discussions

git:master:3c410368: dispatcher: docs - fixed closing tag for xml itemizedlist
by Daniel-Constantin Mierla 19 Jun '18

19 Jun '18

Module: kamailio Branch: master Commit: 3c41036806dc1468ecf53b6753dc430df639b02b URL: https://github.com/kamailio/kamailio/commit/3c41036806dc1468ecf53b6753dc430… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-19T19:03:53+02:00 dispatcher: docs - fixed closing tag for xml itemizedlist --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3c41036806dc1468ecf53b6753dc430… Patch: https://github.com/kamailio/kamailio/commit/3c41036806dc1468ecf53b6753dc430… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 20512651ca..b113b284fd 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1316,7 +1316,7 @@ if(ds_select("1", "$var(a)")) { a variable holding an integer value. </para> </listitem> - <itemizedlist> + </itemizedlist> <para> If the bit 2 in 'flags' is set, the rest of the addresses from the destination groups are stored in XAVP list (limited with an optional 'limit'

1 0

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

19 Jun '18

Module: kamailio Branch: master Commit: 1c8d5206c26c4c3897761cdd38341182a143087f URL: https://github.com/kamailio/kamailio/commit/1c8d5206c26c4c3897761cdd3834118… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-19T19:01:38+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/1c8d5206c26c4c3897761cdd3834118… Patch: https://github.com/kamailio/kamailio/commit/1c8d5206c26c4c3897761cdd3834118…

1 0

git:master:8446409d: dispatcher: documentation for ds_select_routes()
by Daniel-Constantin Mierla 19 Jun '18

19 Jun '18

Module: kamailio Branch: master Commit: 8446409d77fe82a38eec772bbcf92bea34d44e35 URL: https://github.com/kamailio/kamailio/commit/8446409d77fe82a38eec772bbcf92be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-19T18:53:13+02:00 dispatcher: documentation for ds_select_routes() --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8446409d77fe82a38eec772bbcf92be… Patch: https://github.com/kamailio/kamailio/commit/8446409d77fe82a38eec772bbcf92be… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 19c68bf4b3..20512651ca 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1276,6 +1276,77 @@ if(ds_select("1", "$var(a)")) { exit; } ... +</programlisting> + </example> + </section> + <section id="dispatcher.f.ds_select_routes"> + <title> + <function moreinfo="none">ds_select_routes(rules, mode [, limit])</function> + </title> + <para> + The method selects destinations following the rules combining groups add + algorithms, controlling where the first destination address is pushed, + and optionally setting a limit of selected addresses. + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem> + <para><emphasis>rules</emphasis> - a string in the format + "grp1=alg1;grp2=alg2;...grpN=algN", where grpX is an integer number + identifying a dispatcher set id and algN is a dispatcher algorithm + identifier. No white spaces should be given in the parameter value. + The parameter can contain pseudo-variables. + </para> + </listitem> + <listitem> + <para><emphasis>mode</emphasis> - control where to push the first + selected target address. Valid values are: '0', 'd' or 'D' to push + the address in destination URI; '1', 'r' or 'R' to push the address + in R-URI; '2', 'x' or 'X' to push the address only in the XAVP when + failure rerouting is enabled. Note that only first character of the + parameter matters, therefore once case use a more meaningful value + such as 'ruri' instead of 'r'. The parameter can contain pseudo + variables. + </para> + </listitem> + <listitem> + <para><emphasis>limit</emphasis> - a positive integer value to + restrict the number of selected target addresses. If it is 0, then + no limit is considered. The parameter can be a static integer or + a variable holding an integer value. + </para> + </listitem> + <itemizedlist> + <para> + If the bit 2 in 'flags' is set, the rest of the addresses from the + destination groups are stored in XAVP list (limited with an optional 'limit' + parameter). You can execute 'ds_next_domain()' or 'ds_next_dst()' to use + next address to achieve serial forking to all possible destinations. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>ds_select_routes</function> usage</title> + <programlisting format="linespecific"> +... +$var(alg) = 4; +$var(limit) = 8; +if(ds_select_routes("1=4;2=$var(alg)", "ruri", "$var(limit)")) { + t_on_failure("REROUTE"); + t_relay(); + exit; +} +failure_route[REROUTE] { + if(t_check_status("408|5[0-9][0-9]")) { + if(ds_next_domain()) { + t_on_failure("REROUTE"); + t_relay(); + exit; + } + } +} +... </programlisting> </example> </section>

1 0

git:master:3933a64c: dispatcher: new function ds_select_routing(rules, mode, [limit])
by Daniel-Constantin Mierla 19 Jun '18

19 Jun '18

Module: kamailio Branch: master Commit: 3933a64c464acfb285ea10175b6ef699ed464543 URL: https://github.com/kamailio/kamailio/commit/3933a64c464acfb285ea10175b6ef69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-19T18:34:00+02:00 dispatcher: new function ds_select_routing(rules, mode, [limit]) - select target addresses from a combination of groups and algorithms, control where the first destination is pushed and optionally set a limit --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/3933a64c464acfb285ea10175b6ef69… Patch: https://github.com/kamailio/kamailio/commit/3933a64c464acfb285ea10175b6ef69…

1 0

git:master:6d9ff00f: core: fixup helper for functions with spve, spve and igp params
by Daniel-Constantin Mierla 19 Jun '18

19 Jun '18

Module: kamailio Branch: master Commit: 6d9ff00f2dc0a893162b2aa8aa28b0a835b58a2e URL: https://github.com/kamailio/kamailio/commit/6d9ff00f2dc0a893162b2aa8aa28b0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-19T15:48:48+02:00 core: fixup helper for functions with spve, spve and igp params --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/6d9ff00f2dc0a893162b2aa8aa28b0a… Patch: https://github.com/kamailio/kamailio/commit/6d9ff00f2dc0a893162b2aa8aa28b0a… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index df3775f6cd..9c8a9535b5 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -641,6 +641,30 @@ int fixup_free_spve_igp(void** param, int param_no) return E_UNSPEC; } +/** + * + */ +int fixup_spve_spve_igp(void** param, int param_no) +{ + if(param_no==1 || param_no==2) + return fixup_spve_null(param, 1); + if(param_no==3) + return fixup_igp_null(param, 1); + return E_UNSPEC; +} + +/** + * + */ +int fixup_free_spve_spve_igp(void** param, int param_no) +{ + if(param_no==1 || param_no==2) + return fixup_free_spve_null(param, 1); + if(param_no==3) + return fixup_free_igp_null(param, 1); + return E_UNSPEC; +} + /** * */ diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index e78b2d2df0..b3ab9b91ae 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -146,6 +146,9 @@ int fixup_free_spve_igp(void** param, int param_no); int fixup_spve_pvar(void** param, int param_no); int fixup_free_spve_pvar(void** param, int param_no); +int fixup_spve_spve_igp(void** param, int param_no); +int fixup_free_spve_spve_igp(void** param, int param_no); + int fixup_none_spve(void** param, int param_no); int fixup_free_none_spve(void** param, int param_no);

1 0

git:master:458d40eb: presence: dmq - init jdoc var earlier for proper cleanup in case of errors
by Daniel-Constantin Mierla 19 Jun '18

19 Jun '18

Module: kamailio Branch: master Commit: 458d40eb9cb202a18724062ffd0ea455e4d75d6d URL: https://github.com/kamailio/kamailio/commit/458d40eb9cb202a18724062ffd0ea45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-19T08:22:58+02:00 presence: dmq - init jdoc var earlier for proper cleanup in case of errors --- Modified: src/modules/presence/presence_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/458d40eb9cb202a18724062ffd0ea45… Patch: https://github.com/kamailio/kamailio/commit/458d40eb9cb202a18724062ffd0ea45… --- diff --git a/src/modules/presence/presence_dmq.c b/src/modules/presence/presence_dmq.c index 4cba168a55..9ce259eeaa 100644 --- a/src/modules/presence/presence_dmq.c +++ b/src/modules/presence/presence_dmq.c @@ -236,6 +236,7 @@ int pres_dmq_handle_msg( } *pres_dmq_recv = 1; + srjson_InitDoc(&jdoc, NULL); if(!msg->content_length) { LM_ERR("no content length header found\n"); @@ -258,7 +259,6 @@ int pres_dmq_handle_msg( /* parse body */ LM_DBG("body: %.*s\n", body.len, body.s); - srjson_InitDoc(&jdoc, NULL); jdoc.buf = body; if(jdoc.root == NULL) {

1 0

git:master:a19a18e3: json: removed obsoleted libsjon macro is_error()
by Daniel-Constantin Mierla 19 Jun '18

19 Jun '18

Module: kamailio Branch: master Commit: a19a18e376a054460eb194d7d5c37687af06d4a5 URL: https://github.com/kamailio/kamailio/commit/a19a18e376a054460eb194d7d5c3768… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-19T08:18:36+02:00 json: removed obsoleted libsjon macro is_error() --- Modified: src/modules/json/json_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/a19a18e376a054460eb194d7d5c3768… Patch: https://github.com/kamailio/kamailio/commit/a19a18e376a054460eb194d7d5c3768… --- diff --git a/src/modules/json/json_funcs.c b/src/modules/json/json_funcs.c index 360bfc172c..b99d6f7d9c 100644 --- a/src/modules/json/json_funcs.c +++ b/src/modules/json/json_funcs.c @@ -173,7 +173,7 @@ struct json_object *tr_json_get_field_object(str *json, str *field) struct json_object *j = json_tokener_parse(dup); pkg_free(dup); - if(is_error(j)) { + if(j==NULL) { LM_ERR("empty or invalid JSON\n"); return NULL; }

1 0

git:master:4a1293f3: json: free pv in case of failure inside json_tr_eval()
by Daniel-Constantin Mierla 19 Jun '18

19 Jun '18

Module: kamailio Branch: master Commit: 4a1293f38b75bcf63fbd2a7ee4410d3b10d1f6a7 URL: https://github.com/kamailio/kamailio/commit/4a1293f38b75bcf63fbd2a7ee4410d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-19T08:11:44+02:00 json: free pv in case of failure inside json_tr_eval() --- Modified: src/modules/json/json_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/4a1293f38b75bcf63fbd2a7ee4410d3… Patch: https://github.com/kamailio/kamailio/commit/4a1293f38b75bcf63fbd2a7ee4410d3… --- diff --git a/src/modules/json/json_trans.c b/src/modules/json/json_trans.c index 4287d692a3..e200ef7084 100644 --- a/src/modules/json/json_trans.c +++ b/src/modules/json/json_trans.c @@ -282,11 +282,13 @@ int json_tr_eval( LM_ERR("cannot get spve_value from TR_PARAM_STRING : " "%.*s\n", tp->v.s.len, tp->v.s.s); + pkg_free(pv); return -1; } if(fixup_get_svalue(msg, (gparam_p)v1, &v2) != 0) { LM_ERR("cannot get value from TR_PARAM_STRING\n"); fixup_free_spve_null(&v1, 1); + pkg_free(pv); return -1; } fixup_free_spve_null(&v1, 1);

1 0

[kamailio/kamailio] [dialog] stats incremented twice (#1566)
by Julien Chavanton 18 Jun '18

18 Jun '18

#### 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description As you can see looking at the modifications stats counters where increment twice. Hi @oej, If you find a few minutes you could review this MR. Not sure if you remember, this was introduced in a bug fix (see below) I kept some of your modifications, they seem more strait forward anyway. ``` commit b0cd09d2b451005a736396e6f38eac139ec31301 Author: Olle E. Johansson <oej(a)edvina.net> Date: Wed May 11 21:59:44 2016 +0200 dialog Make sure statistics are updated when initializing from database Issue #424 ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1566 -- Commit Summary -- * [dialog] stats incremented twice -- File Changes -- M src/modules/dialog/dialog.c (7) M src/modules/dialog/dlg_db_handler.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1566.patch https://github.com/kamailio/kamailio/pull/1566.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/1566

2 5

git:master:9317175c: dialog: dlg stats incremented twice
by Henning Westerholt 18 Jun '18

18 Jun '18

Module: kamailio Branch: master Commit: 9317175c71c2c4a613e3b25a401f27c6316fcb34 URL: https://github.com/kamailio/kamailio/commit/9317175c71c2c4a613e3b25a401f27c… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2018-06-18T23:17:25+02:00 dialog: dlg stats incremented twice --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/9317175c71c2c4a613e3b25a401f27c… Patch: https://github.com/kamailio/kamailio/commit/9317175c71c2c4a613e3b25a401f27c… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 9ae2ce8090..83883a4fac 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -130,8 +130,6 @@ int dlg_h_id_step = 1; /* statistic variables */ int dlg_enable_stats = 1; -int active_dlgs_cnt = 0; -int early_dlgs_cnt = 0; int detect_spirals = 1; int dlg_send_bye = 0; int dlg_timeout_noreset = 0; @@ -768,11 +766,6 @@ static int child_init(int rank) } } - if (rank==1) { - if_update_stat(dlg_enable_stats, active_dlgs, active_dlgs_cnt); - if_update_stat(dlg_enable_stats, early_dlgs, early_dlgs_cnt); - } - if ( ((dlg_db_mode==DB_MODE_REALTIME || dlg_db_mode==DB_MODE_DELAYED) && (rank>0 || rank==PROC_TIMER || rank==PROC_RPC)) || (dlg_db_mode==DB_MODE_SHUTDOWN && (rank==PROC_MAIN)) ) { diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index eb1d97d7b7..d759140018 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -80,8 +80,6 @@ static db1_con_t* dialog_db_handle = 0; /* database connection handle */ static db_func_t dialog_dbf; extern int dlg_enable_stats; -extern int active_dlgs_cnt; -extern int early_dlgs_cnt; extern int dlg_h_id_start; extern int dlg_h_id_step; @@ -414,10 +412,8 @@ int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows, dlg->state = VAL_INT(values+8); if (dlg->state==DLG_STATE_CONFIRMED_NA || dlg->state==DLG_STATE_CONFIRMED) { - active_dlgs_cnt++; if_update_stat(dlg_enable_stats, active_dlgs, 1); } else if (dlg->state==DLG_STATE_EARLY) { - early_dlgs_cnt++; if_update_stat(dlg_enable_stats, early_dlgs, 1); }

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
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