sr-dev June 2016

sr-dev@lists.kamailio.org

37 participants
345 discussions

git:master:f38dc1bf: modules/ims_dialog: fix c compiler warning - removed inline

by jaybeepee

Module: kamailio Branch: master Commit: f38dc1bf70a18baccbe1bc0fbd60587286a408f6 URL: https://github.com/kamailio/kamailio/commit/f38dc1bf70a18baccbe1bc0fbd60587… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-06-13T11:46:51+02:00 modules/ims_dialog: fix c compiler warning - removed inline --- Modified: modules/ims_dialog/dlg_hash.c Modified: modules/ims_dialog/dlg_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/f38dc1bf70a18baccbe1bc0fbd60587… Patch: https://github.com/kamailio/kamailio/commit/f38dc1bf70a18baccbe1bc0fbd60587… --- diff --git a/modules/ims_dialog/dlg_hash.c b/modules/ims_dialog/dlg_hash.c index cc6db50..984cbc8 100644 --- a/modules/ims_dialog/dlg_hash.c +++ b/modules/ims_dialog/dlg_hash.c @@ -187,7 +187,7 @@ static void destroy_entry_out(struct dlg_entry_out *d_entry_out) { * \brief Destroy a dialog, run callbacks and free memory * \param dlg destroyed dialog */ -inline void destroy_dlg(struct dlg_cell *dlg) { +void destroy_dlg(struct dlg_cell *dlg) { int ret = 0; struct dlg_var *var; diff --git a/modules/ims_dialog/dlg_hash.h b/modules/ims_dialog/dlg_hash.h index 0988c5a..2f6e582 100644 --- a/modules/ims_dialog/dlg_hash.h +++ b/modules/ims_dialog/dlg_hash.h @@ -223,7 +223,7 @@ static inline void unlink_unsafe_dlg(struct dlg_entry *d_entry, struct dlg_cell * \brief Destroy a dialog, run callbacks and free memory * \param dlg destroyed dialog */ -inline void destroy_dlg(struct dlg_cell *dlg); +void destroy_dlg(struct dlg_cell *dlg); /*!

8 years, 5 months

