sr-dev July 2017

sr-dev@lists.kamailio.org

23 participants
411 discussions

git:master:f3c68a50: core: cfg - removed unreachable code
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: f3c68a5013b5a33937dbf735453da29df75ae09e URL: https://github.com/kamailio/kamailio/commit/f3c68a5013b5a33937dbf735453da29… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-27T09:03:26+02:00 core: cfg - removed unreachable code --- Modified: src/core/cfg/cfg_select.c Modified: src/core/cfg/cfg_struct.c --- Diff: https://github.com/kamailio/kamailio/commit/f3c68a5013b5a33937dbf735453da29… Patch: https://github.com/kamailio/kamailio/commit/f3c68a5013b5a33937dbf735453da29… --- diff --git a/src/core/cfg/cfg_select.c b/src/core/cfg/cfg_select.c index ae8b0c8852..19b815332d 100644 --- a/src/core/cfg/cfg_select.c +++ b/src/core/cfg/cfg_select.c @@ -205,10 +205,6 @@ int select_cfg_var(str *res, select_t *s, struct sip_msg *msg) /* use the module's handle to access the variable, so the variables are read from the local config */ p = *(group->handle) + var->offset; - if (p == NULL) - return -1; /* The group is not yet ready. - * (Trying to read the value from the - * main process that has no local configuration) */ switch (CFG_VAR_TYPE(var)) { case CFG_VAR_INT: @@ -308,10 +304,6 @@ unsigned int read_cfg_var(struct cfg_read_handle *read_handle, void **val) /* use the module's handle to access the variable, so the variables are read from the local config */ p = *(group->handle) + var->offset; - if (p == NULL) - return 0; /* The group is not yet ready. - * (Trying to read the value from the - * main process that has no local configuration) */ switch (CFG_VAR_TYPE(var)) { case CFG_VAR_INT: diff --git a/src/core/cfg/cfg_struct.c b/src/core/cfg/cfg_struct.c index 8bfe4295a3..350d49c216 100644 --- a/src/core/cfg/cfg_struct.c +++ b/src/core/cfg/cfg_struct.c @@ -1250,8 +1250,7 @@ int cfg_select_next(cfg_group_t *group) return -1; } - if (!(meta = CFG_GROUP_META(cfg_local, group))) - return -1; + meta = CFG_GROUP_META(cfg_local, group); if (!(old_ginst = CFG_HANDLE_TO_GINST(*(group->handle)) /* the active group instance */)) { LOG(L_ERR, "ERROR: cfg_select_next(): No group instance is set currently. Forgot to call cfg_select_first()?\n");

1 0

git:master:2dc6e470: auth_diameter: removed svn id, history
by Daniel-Constantin Mierla 27 Jul '17

27 Jul '17

Module: kamailio Branch: master Commit: 2dc6e4700012336ac15dc9b6190f6750648854aa URL: https://github.com/kamailio/kamailio/commit/2dc6e4700012336ac15dc9b6190f675… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-26T22:32:39+02:00 auth_diameter: removed svn id, history --- Modified: src/modules/auth_diameter/auth_diameter.c Modified: src/modules/auth_diameter/auth_diameter.h Modified: src/modules/auth_diameter/authorize.c Modified: src/modules/auth_diameter/authorize.h Modified: src/modules/auth_diameter/avp.c Modified: src/modules/auth_diameter/defs.h Modified: src/modules/auth_diameter/diameter_msg.h Modified: src/modules/auth_diameter/message.c Modified: src/modules/auth_diameter/tcp_comm.c Modified: src/modules/auth_diameter/tcp_comm.h Modified: src/modules/auth_diameter/user_in.c --- Diff: https://github.com/kamailio/kamailio/commit/2dc6e4700012336ac15dc9b6190f675… Patch: https://github.com/kamailio/kamailio/commit/2dc6e4700012336ac15dc9b6190f675…

1 0

git:master:3fad937b: lib/ims: proper check of the pointer returned by pkg_malloc; indentation fixes
by Daniel-Constantin Mierla 26 Jul '17

26 Jul '17

Module: kamailio Branch: master Commit: 3fad937b03ee7ba9d229344a6d88592602e25e32 URL: https://github.com/kamailio/kamailio/commit/3fad937b03ee7ba9d229344a6d88592… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-26T18:53:14+02:00 lib/ims: proper check of the pointer returned by pkg_malloc; indentation fixes --- Modified: src/lib/ims/ims_getters.c --- Diff: https://github.com/kamailio/kamailio/commit/3fad937b03ee7ba9d229344a6d88592… Patch: https://github.com/kamailio/kamailio/commit/3fad937b03ee7ba9d229344a6d88592…

