sr-dev January 2019

sr-dev@lists.kamailio.org

27 participants
301 discussions

git:5.2:458abbe5: dispatcher: update for module docs (#1804)
by Daniel-Constantin Mierla 14 Jan '19

14 Jan '19

Module: kamailio Branch: 5.2 Commit: 458abbe5b5d8fbcb814612af3cac90aa784db227 URL: https://github.com/kamailio/kamailio/commit/458abbe5b5d8fbcb814612af3cac90a… Author: Jurijs I <jurijs.ivolga(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-14T12:29:03+01:00 dispatcher: update for module docs (#1804) - update for module docs (#1804) - Some minor comments for dispatcher module were added - Additionally a description were added, what the several states means when dispatcher list are executed (cherry picked from commit 14a87383fbae102b430ed6cfdba2559f1768cdd0) --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/458abbe5b5d8fbcb814612af3cac90a… Patch: https://github.com/kamailio/kamailio/commit/458abbe5b5d8fbcb814612af3cac90a… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 3b40c04622..c0a55b27ad 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -631,12 +631,16 @@ modparam("dispatcher", "force_dst", 1) <itemizedlist> <listitem> <para>Value 0: If set to 0, only the gateways with state PROBING are tested. - After a gateway is probed, the PROBING state is cleared in this mode.</para> + After a gateway is probed, the PROBING state is cleared in this mode. + This means that no probing will be executed at all only if flag in config file is set to 8/PROBING + (please check destination list file syntaxis for more details), it will probe only one time at startup or + after dispatcher reload.</para> </listitem> <listitem> <para>Value 1: If set to 1, all gateways are tested. If set to 1 and there is a failure of keepalive to an active gateway, then it is - set to TRYING state.</para> + set to TRYING state. This means that probing will be executed all the time, + but you can skip some servers with flag 4 in destination list file, for example.</para> </listitem> <listitem> <para>Value 2: if set to 2, only gateways in inactive state with @@ -1701,8 +1705,21 @@ onreply_route { </para> <programlisting format="linespecific"> &sercmd; dispatcher.list - </programlisting> - </section> + ... +DEST: { + URI: sip:192.168.0.1:5060 + FLAGS: AP + PRIORITY: 12 +} + ... +</programlisting> +<para>FLAGS consist out of 2 letters. First letter describe status of destination: A-active, + I – inactive, T – trying, D – disabled. Second letter might be P or X. P is for probing, + so AP means destination is active and it is tested by SIP options continuously. + X means that there are no probing or sip pinging. So AX means that destination is assumed as active + and it is not tested by SIP options. DX respectively is disabled destination what is not tested and etc. +</para> + </section> <section id="dispatcher.r.reload"> <title> <function moreinfo="none">dispatcher.reload</function>

1 0

git:5.2:23a5c07e: tsilo: add check for empty aor
by Daniel-Constantin Mierla 14 Jan '19

14 Jan '19

Module: kamailio Branch: 5.2 Commit: 23a5c07e924a2feb5f09b727f4ad0faf6c5af349 URL: https://github.com/kamailio/kamailio/commit/23a5c07e924a2feb5f09b727f4ad0fa… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-14T12:28:25+01:00 tsilo: add check for empty aor Fix: #1775 (cherry picked from commit 5a5d742eb459249995114eb6a3642f99c6770496) --- Modified: src/modules/tsilo/ts_store.c --- Diff: https://github.com/kamailio/kamailio/commit/23a5c07e924a2feb5f09b727f4ad0fa… Patch: https://github.com/kamailio/kamailio/commit/23a5c07e924a2feb5f09b727f4ad0fa… --- diff --git a/src/modules/tsilo/ts_store.c b/src/modules/tsilo/ts_store.c index a33924fa50..6d1c5a5f72 100644 --- a/src/modules/tsilo/ts_store.c +++ b/src/modules/tsilo/ts_store.c @@ -71,6 +71,11 @@ int ts_store(struct sip_msg* msg, str *puri) { else aor = ruri.user; + if(aor.s==NULL) { + LM_ERR("malformed aor from uri[%.*s]\n", suri.len, suri.s); + return -1; + } + t = _tmb.t_gett(); if (!t || t==T_UNDEFINED) { LM_ERR("no transaction defined for %.*s\n", aor.len, aor.s);

1 0

git:5.2:563f1d6a: dialog: do not require dlg_flag parameter to be set
by Daniel-Constantin Mierla 14 Jan '19

14 Jan '19

Module: kamailio Branch: 5.2 Commit: 563f1d6af3123485ed25cc58bb3badd68e7793a4 URL: https://github.com/kamailio/kamailio/commit/563f1d6af3123485ed25cc58bb3badd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-14T12:27:56+01:00 dialog: do not require dlg_flag parameter to be set - using dlg_manage() should be enough for tracking dialogs (cherry picked from commit 404f403786478a917637186446bb285e8e32cc59) --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/563f1d6af3123485ed25cc58bb3badd… Patch: https://github.com/kamailio/kamailio/commit/563f1d6af3123485ed25cc58bb3badd… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index bf2ba96488..6665398742 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -515,8 +515,8 @@ static int mod_init(void) return -1; /* param checkings */ - if (dlg_flag>MAX_FLAG) { - LM_ERR("invalid dlg flag %d!!\n",dlg_flag); + if (dlg_flag!=-1 && dlg_flag>MAX_FLAG) { + LM_ERR("invalid dlg flag %d!!\n", dlg_flag); return -1; } diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 96406bde35..c80ca7d59f 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -761,8 +761,10 @@ void dlg_onreq(struct cell* t, int type, struct tmcb_params *param) } } if (dlg==NULL) { - if((req->flags&dlg_flag_mask)!=dlg_flag_mask) + if((dlg_flag_mask==0) || (req->flags&dlg_flag_mask)!=dlg_flag_mask) { + LM_DBG("flag not set for creating a new dialog\n"); return; + } LM_DBG("dialog creation on config flag\n"); dlg_new_dialog(req, t, 1); dlg = dlg_get_ctx_dialog();

1 0

git:5.2:3dd154fa: dialog: docs - more info about using the flag and dlg_manage()
by Daniel-Constantin Mierla 14 Jan '19

14 Jan '19

Module: kamailio Branch: 5.2 Commit: 3dd154faeead29f54145843d14367c5b28a4fb7b URL: https://github.com/kamailio/kamailio/commit/3dd154faeead29f54145843d14367c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-14T12:27:35+01:00 dialog: docs - more info about using the flag and dlg_manage() (cherry picked from commit e4dfe3587943d69d556b15df3492cf38c3b21a5f) --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3dd154faeead29f54145843d14367c5… Patch: https://github.com/kamailio/kamailio/commit/3dd154faeead29f54145843d14367c5… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 2240a72c85..901c2b79c0 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -45,9 +45,10 @@ <section> <title>How it works</title> <para> - To create the dialog associated with an initial request, the flag - <quote>dlg_flag</quote> (<xref linkend="dialog.p.flag"/>) must be set before - creating the corresponding transaction. + To create the dialog associated with an initial INVITE request, execute + the function <quote>dlg_manage()</quote> or set the flag specified by + parameter <quote>dlg_flag</quote> (<xref linkend="dialog.p.flag"/>) + before creating the corresponding transaction. </para> <para> The dialog is automatically destroyed when a <quote>BYE</quote> is @@ -256,6 +257,12 @@ modparam("dialog", "rr_param", "xyz") current request (this make sense only for initial requests). </para> <para> + Note: it is not needed to set this parameter and its corresponding flag + for initial request in case the <quote>dlg_manage()</quote> function + is used. In other words, using <quote>dlg_manage()</quote> alone is + enough. + </para> + <para> <emphasis> Default value is <quote>none</quote>. </emphasis>

1 0

git:master:0a5cba42: kamctl: added 'psa' command
by Daniel-Constantin Mierla 14 Jan '19

14 Jan '19

Module: kamailio Branch: master Commit: 0a5cba422967f2e861ce209942a42e09719f4fcb URL: https://github.com/kamailio/kamailio/commit/0a5cba422967f2e861ce209942a42e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-14T08:47:41+01:00 kamctl: added 'psa' command - print more attributes for running processes (extended 'ps') --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.ctlbase --- Diff: https://github.com/kamailio/kamailio/commit/0a5cba422967f2e861ce209942a42e0… Patch: https://github.com/kamailio/kamailio/commit/0a5cba422967f2e861ce209942a42e0… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 4dd9bc7fed..b115f5a998 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -3010,6 +3010,11 @@ case $1 in ctl_cmd_run core.psx ;; + psa) + require_ctlengine + ctl_cmd_run core.psa + ;; + uptime) require_ctlengine ctl_cmd_run core.uptime diff --git a/utils/kamctl/kamctl.ctlbase b/utils/kamctl/kamctl.ctlbase index a668e22d18..1fc64091af 100644 --- a/utils/kamctl/kamctl.ctlbase +++ b/utils/kamctl/kamctl.ctlbase @@ -81,6 +81,12 @@ usage_ctlcommon() { echo cat <<EOF ps ................................. details about running processes +EOF + echo + mecho " -- command 'psa' - print all attributes about running processes" + echo +cat <<EOF + psa ................................ all attributes about running processes EOF echo mecho " -- command 'uptime' - print uptime details"

1 0

Regenerate module docs on github
by Julien Chavanton 13 Jan '19

13 Jan '19

Hi, not sure how to regenerate modules doc on the repo. Localy I can use make but it seems people are using a more standard procedure ? Acc_json is not updated with some improvement in the examples.

2 1

git:master:ee799504: modules: readme files regenerated - acc_json ... [skip ci]
by Kamailio Dev 13 Jan '19

13 Jan '19

Module: kamailio Branch: master Commit: ee799504ad5f7e272a9e61f1952099ca1183d461 URL: https://github.com/kamailio/kamailio/commit/ee799504ad5f7e272a9e61f1952099c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-13T16:46:28+01:00 modules: readme files regenerated - acc_json ... [skip ci] --- Modified: src/modules/acc_json/README --- Diff: https://github.com/kamailio/kamailio/commit/ee799504ad5f7e272a9e61f1952099c… Patch: https://github.com/kamailio/kamailio/commit/ee799504ad5f7e272a9e61f1952099c…

1 0

git:master:fb23d67b: acc_json: replaced angle brackets with xml tokens
by Daniel-Constantin Mierla 13 Jan '19

13 Jan '19

Module: kamailio Branch: master Commit: fb23d67b396bafb51f9c971e2546df0faff54262 URL: https://github.com/kamailio/kamailio/commit/fb23d67b396bafb51f9c971e2546df0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-01-13T16:45:23+01:00 acc_json: replaced angle brackets with xml tokens --- Modified: src/modules/acc_json/doc/acc_json_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fb23d67b396bafb51f9c971e2546df0… Patch: https://github.com/kamailio/kamailio/commit/fb23d67b396bafb51f9c971e2546df0… --- diff --git a/src/modules/acc_json/doc/acc_json_admin.xml b/src/modules/acc_json/doc/acc_json_admin.xml index ea1fbc446c..2dcfbcd0f2 100644 --- a/src/modules/acc_json/doc/acc_json_admin.xml +++ b/src/modules/acc_json/doc/acc_json_admin.xml @@ -216,16 +216,16 @@ route[RUN_ACC_PUBLISH] { $var(count) = $var(count) + 1; xinfo("[RUN_ACC_PUBLISH][$var(q_size)][$var(count)][$mqk(acc_events)][$mqv(acc_events)]\n"); $var(res) = http_connect_raw("nsqd", "", "application/json", $mqv(acc_events), "$var(nsq_res)"); - if ($var(res) < 0) { + if ($var(res) < 0) { xerr("[RUN_ACC_PUBLISH][$var(res)] http_connect_raw: timeout or error !\n"); mq_add("acc_events", "acc_key", "$mqv(acc_events)"); - } else if ($var(res) < 200 || $var(res) > 299) { + } else if ($var(res) < 200 || $var(res) > 299) { xerr("[RUN_ACC_PUBLISH][$var(res)] http unexpected response code !\n"); mq_add("acc_dead_letter_queue", "acc_key", "$mqv(acc_events)"); return; } } - if ($var(count) > 0 ) { + if ($var(count) > 0 ) { xinfo("[RUN_CDR_PUBLISH]done count[$var(count)]\n"); } }

1 0

Re: [sr-dev] [kamailio/kamailio] presence: do not include presence.h in other header files (eb1bf9a)
by Cui Gang 13 Jan '19

13 Jan '19

There is a compile ERROR: ``` presence_dmq.c:97:5: error: use of undeclared identifier 'pres_sruid' if(pres_sruid.pid == 0) { ^ ``` -- 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/commit/eb1bf9a69abad3d237c136750fe8cac…

1 0

git:master:7412f771: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 13 Jan '19

13 Jan '19

Module: kamailio Branch: master Commit: 7412f7714f5a6b021c14d0eff4f5ed5ed890b8b6 URL: https://github.com/kamailio/kamailio/commit/7412f7714f5a6b021c14d0eff4f5ed5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-01-13T13:16:38+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README Modified: src/modules/janssonrpcc/README --- Diff: https://github.com/kamailio/kamailio/commit/7412f7714f5a6b021c14d0eff4f5ed5… Patch: https://github.com/kamailio/kamailio/commit/7412f7714f5a6b021c14d0eff4f5ed5…

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2019