[kamailio/kamailio] latency_log=-1 generates error messages (#669)

by Olle E. Johansson

The cookbook claims that -1 is the default for latency_log - but when setting it to -1 in a configuration file Kamailio generates errors: ``` 0(48972) : <core> [cfg.y:3391]: yyerror_at(): parse error in config file latency.cfg, line 16, column 13: number expected ``` Setting it to a positive number works without errors. --- 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/issues/669

8 years, 5 months

git:master:6e950945: core: latency log parameters accept negative integer value

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6e950945df2fc236e153db7292bf6ad832fedd6a URL: https://github.com/kamailio/kamailio/commit/6e950945df2fc236e153db7292bf6ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-13T09:05:08+02:00 core: latency log parameters accept negative integer value - core log levels can be negative - reported by Olle E. Johansson, GH #669 --- Modified: cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/6e950945df2fc236e153db7292bf6ad… Patch: https://github.com/kamailio/kamailio/commit/6e950945df2fc236e153db7292bf6ad… --- diff --git a/cfg.y b/cfg.y index 91553ff..134e932 100644 --- a/cfg.y +++ b/cfg.y @@ -1520,9 +1520,9 @@ assign_stm: | SERVER_ID EQUAL NUMBER { server_id=$3; } | MAX_RECURSIVE_LEVEL EQUAL NUMBER { set_max_recursive_level($3); } | MAX_BRANCHES_PARAM EQUAL NUMBER { sr_dst_max_branches = $3; } - | LATENCY_LOG EQUAL NUMBER { default_core_cfg.latency_log=$3; } + | LATENCY_LOG EQUAL intno { default_core_cfg.latency_log=$3; } | LATENCY_LOG EQUAL error { yyerror("number expected"); } - | LATENCY_CFG_LOG EQUAL NUMBER { default_core_cfg.latency_cfg_log=$3; } + | LATENCY_CFG_LOG EQUAL intno { default_core_cfg.latency_cfg_log=$3; } | LATENCY_CFG_LOG EQUAL error { yyerror("number expected"); } | LATENCY_LIMIT_DB EQUAL NUMBER { default_core_cfg.latency_limit_db=$3; } | LATENCY_LIMIT_DB EQUAL error { yyerror("number expected"); }

8 years, 5 months

[kamailio/kamailio] Suspected design flaw in SNMPstats - shm memory slowly being allocated (#636)

by Olle E. Johansson

SNMPstats has a queued buffer that contains registration changes based on callbacks from usrloc. If one loads SNMPstats this queue grows forever and is only emptied when someone actually calls exactly the right parts of the MIB. At that time the queue is processed and an internal copy of the location table is produced and published. If one uses other parts of the MIB the queue keeps growing. This can be turned off by disabling the modparam "Export_registrar". Proposed changes: - Improve the README - Check if the processing of the queue can happen on timer instead of waiting for accidental checks. --- 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/issues/636

8 years, 5 months

git:master:c5dca609: textops: filter_body() remove previous \r\n that belongs to the boundary

by Victor Seva

Module: kamailio Branch: master Commit: c5dca6096785296c89acbfa4b2f7a7fd8a16d9a2 URL: https://github.com/kamailio/kamailio/commit/c5dca6096785296c89acbfa4b2f7a7f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-06-10T17:07:08+02:00 textops: filter_body() remove previous \r\n that belongs to the boundary we were removing only '--boundary\r\n' but we must remove '\r\n--boundary\r\n' --- Modified: modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/c5dca6096785296c89acbfa4b2f7a7f… Patch: https://github.com/kamailio/kamailio/commit/c5dca6096785296c89acbfa4b2f7a7f… --- diff --git a/modules/textops/textops.c b/modules/textops/textops.c index 400b836..99a4da8 100644 --- a/modules/textops/textops.c +++ b/modules/textops/textops.c @@ -973,7 +973,8 @@ static int filter_body_f(struct sip_msg* msg, char* _content_type, if (find_line_start(boundary.s, boundary.len, &start, &len)) { - if (del_lump(msg, start - msg->buf, len, 0) == 0) + /* we need to remove \r\n too */ + if (del_lump(msg, (start-2) - msg->buf, len+2, 0) == 0) { LM_ERR("deleting lump <%.*s> failed\n", len, start); goto err;

8 years, 5 months

git:master:17c8fad3: cfgutils Export trylock function to kemi

by Olle E. Johansson

Module: kamailio Branch: master Commit: 17c8fad3fa5ea5c2dd1b6285508aa6156d9b4c3f URL: https://github.com/kamailio/kamailio/commit/17c8fad3fa5ea5c2dd1b6285508aa61… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-06-10T14:21:07+02:00 cfgutils Export trylock function to kemi --- Modified: modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/17c8fad3fa5ea5c2dd1b6285508aa61… Patch: https://github.com/kamailio/kamailio/commit/17c8fad3fa5ea5c2dd1b6285508aa61… --- diff --git a/modules/cfgutils/cfgutils.c b/modules/cfgutils/cfgutils.c index 8d8dc8e..5ece20f 100644 --- a/modules/cfgutils/cfgutils.c +++ b/modules/cfgutils/cfgutils.c @@ -1089,7 +1089,7 @@ int bind_cfgutils(cfgutils_api_t *api) /** - * + * KEMI exports */ static sr_kemi_t sr_kemi_cfgutils_exports[] = { { str_init("cfgutils"), str_init("lock"), @@ -1102,6 +1102,11 @@ static sr_kemi_t sr_kemi_cfgutils_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("cfgutils"), str_init("trylock"), + SR_KEMIP_INT, cfg_trylock, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

8 years, 5 months

git:master:8455b9a4: modules: readme files regenerated - cfgutils ...

by Kamailio Dev

Module: kamailio Branch: master Commit: 8455b9a4ee32ed5d0dbd202ed2f94a1a2d92242d URL: https://github.com/kamailio/kamailio/commit/8455b9a4ee32ed5d0dbd202ed2f94a1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-06-10T14:16:10+02:00 modules: readme files regenerated - cfgutils ... --- Modified: modules/cfgutils/README --- Diff: https://github.com/kamailio/kamailio/commit/8455b9a4ee32ed5d0dbd202ed2f94a1… Patch: https://github.com/kamailio/kamailio/commit/8455b9a4ee32ed5d0dbd202ed2f94a1…

8 years, 5 months

git:master:71f6e6b1: cfgutils Add "trylock" function

by Olle E. Johansson

Module: kamailio Branch: master Commit: 71f6e6b1303a6daf80414c7217bdade5014c8eb0 URL: https://github.com/kamailio/kamailio/commit/71f6e6b1303a6daf80414c7217bdade… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-06-10T14:08:07+02:00 cfgutils Add "trylock" function --- Modified: modules/cfgutils/cfgutils.c Modified: modules/cfgutils/doc/cfgutils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/71f6e6b1303a6daf80414c7217bdade… Patch: https://github.com/kamailio/kamailio/commit/71f6e6b1303a6daf80414c7217bdade… --- diff --git a/modules/cfgutils/cfgutils.c b/modules/cfgutils/cfgutils.c index 082cfe5..8d8dc8e 100644 --- a/modules/cfgutils/cfgutils.c +++ b/modules/cfgutils/cfgutils.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2012 Edvina AB * Copyright (C) 2007 1&1 Internet AG * Copyright (C) 2007 BASIS AudioNet GmbH @@ -106,6 +104,7 @@ static int is_gflag(struct sip_msg*, char *, char *); static int w_cfg_lock(struct sip_msg*, char *, char *); static int w_cfg_unlock(struct sip_msg*, char *, char *); +static int w_cfg_trylock(struct sip_msg*, char *, char *); static struct mi_root* mi_set_prob(struct mi_root* cmd, void* param ); static struct mi_root* mi_reset_prob(struct mi_root* cmd, void* param ); @@ -184,6 +183,8 @@ static cmd_export_t cmds[]={ ANY_ROUTE}, {"unlock", (cmd_function)w_cfg_unlock, 1, fixup_spve_null, 0, ANY_ROUTE}, + {"trylock", (cmd_function)w_cfg_trylock, 1, fixup_spve_null, 0, + ANY_ROUTE}, {"core_hash", (cmd_function)w_core_hash, 3, fixup_core_hash, 0, ANY_ROUTE}, {"check_route_exists", (cmd_function)w_check_route_exists, 1, 0, 0, @@ -828,11 +829,28 @@ static int cfg_lock_helper(str *lkey, int mode) { unsigned int pos; pos = core_case_hash(lkey, 0, _cfg_lock_size); + LM_DBG("cfg_lock mode %d on %u\n", mode, pos); - if(mode==0) + + if(mode==0) { + /* Lock */ lock_set_get(_cfg_lock_set, pos); - else + } else if (mode == 1) { + /* Unlock */ lock_set_release(_cfg_lock_set, pos); + } else { + int res; + /* Trylock */ + res = lock_set_try(_cfg_lock_set, pos); + if (res != 0) { + LM_DBG("Failed to trylock \n"); + /* Failed to lock */ + return -1; + } + LM_DBG("Succeeded with trylock \n"); + /* Succeeded in locking */ + return 1; + } return 1; } @@ -846,6 +864,11 @@ static int cfg_unlock(str *lkey) return cfg_lock_helper(lkey, 1); } +static int cfg_trylock(str *lkey) +{ + return cfg_lock_helper(lkey, 2); +} + static int w_cfg_lock_wrapper(struct sip_msg *msg, gparam_p key, int mode) { str s; @@ -871,6 +894,13 @@ static int w_cfg_unlock(struct sip_msg *msg, char *key, char *s2) return w_cfg_lock_wrapper(msg, (gparam_p)key, 1); } +static int w_cfg_trylock(struct sip_msg *msg, char *key, char *s2) +{ + if(_cfg_lock_set==NULL || key==NULL) + return -1; + return w_cfg_lock_wrapper(msg, (gparam_p)key, 2); +} + /*! Check if a route block exists - only request routes */ static int w_check_route_exists(struct sip_msg *msg, char *route) diff --git a/modules/cfgutils/doc/cfgutils_admin.xml b/modules/cfgutils/doc/cfgutils_admin.xml index 3e22fba..4b222e1 100644 --- a/modules/cfgutils/doc/cfgutils_admin.xml +++ b/modules/cfgutils/doc/cfgutils_admin.xml @@ -505,6 +505,31 @@ lock("$rU"); </programlisting> </example> </section> + <section id="cfgutils.f.trylock"> + <title><function moreinfo="none">trylock(key)</function></title> + <para> + Try to lock the key. If the lock can not be obtained (possibly already locked), + the function returns an error and script execution continues. + </para> + <para> + <quote>key</quote> can be static string or string with PVs. + </para> + <para> + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, + ONREPLY_ROUTE, BRANCH_ROUTE and LOCAL_ROUTE. + </para> + <example> + <title><function moreinfo="none">trylock()</function> usage</title> + <programlisting format="linespecific"> +... +if (trylock("$rU")) { + xlog("L_INFO", "Doing some cool stuff\n"); + unlock("$rU"); +} +... +</programlisting> + </example> + </section> <section id="cfgutils.f.unlock"> <title><function moreinfo="none">unlock(key)</function></title> <para>

8 years, 5 months

git:master:a7534a76: modules: readme files regenerated - dialplan ...

by Kamailio Dev

Module: kamailio Branch: master Commit: a7534a762cdbaa4565e151d9430a49ad298b2d4f URL: https://github.com/kamailio/kamailio/commit/a7534a762cdbaa4565e151d9430a49a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-06-10T13:16:14+02:00 modules: readme files regenerated - dialplan ... --- Modified: modules/dialplan/README --- Diff: https://github.com/kamailio/kamailio/commit/a7534a762cdbaa4565e151d9430a49a… Patch: https://github.com/kamailio/kamailio/commit/a7534a762cdbaa4565e151d9430a49a… --- diff --git a/modules/dialplan/README b/modules/dialplan/README index cb55998..073c676 100644 --- a/modules/dialplan/README +++ b/modules/dialplan/README @@ -16,6 +16,10 @@ Edited by Olle E. Johansson +Edited by + +Luis Martin + Copyright © 2007-2008 Voice Sistem SRL Copyright © 2008-2010 Juha Heinanen @@ -54,6 +58,7 @@ Olle E. Johansson 6. Functions 6.1. dp_translate(id, [src[/dest]]) + 6.2. dp_reload() 7. MI Commands @@ -120,6 +125,7 @@ Chapter 1. Admin Guide 6. Functions 6.1. dp_translate(id, [src[/dest]]) + 6.2. dp_reload() 7. MI Commands @@ -376,6 +382,7 @@ modparam("dialplan", "match_dynamic", 1) 6. Functions 6.1. dp_translate(id, [src[/dest]]) + 6.2. dp_reload() 6.1. dp_translate(id, [src[/dest]]) @@ -425,6 +432,16 @@ dp_translate("$var(x)", "$avp(s:src)/$var(y)"); xlog("translated to var $var(y) \n"); ... +6.2. dp_reload() + + Forces an update of the translation rules from the database. + + Name: dp_reload + + Parameters: none + + This function can be used from ANY_ROUTE. + 7. MI Commands 7.1. dp_reload

8 years, 5 months

git:master:3f405388: Merge pull request #667 from kamailio/luismartingil/dialplan_reload

by GitHub

Module: kamailio Branch: master Commit: 3f405388980b725394693c7b4c294a3ea33195e5 URL: https://github.com/kamailio/kamailio/commit/3f405388980b725394693c7b4c294a3… Author: Olle E. Johansson <oej(a)edvina.net> Committer: GitHub <noreply(a)github.com> Date: 2016-06-10T13:14:49+02:00 Merge pull request #667 from kamailio/luismartingil/dialplan_reload Providing dp_reload function to the cfg --- Modified: modules/dialplan/dialplan.c Modified: modules/dialplan/doc/dialplan.xml Modified: modules/dialplan/doc/dialplan_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3f405388980b725394693c7b4c294a3… Patch: https://github.com/kamailio/kamailio/commit/3f405388980b725394693c7b4c294a3… --- diff --git a/modules/dialplan/dialplan.c b/modules/dialplan/dialplan.c index 9a7fe33..a0c679a 100644 --- a/modules/dialplan/dialplan.c +++ b/modules/dialplan/dialplan.c @@ -73,6 +73,7 @@ static struct mi_root * mi_reload_rules(struct mi_root *cmd_tree,void *param); static struct mi_root * mi_translate(struct mi_root *cmd_tree, void *param); static int dp_translate_f(struct sip_msg* msg, char* str1, char* str2); static int dp_trans_fixup(void ** param, int param_no); +static int dp_reload_f(struct sip_msg* msg); str attr_pvar_s = STR_NULL; pv_spec_t * attr_pvar = NULL; @@ -111,6 +112,8 @@ static cmd_export_t cmds[]={ ANY_ROUTE}, {"dp_translate",(cmd_function)dp_translate_f, 1, dp_trans_fixup, 0, ANY_ROUTE}, + {"dp_reload",(cmd_function)dp_reload_f, 0, 0, 0, + ANY_ROUTE}, {0,0,0,0,0,0} }; @@ -452,6 +455,27 @@ static int dp_trans_fixup(void ** param, int param_no){ return E_INVALID_PARAMS; } +static int dp_reload_f(struct sip_msg* msg) +{ + struct mi_root* rpl_tree= NULL; + + if (dp_connect_db() < 0) { + LM_ERR("failed to reload rules fron database (db connect)\n"); + return -1; + } + + if(dp_load_db() != 0){ + LM_ERR("failed to reload rules fron database (db load)\n"); + dp_disconnect_db(); + return -1; + } + + dp_disconnect_db(); + + LM_DBG("reloaded dialplan\n"); + return 1; +} + static struct mi_root * mi_reload_rules(struct mi_root *cmd_tree, void *param) { diff --git a/modules/dialplan/doc/dialplan.xml b/modules/dialplan/doc/dialplan.xml index 386e7eb..8118cbf 100644 --- a/modules/dialplan/doc/dialplan.xml +++ b/modules/dialplan/doc/dialplan.xml @@ -36,6 +36,13 @@ <firstname>Olle E.</firstname> <surname>Johansson</surname> </editor> + <editor> + <firstname>Luis</firstname> + <surname>Martin</surname> + <address> + <email>martingil.luis(a)gmail.com</email> + </address> + </editor> </authorgroup> <copyright> <year>2007-2008</year> diff --git a/modules/dialplan/doc/dialplan_admin.xml b/modules/dialplan/doc/dialplan_admin.xml index 5bfa870..63fc4ce 100644 --- a/modules/dialplan/doc/dialplan_admin.xml +++ b/modules/dialplan/doc/dialplan_admin.xml @@ -496,6 +496,22 @@ xlog("translated to var $var(y) \n"); </section> + <section id="dispatcher.f.dp_reload"> + <title> + <function moreinfo="none">dp_reload()</function> + </title> + <para> + Forces an update of the translation rules from the database. + </para> + <para> + Name: <emphasis>dp_reload</emphasis> + </para> + <para>Parameters: <emphasis>none</emphasis></para> + <para> + This function can be used from ANY_ROUTE. + </para> + </section> + </section>

8 years, 5 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2016