1 0

git:master:a2b1f269: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 26 Jul '17

26 Jul '17

Module: kamailio Branch: master Commit: a2b1f2692603a952a56bf513c68871d172139ca6 URL: https://github.com/kamailio/kamailio/commit/a2b1f2692603a952a56bf513c68871d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-07-26T17:46:20+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/a2b1f2692603a952a56bf513c68871d… Patch: https://github.com/kamailio/kamailio/commit/a2b1f2692603a952a56bf513c68871d… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index 9623b2c256..d4d8701859 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -419,7 +419,10 @@ modparam("uac","auth_password_avp","$avp(i:12)") 3.12. reg_db_url (string) - DB URL to fetch account profiles for registration. + DB URL to fetch account profiles for registration. This parameter must + be set in order to enable remote registrations feature. + + The default value is "" (no value). Example 1.12. Set reg_db_url parameter ...

1 0

git:master:7d414352: uac: added note about default value for reg_db_url
by Daniel-Constantin Mierla 26 Jul '17

26 Jul '17

Module: kamailio Branch: master Commit: 7d414352e0544cfe1739f3e36cec2c23379ae902 URL: https://github.com/kamailio/kamailio/commit/7d414352e0544cfe1739f3e36cec2c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-26T17:37:28+02:00 uac: added note about default value for reg_db_url --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7d414352e0544cfe1739f3e36cec2c2… Patch: https://github.com/kamailio/kamailio/commit/7d414352e0544cfe1739f3e36cec2c2… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index e6ba5a2b63..020df01eab 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -10,7 +10,7 @@  <chapter> - + <title>&adminguide;</title> @@ -358,10 +358,10 @@ modparam("uac","auth_username_avp","$avp(i:11)") to perform authentication. </para> <para><emphasis> - If you define it, you also need to define - <quote>auth_password_avp</quote> - (<xref linkend="uac.p.auth-password-avp-id"/>) and - <quote>auth_username_avp</quote> + If you define it, you also need to define + <quote>auth_password_avp</quote> + (<xref linkend="uac.p.auth-password-avp-id"/>) and + <quote>auth_username_avp</quote> (<xref linkend="uac.p.auth-password-avp-id"/>). </emphasis></para> <example> @@ -376,8 +376,10 @@ modparam("uac","auth_password_avp","$avp(i:12)") <section id="uac.p.reg-db-url-id"> <title><varname>reg_db_url</varname> (string)</title> <para> - DB URL to fetch account profiles for registration. + DB URL to fetch account profiles for registration. This parameter + must be set in order to enable remote registrations feature. </para> + <para>The default value is "" (no value).</para> <example> <title>Set <varname>reg_db_url</varname> parameter</title> <programlisting format="linespecific"> @@ -392,14 +394,14 @@ modparam("uac", "reg_db_url", <section id="uac.p.reg-timer-interval-id"> <title><varname>reg_timer_interval</varname> (string)</title> <para> - Timer interval (in seconds) at which registrations are managed, e.g. renewed as needed. + Timer interval (in seconds) at which registrations are managed, e.g. renewed as needed. </para> <para> <emphasis> The default value is 90 seconds. </emphasis> </para> - + <example> <title>Set <varname>reg_timer_interval</varname> parameter</title> <programlisting format="linespecific">

1 0

