sr-dev April 2018

sr-dev@lists.kamailio.org

19 participants
256 discussions

git:master:389c409c: jsonrpcs: set pretty_format param to 1 by default

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 389c409cb51fd8cd8036aca081530720e61c42af URL: https://github.com/kamailio/kamailio/commit/389c409cb51fd8cd8036aca08153072… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-18T08:28:20+02:00 jsonrpcs: set pretty_format param to 1 by default - kamctl relies on it for some response processing --- Modified: src/modules/jsonrpcs/doc/jsonrpcs_admin.xml Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/389c409cb51fd8cd8036aca08153072… Patch: https://github.com/kamailio/kamailio/commit/389c409cb51fd8cd8036aca08153072… --- diff --git a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml index 4b64db557e..d6d7d7c753 100644 --- a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml +++ b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml @@ -86,18 +86,19 @@ <section id="jsonrpcs.p.pretty_format"> <title><varname>pretty_format</varname> (int)</title> <para> - Pretty format for JSON-RPC response document. + Pretty format for JSON-RPC response document if set to 1. To + disable, set to 0. </para> <para> <emphasis> - Default value is '0'. + Default value is '1' (on). </emphasis> </para> <example> <title>Set <varname>pretty_format</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("jsonrpcs", "pretty_format", 1) +modparam("jsonrpcs", "pretty_format", 0) ... </programlisting> </example> diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index 98d66cc5cb..7ef1e39d34 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -76,7 +76,7 @@ static str JSONRPC_CONTENT_TYPE_HTML = str_init("application/json"); /*!< 0 - all available; 1 - http; 2 - fifo; 4 - datagram */ static int jsonrpc_transport = 6; /* fifo + datagram */ -static int jsonrpc_pretty_format = 0; +static int jsonrpc_pretty_format = 1; static int jsonrpc_register_rpc(void);

6 years, 7 months

git:master:c5764f00: drouting: docs - added several section ids

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c5764f003c8f425c881cda7dc73ee5eab0e71825 URL: https://github.com/kamailio/kamailio/commit/c5764f003c8f425c881cda7dc73ee5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-17T08:58:03+02:00 drouting: docs - added several section ids --- Modified: src/modules/drouting/doc/drouting_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c5764f003c8f425c881cda7dc73ee5e… Patch: https://github.com/kamailio/kamailio/commit/c5764f003c8f425c881cda7dc73ee5e…

6 years, 7 months