[kamailio] PID file permissions (#231)
by Arsen 26 Jul '17

26 Jul '17

ENV: Debian 8 So on most Linux systems the /var/run folder is a tmpfs and after which clears after each reboot As I try to start up kamailio after a reboot through kamctl I get the following error. "ERROR: PID file /var/run/kamailio.pid does not exist -- Kamailio start failed" Because kamailio does not have the permission to write to the /var/run folder as the kamailio user. Would it be possible to add in the "kamctl" code a section where the SPECIFIED PID LOCATION (/var/run/kamailio) is checked and if it does not exist create it as the root user and chown it to the SPECIFIED USER (kamailio)? The way I have patched it for now is to create a init script that creates a /var/run/kamailio folder and chmods it to kamailio:kamailio Thanks everyone! --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/231

6 13

git:master:16006cd9: dialplan: exported dp_match() and dp_replace() to kemi framework
by Daniel-Constantin Mierla 26 Jul '17

26 Jul '17

Module: kamailio Branch: master Commit: 16006cd97c4eccb4b45c459a8585649450bf5772 URL: https://github.com/kamailio/kamailio/commit/16006cd97c4eccb4b45c459a8585649… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-26T12:18:15+02:00 dialplan: exported dp_match() and dp_replace() to kemi framework --- Modified: src/modules/dialplan/dialplan.c --- Diff: https://github.com/kamailio/kamailio/commit/16006cd97c4eccb4b45c459a8585649… Patch: https://github.com/kamailio/kamailio/commit/16006cd97c4eccb4b45c459a8585649… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index 5a94e8c21c..85dc0d652b 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -55,6 +55,7 @@ #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" #include "../../core/lvalue.h" +#include "../../core/kemi.h" #include "dialplan.h" #include "dp_db.h" @@ -256,17 +257,21 @@ static int dp_update(struct sip_msg * msg, pv_spec_t * dest, memset(&val, 0, sizeof(pv_value_t)); val.flags = PV_VAL_STR; - no_change = (dest==NULL) || (dest->type == PVT_NONE) || (!repl->s) || (!repl->len); + no_change = (dest==NULL) || (dest->type == PVT_NONE) + || (!repl->s) || (!repl->len); if (no_change) goto set_attr_pvar; val.rs = *repl; - if(dest->setf(msg, &dest->pvp, (int)EQ_T, &val)<0) - { - LM_ERR("setting dst pseudo-variable failed\n"); - return -1; + if(dest->setf) { + if(dest->setf(msg, &dest->pvp, (int)EQ_T, &val)<0) { + LM_ERR("setting dst pseudo-variable failed\n"); + return -1; + } + } else { + LM_WARN("target variable is read only - skipping setting its value\n"); } if(dp_append_branch!=0) { @@ -506,6 +511,19 @@ static int w_dp_replace(sip_msg_t* msg, char* pid, char* psrc, char* pdst) return dp_replace_helper(msg, dpid, &src, pvd); } +static int ki_dp_replace(sip_msg_t* msg, int dpid, str* src, str* dst) +{ + pv_spec_t *pvd = NULL; + + pvd = pv_cache_get(dst); + if(pvd==NULL) { + LM_ERR("cannot get pv spec for [%.*s]\n", dst->len, dst->s); + return -1; + } + + return dp_replace_helper(msg, dpid, src, pvd); +} + static int w_dp_match(sip_msg_t* msg, char* pid, char* psrc) { int dpid = 1; @@ -523,6 +541,11 @@ static int w_dp_match(sip_msg_t* msg, char* pid, char* psrc) return dp_replace_helper(msg, dpid, &src, NULL); } +static int ki_dp_match(sip_msg_t* msg, int dpid, str* src) +{ + return dp_replace_helper(msg, dpid, src, NULL); +} + int dp_replace_fixup(void** param, int param_no) { if (param_no == 1) @@ -776,3 +799,32 @@ static int dialplan_init_rpc(void) } return 0; } + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_dialplan_exports[] = { + { str_init("dialplan"), str_init("dp_match"), + SR_KEMIP_INT, ki_dp_match, + { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("dialplan"), str_init("dp_replace"), + SR_KEMIP_INT, ki_dp_replace, + { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_dialplan_exports); + return 0; +} \ No newline at end of file

1 0

git:master:35219960: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 26 Jul '17

26 Jul '17

Module: kamailio Branch: master Commit: 35219960e2960359d4d8b17f1566da611554a152 URL: https://github.com/kamailio/kamailio/commit/35219960e2960359d4d8b17f1566da6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-07-26T12:01:25+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/35219960e2960359d4d8b17f1566da6… Patch: https://github.com/kamailio/kamailio/commit/35219960e2960359d4d8b17f1566da6… --- diff --git a/src/modules/pv/README b/src/modules/pv/README index 428a27c958..9c082b8fc2 100644 --- a/src/modules/pv/README +++ b/src/modules/pv/README @@ -74,7 +74,7 @@ Daniel-Constantin Mierla 1.15. pv_xavp_to_var() usage 1.16. pv_xavp_to_var() usage 1.17. pv.shvSet usage - 1.18. pv.shvSet usage + 1.18. pv.shvGet usage Chapter 1. Admin Guide @@ -461,7 +461,7 @@ $ kamcmd pv.shvSet debug int 3 If no name is given, all shared variables are listed. - Example 1.18. pv.shvSet usage + Example 1.18. pv.shvGet usage ... $ kamcmd pv.shvGet debug ...

1 0

git:master:e9509170: pv: added section ids in the docs
by Daniel-Constantin Mierla 26 Jul '17

26 Jul '17

Module: kamailio Branch: master Commit: e95091700857ff96d9e7c6508104a5ba5d5487ff URL: https://github.com/kamailio/kamailio/commit/e95091700857ff96d9e7c6508104a5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-26T12:00:38+02:00 pv: added section ids in the docs --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e95091700857ff96d9e7c6508104a5b… Patch: https://github.com/kamailio/kamailio/commit/e95091700857ff96d9e7c6508104a5b…

1 0

git:master:ab1d3a33: modules: readme files regenerated - dialplan ... [skip ci]
by Kamailio Dev 26 Jul '17

26 Jul '17

Module: kamailio Branch: master Commit: ab1d3a3302760713722b2fd3ef41615c53b597dc URL: https://github.com/kamailio/kamailio/commit/ab1d3a3302760713722b2fd3ef41615… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-07-26T09:31:32+02:00 modules: readme files regenerated - dialplan ... [skip ci] --- Modified: src/modules/dialplan/README --- Diff: https://github.com/kamailio/kamailio/commit/ab1d3a3302760713722b2fd3ef41615… Patch: https://github.com/kamailio/kamailio/commit/ab1d3a3302760713722b2fd3ef41615… --- diff --git a/src/modules/dialplan/README b/src/modules/dialplan/README index f073564db1..cde96e214d 100644 --- a/src/modules/dialplan/README +++ b/src/modules/dialplan/README @@ -54,6 +54,7 @@ Luis Martin 5.11. attrs_pvar (string) 5.12. fetch_rows (int) 5.13. match_dynamic (int) + 5.14. append_branch (int) 6. Functions @@ -87,11 +88,12 @@ Luis Martin 1.11. Set attrs_pvar parameter 1.12. Set fetch_rows parameter 1.13. Set match_dynamic parameter - 1.14. dp_replace usage - 1.15. dp_match usage - 1.16. dp_translate usage + 1.14. Set append_branch parameter + 1.15. dp_replace usage + 1.16. dp_match usage 1.17. dp_translate usage - 1.18. Example of rules + 1.18. dp_translate usage + 1.19. Example of rules Chapter 1. Admin Guide @@ -120,6 +122,7 @@ Chapter 1. Admin Guide 5.11. attrs_pvar (string) 5.12. fetch_rows (int) 5.13. match_dynamic (int) + 5.14. append_branch (int) 6. Functions @@ -219,6 +222,7 @@ Chapter 1. Admin Guide 5.11. attrs_pvar (string) 5.12. fetch_rows (int) 5.13. match_dynamic (int) + 5.14. append_branch (int) 5.1. db_url (string) @@ -375,6 +379,20 @@ modparam("dialplan", "fetch_rows", 4000) modparam("dialplan", "match_dynamic", 1) ... +5.14. append_branch (int) + + If set to 1, the module appends a new outgoing branch when request URI + (r-uri) or its user part are changed by dp_translate() or dp_replace() + inside a failure_route block. Set it to 0 if the branch should not be + added. + + Default value is “1”. + + Example 1.14. Set append_branch parameter +... +modparam("dialplan", "append_branch", 0) +... + 6. Functions 6.1. dp_replace(dpid, inval, outvar) @@ -405,7 +423,7 @@ modparam("dialplan", "match_dynamic", 1) This function can be used from ANY_ROUTE. - Example 1.14. dp_replace usage + Example 1.15. dp_replace usage ... dp_replace("240", "$rU", "$var(newru)"); xlog("'$rU' was translated to '$var(newru)'\n"); @@ -432,7 +450,7 @@ dp_replace("240", "+49$rU", "$var(newval)"); This function can be used from ANY_ROUTE. - Example 1.15. dp_match usage + Example 1.16. dp_match usage ... dp_match("240", "+49$rU"); xlog("the attributes associated with '+49$rU' are '$var(attrs)'\n"); @@ -473,13 +491,13 @@ xlog("the attributes associated with '+49$rU' are '$var(attrs)'\n"); This function can be used from ANY_ROUTE. - Example 1.16. dp_translate usage + Example 1.17. dp_translate usage ... dp_translate("240", "$ruri.user/$avp(s:dest)"); xlog("translated to var $avp(s:dest) \n"); ... - Example 1.17. dp_translate usage + Example 1.18. dp_translate usage ... $avp(s:src) = $ruri.user; dp_translate("$var(x)", "$avp(s:src)/$var(y)"); @@ -549,7 +567,7 @@ xlog("translated to var $var(y) \n"); Some sample records from a dialplan table are presented in the next figure. - Example 1.18. Example of rules + Example 1.19. Example of rules ... dpid: 1 pr: 1

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2017