git:master:4bab8e55: counters: docs - format section ids

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4bab8e5587f59132afb21e29c5a08e71df3c6f8b URL: https://github.com/kamailio/kamailio/commit/4bab8e5587f59132afb21e29c5a08e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-16T19:30:33+02:00 counters: docs - format section ids --- Modified: src/modules/counters/doc/counters_functions.xml Modified: src/modules/counters/doc/counters_params.xml Modified: src/modules/counters/doc/counters_rpc.xml --- Diff: https://github.com/kamailio/kamailio/commit/4bab8e5587f59132afb21e29c5a08e7… Patch: https://github.com/kamailio/kamailio/commit/4bab8e5587f59132afb21e29c5a08e7… --- diff --git a/src/modules/counters/doc/counters_functions.xml b/src/modules/counters/doc/counters_functions.xml index 9e6eae57fe..9a8b458092 100644 --- a/src/modules/counters/doc/counters_functions.xml +++ b/src/modules/counters/doc/counters_functions.xml @@ -15,7 +15,7 @@ <title>Functions</title> - <section id="cnt_inc"> + <section id="counters.f.cnt_inc"> <title> <function>cnt_inc([group.]name)</function> </title> @@ -43,7 +43,7 @@ route { </example> </section> - <section id="cnt_add"> + <section id="counters.f.cnt_add"> <title> <function>cnt_add([group.]name, number)</function> </title> @@ -69,7 +69,7 @@ route { </example> </section> - <section id="cnt_reset"> + <section id="counters.f.cnt_reset"> <title> <function>cnt_reset([group.]name)</function> </title> diff --git a/src/modules/counters/doc/counters_params.xml b/src/modules/counters/doc/counters_params.xml index f23f9484c4..b31d508b34 100644 --- a/src/modules/counters/doc/counters_params.xml +++ b/src/modules/counters/doc/counters_params.xml @@ -12,7 +12,7 @@ </sectioninfo> <title>Parameters</title> - <section id="scrip_counter"> + <section id="counters.p.scrip_counter"> <title><varname>script_counter</varname></title> <para> Define a new counter that can be used from the script. @@ -40,7 +40,7 @@ modparam("counters", "script_counter", "test.x:another example") # test.x </example> </section> - <section id="scrip_cnt_grp_name"> + <section id="counters.p.scrip_cnt_grp_name"> <title><varname>script_cnt_grp_name</varname></title> <para> Group name that will be used for the counters defined diff --git a/src/modules/counters/doc/counters_rpc.xml b/src/modules/counters/doc/counters_rpc.xml index 6b8e237aeb..82d07e9ddf 100644 --- a/src/modules/counters/doc/counters_rpc.xml +++ b/src/modules/counters/doc/counters_rpc.xml @@ -12,7 +12,7 @@ </sectioninfo> <title>RPC Commands</title> - <section id="cnt.r.get"> + <section id="counters.rpc.cnt.get"> <title> <function>cnt.get</function></title> <para> Get the value of the counter identified by group.counter_name. @@ -28,7 +28,7 @@ </example> </section> - <section id="cnt.r.reset"> + <section id="counters.rpc.cnt.reset"> <title> <function>cnt.reset</function></title> <para> Resets the counter identified by group.counter_name. @@ -44,7 +44,7 @@ </example> </section> - <section id="cnt.r.list_groups"> + <section id="counters.rpc.cnt.list_groups"> <title> <function>cnt.list_groups</function></title> <para> Lists all the declared counter groups. @@ -60,14 +60,14 @@ </example> </section> - <section id="cnt.r.grps_list"> + <section id="counters.rpc.cnt.grps_list"> <title> <function>cnt.grps_list</function></title> <para> Alias to cnt.list_groups. </para> </section> - <section id="cnt.r.list_vars"> + <section id="counters.rpc.cnt.list_vars"> <title> <function>cnt.list_vars</function></title> <para> Lists all the names of all the counters belonging to the @@ -84,14 +84,14 @@ </example> </section> - <section id="cnt.r.var_list"> + <section id="counters.rpc.cnt.var_list"> <title> <function>cnt.var_list</function></title> <para> Alias to cnt.list_vars. </para> </section> - <section id="cnt.r.get_vars"> + <section id="counters.rpc.cnt.get_vars"> <title> <function>cnt.get_vars</function></title> <para> Lists all the counter names and their values in the @@ -108,14 +108,14 @@ </example> </section> - <section id="cnt.r.grp_get_all"> + <section id="counters.rpc.cnt.grp_get_all"> <title> <function>cnt.grp_get_all</function></title> <para> Alias to cnt.get_vars. </para> </section> - <section id="cnt.r.help"> + <section id="counters.rpc.cnt.help"> <title> <function>cnt.help</function></title> <para> Displays the counter description.

6 years, 7 months

[kamailio/kamailio] dialog: typo fix for DLG_IFLAG_DMQ_SYNC flag value (#1502)

by Dmitri Savolainen

#### 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 typo fix for DLG_IFLAG_DMQ_SYNC flag value You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1502 -- Commit Summary -- * dialog: typo fix for DLG_IFLAG_DMQ_SYNC flag value -- File Changes -- M src/modules/dialog/dlg_hash.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1502.patch https://github.com/kamailio/kamailio/pull/1502.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/1502

6 years, 7 months

[kamailio/kamailio] dialog: restore keep-alive after restart (#1501)

by Dmitri Savolainen

#### 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 I've noticed kamailio stop send OPTIONS ("ka-dst"/"ka-src" params) after restart. This should fix You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1501 -- Commit Summary -- * dialog: restore keep-alive after restart -- File Changes -- M src/modules/dialog/dlg_db_handler.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1501.patch https://github.com/kamailio/kamailio/pull/1501.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/1501

6 years, 7 months

git:master:0dc59586: Merge pull request #1502 from snen/dialog_fix_dmq_flag_value

by GitHub

Module: kamailio Branch: master Commit: 0dc595862baa62535efc7519330514aa30b552b1 URL: https://github.com/kamailio/kamailio/commit/0dc595862baa62535efc7519330514a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-04-16T19:19:22+02:00 Merge pull request #1502 from snen/dialog_fix_dmq_flag_value dialog: typo fix for DLG_IFLAG_DMQ_SYNC flag value --- Modified: src/modules/dialog/dlg_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/0dc595862baa62535efc7519330514a… Patch: https://github.com/kamailio/kamailio/commit/0dc595862baa62535efc7519330514a… --- diff --git a/src/modules/dialog/dlg_hash.h b/src/modules/dialog/dlg_hash.h index 91eb129d67..85fdc6cb83 100644 --- a/src/modules/dialog/dlg_hash.h +++ b/src/modules/dialog/dlg_hash.h @@ -78,7 +78,7 @@ #define DLG_IFLAG_TIMER_NORESET (1<<3) /*!< don't reset dialog timers on in-dialog messages reception */ #define DLG_IFLAG_CSEQ_DIFF (1<<4) /*!< CSeq changed in dialog */ #define DLG_IFLAG_PRACK (1<<5) /*!< PRACK was routed during initial state */ -#define DLG_IFLAG_DMQ_SYNC (1<<5) /*!< sync this dialog via dmq DMQ*/ +#define DLG_IFLAG_DMQ_SYNC (1<<6) /*!< sync this dialog via dmq DMQ*/ #define DLG_CALLER_LEG 0 /*!< attribute that belongs to a caller leg */ #define DLG_CALLEE_LEG 1 /*!< attribute that belongs to a callee leg */

6 years, 7 months

git:master:ad427fc1: dialog: typo fix for DLG_IFLAG_DMQ_SYNC flag value

by Dmitri Savolainen

Module: kamailio Branch: master Commit: ad427fc19c56110f66df86b7b49e23c00313610a URL: https://github.com/kamailio/kamailio/commit/ad427fc19c56110f66df86b7b49e23c… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Dmitri Savolainen <savolainen(a)erinaco.ru> Date: 2018-04-16T19:43:50+03:00 dialog: typo fix for DLG_IFLAG_DMQ_SYNC flag value --- Modified: src/modules/dialog/dlg_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/ad427fc19c56110f66df86b7b49e23c… Patch: https://github.com/kamailio/kamailio/commit/ad427fc19c56110f66df86b7b49e23c… --- diff --git a/src/modules/dialog/dlg_hash.h b/src/modules/dialog/dlg_hash.h index 91eb129d67..85fdc6cb83 100644 --- a/src/modules/dialog/dlg_hash.h +++ b/src/modules/dialog/dlg_hash.h @@ -78,7 +78,7 @@ #define DLG_IFLAG_TIMER_NORESET (1<<3) /*!< don't reset dialog timers on in-dialog messages reception */ #define DLG_IFLAG_CSEQ_DIFF (1<<4) /*!< CSeq changed in dialog */ #define DLG_IFLAG_PRACK (1<<5) /*!< PRACK was routed during initial state */ -#define DLG_IFLAG_DMQ_SYNC (1<<5) /*!< sync this dialog via dmq DMQ*/ +#define DLG_IFLAG_DMQ_SYNC (1<<6) /*!< sync this dialog via dmq DMQ*/ #define DLG_CALLER_LEG 0 /*!< attribute that belongs to a caller leg */ #define DLG_CALLEE_LEG 1 /*!< attribute that belongs to a callee leg */

6 years, 7 months

git:master:2fcfc666: Merge pull request #1501 from snen/fix_dialog_options_restart

by GitHub

Module: kamailio Branch: master Commit: 2fcfc6666621cd8108de251eb5cfba48f365d2c6 URL: https://github.com/kamailio/kamailio/commit/2fcfc6666621cd8108de251eb5cfba4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-04-16T19:18:48+02:00 Merge pull request #1501 from snen/fix_dialog_options_restart dialog: restore keep-alive after restart --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/2fcfc6666621cd8108de251eb5cfba4… Patch: https://github.com/kamailio/kamailio/commit/2fcfc6666621cd8108de251eb5cfba4… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 2a3e4301ad..eb1d97d7b7 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -464,6 +464,8 @@ int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows, srjson_DestroyDoc(&jdoc); } dlg->iflags = (unsigned int)VAL_INT(values+22); + if (dlg->state==DLG_STATE_CONFIRMED) + dlg_ka_add(dlg); if (!dlg->bind_addr[DLG_CALLER_LEG] || !dlg->bind_addr[DLG_CALLEE_LEG]) { /* non-local socket, probably not our dialog */

6 years, 7 months

git:master:a821ff61: dialog: restore keep-alive after restart

by Dmitri Savolainen

Module: kamailio Branch: master Commit: a821ff61029a4e8a9f220d60f95bd7b5a545f9b4 URL: https://github.com/kamailio/kamailio/commit/a821ff61029a4e8a9f220d60f95bd7b… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Dmitri Savolainen <savolainen(a)erinaco.ru> Date: 2018-04-16T19:32:05+03:00 dialog: restore keep-alive after restart --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/a821ff61029a4e8a9f220d60f95bd7b… Patch: https://github.com/kamailio/kamailio/commit/a821ff61029a4e8a9f220d60f95bd7b… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 2a3e4301ad..eb1d97d7b7 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -464,6 +464,8 @@ int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows, srjson_DestroyDoc(&jdoc); } dlg->iflags = (unsigned int)VAL_INT(values+22); + if (dlg->state==DLG_STATE_CONFIRMED) + dlg_ka_add(dlg); if (!dlg->bind_addr[DLG_CALLER_LEG] || !dlg->bind_addr[DLG_CALLEE_LEG]) { /* non-local socket, probably not our dialog */

6 years, 7 months

git:master:1d4f63c1: modules: readme files regenerated - app_lua ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 1d4f63c147e99dfce0a9ef4ace6089c16f3fb35f URL: https://github.com/kamailio/kamailio/commit/1d4f63c147e99dfce0a9ef4ace6089c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-04-15T13:16:56+02:00 modules: readme files regenerated - app_lua ... [skip ci] --- Modified: src/modules/app_lua/README --- Diff: https://github.com/kamailio/kamailio/commit/1d4f63c147e99dfce0a9ef4ace6089c… Patch: https://github.com/kamailio/kamailio/commit/1d4f63c147e99dfce0a9ef4ace6089c… --- diff --git a/src/modules/app_lua/README b/src/modules/app_lua/README index c8bba9fdf0..cac548c162 100644 --- a/src/modules/app_lua/README +++ b/src/modules/app_lua/README @@ -199,13 +199,14 @@ modparam("app_lua", "register", "sl") 3.3. reload (boolean) If reload is 1 enables the ability to reload the scripts using the RPC - app_lua.reload command. + app_lua.reload command. To disable reload feature, set this parameter + to 0. - Default value is “0 (off)”. + Default value is “1 (on)”. Example 1.4. Set reload parameter ... -modparam("app_lua", "reload", 1) +modparam("app_lua", "reload", 0) ... 4. Functions

6 years, 7 months

← Newer
1
...
11
12
13
14
15
16
17
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2018