sr-dev March 2018

sr-dev@lists.kamailio.org

17 participants
327 discussions

git:5.1:20fa560d: async: docs - some improvements to examples
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: 5.1 Commit: 20fa560da4868eb454c064baad397975d25c4098 URL: https://github.com/kamailio/kamailio/commit/20fa560da4868eb454c064baad39797… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:22:46+01:00 async: docs - some improvements to examples (cherry picked from commit 15731d40ff1af78bf568d19bdbe4704d35931afd) --- Modified: src/modules/async/doc/async_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/20fa560da4868eb454c064baad39797… Patch: https://github.com/kamailio/kamailio/commit/20fa560da4868eb454c064baad39797… --- diff --git a/src/modules/async/doc/async_admin.xml b/src/modules/async/doc/async_admin.xml index f7de934bdb..d829679b2d 100644 --- a/src/modules/async/doc/async_admin.xml +++ b/src/modules/async/doc/async_admin.xml @@ -10,9 +10,9 @@  <chapter> - + <title>&adminguide;</title> - + <section> <title>Overview</title> <para> @@ -24,7 +24,7 @@ </para> <para> Note that after invoking the asynchronous operation, the processing - will continue later in another application process. Therefore variables + will continue later in another application process. Therefore variables stored in private memory should not be used, try to use shared memory if you want to get values after the processing is resumed (e.g., $avp(...), $xavp(...), $shv(...), htable $sht(...)). @@ -72,7 +72,7 @@ <title><varname>workers</varname> (int)</title> <para> Number of worker processes to be started to handle the asynchronous - tasks for async_route() and async_sleep(). + tasks for async_route() and async_sleep(). </para> <para> <emphasis> @@ -124,8 +124,11 @@ modparam("async", "workers", 2) <title><function>async_route</function> usage</title> <programlisting format="linespecific"> ... -async_route("RESUME", "4"); -... +request_route { + ... + async_route("RESUME", "4"); + ... +} route[RESUME] { send_reply("404", "Not found"); exit; @@ -184,7 +187,7 @@ exit; <title><function>async_workers</function> usage</title> <programlisting format="linespecific"> ... -; Enable 8 worker processes used by async and other modules +# Enable 8 worker processes used by async and other modules async_workers=8 ... </programlisting> @@ -212,8 +215,11 @@ async_workers=8 <title><function>async_task_route</function> usage</title> <programlisting format="linespecific"> ... -async_task_route("RESUME"); -... +request_route { + ... + async_task_route("RESUME"); + ... +} route[RESUME] { t_relay(); exit; @@ -224,4 +230,3 @@ route[RESUME] { </section> </section> </chapter> -

1 0

git:5.1:63aca341: db_text: small updates to sample config used in docs
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: 5.1 Commit: 63aca341454d29c5820a3cbd055fc19ad0c2e5d4 URL: https://github.com/kamailio/kamailio/commit/63aca341454d29c5820a3cbd055fc19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:22:33+01:00 db_text: small updates to sample config used in docs (cherry picked from commit 7738461dda1595ee71cbda47bd129e3f13ebc77d) --- Modified: src/modules/db_text/doc/db_text.cfg --- Diff: https://github.com/kamailio/kamailio/commit/63aca341454d29c5820a3cbd055fc19… Patch: https://github.com/kamailio/kamailio/commit/63aca341454d29c5820a3cbd055fc19… --- diff --git a/src/modules/db_text/doc/db_text.cfg b/src/modules/db_text/doc/db_text.cfg index 83fd09990f..8c94d7c56a 100644 --- a/src/modules/db_text/doc/db_text.cfg +++ b/src/modules/db_text/doc/db_text.cfg @@ -1,12 +1,11 @@ # -# $Id$ # # simple quick-start config script with dbtext # # ----------- global configuration parameters ------------------------ -#debug=9 # debug level (cmd line: -dddddddddd) +#debug=3 # debug level (cmd line: -ddd) #fork=yes #log_stderror=no # (cmd line: -E) @@ -30,7 +29,7 @@ loadmodule "modules/maxfwd/maxfwd.so" loadmodule "modules/usrloc/usrloc.so" loadmodule "modules/registrar/registrar.so" loadmodule "modules/textops/textops.so" -loadmodule "modules/textops/mi_fifo.so" +loadmodule "modules/jonrpcs/jsonrpcs.so" # modules for digest authentication loadmodule "modules/auth/auth.so" @@ -38,15 +37,11 @@ loadmodule "modules/auth_db/auth_db.so" # ----------------- setting module-specific parameters --------------- -# -- mi_fifo params -- - -modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo") - # -- usrloc params -- # use dbtext database for persistent storage modparam("usrloc", "db_mode", 2) -modparam("usrloc|auth_db", "db_url", "dbtext:///tmp/openserdb") +modparam("usrloc|auth_db", "db_url", "db_text:///tmp/kamailiodb") # -- auth params -- #

1 0

git:5.1:48c8f775: app_perl: do dlerror() after dlsym() fails to find exports
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: 5.1 Commit: 48c8f7751d701c8a6dd538280c5c1fa6129d141d URL: https://github.com/kamailio/kamailio/commit/48c8f7751d701c8a6dd538280c5c1fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:21:56+01:00 app_perl: do dlerror() after dlsym() fails to find exports - some OSes do not reset dlerror after a successful dlsym(), pointing to an older error case - reported by GH #1465 (cherry picked from commit 795edca9215391f7c8f646895c083f8ac8853341) --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/48c8f7751d701c8a6dd538280c5c1fa… Patch: https://github.com/kamailio/kamailio/commit/48c8f7751d701c8a6dd538280c5c1fa… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 8a195fc12d..f04d486908 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -619,6 +619,9 @@ int load_module(char* mod_path) } exp = (union module_exports_u*)dlsym(handle, "exports"); if(exp==NULL) { + error =(char*)dlerror(); + LM_DBG("attempt to lookup exports structure failed - dlerror: %s\n", + (error)?error:"none"); /* 'exports' structure not found, look up for '_modulename_exports' */ mdir = strrchr(mod_path, '/'); if (!mdir) {

1 0

git:5.1:289eb374: core: check return of dlsym() before dlerror() handling
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: 5.1 Commit: 289eb37432bfc61855234893daa6be27d40f8788 URL: https://github.com/kamailio/kamailio/commit/289eb37432bfc61855234893daa6be2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:21:17+01:00 core: check return of dlsym() before dlerror() handling - cope with the case when dlerror is not reset by dlsym - related to GH #1465 (cherry picked from commit 045d44762ce7cd267e64849c1c138d45b1fa040f) --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/289eb37432bfc61855234893daa6be2… Patch: https://github.com/kamailio/kamailio/commit/289eb37432bfc61855234893daa6be2… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 594f3d6af8..8a195fc12d 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -630,11 +630,14 @@ int load_module(char* mod_path) if(expref.len>3 && strcmp(expref.s+expref.len-3, ".so")==0) expref.len -= 3; snprintf(exbuf, 62, "_%.*s_exports", expref.len, expref.s); - exp = (union module_exports_u*)dlsym(handle, exbuf); LM_DBG("looking up exports with name: %s\n", exbuf); - if ( (error =(char*)dlerror())!=0 ){ - LM_ERR("%s\n", error); - goto error1; + exp = (union module_exports_u*)dlsym(handle, exbuf); + if(exp==NULL) { + if ( (error =(char*)dlerror())!=0 ){ + LM_ERR("failure for exports symbol: %s - dlerror: %s\n", + exbuf, error); + goto error1; + } } } /* hack to allow for kamailio style dlflags inside exports */

1 0

git:master:021e7e53: auth_ephemeral: do pkg-config for libcrypto if exists
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: 021e7e53585f78b56356c98f25bd731c51f96f9a URL: https://github.com/kamailio/kamailio/commit/021e7e53585f78b56356c98f25bd731… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T11:15:51+01:00 auth_ephemeral: do pkg-config for libcrypto if exists - discover all the libs to link against - related to GH #1473 --- Modified: src/modules/auth_ephemeral/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/021e7e53585f78b56356c98f25bd731… Patch: https://github.com/kamailio/kamailio/commit/021e7e53585f78b56356c98f25bd731… --- diff --git a/src/modules/auth_ephemeral/Makefile b/src/modules/auth_ephemeral/Makefile index 6701ee9e23..5c066502af 100644 --- a/src/modules/auth_ephemeral/Makefile +++ b/src/modules/auth_ephemeral/Makefile @@ -11,6 +11,14 @@ SSL_BUILDER=$(shell \ if pkg-config --exists libssl; then \ echo 'pkg-config libssl'; \ fi) + +ifneq ($(SSL_BUILDER),) +SSL_BUILDER+=$(shell \ + if pkg-config --exists libcrypto; then \ + echo 'libcrypto'; \ + fi) +endif + endif ifneq ($(SSL_BUILDER),)

1 0

git:master:e1299651: misc/examples/kemi: enable lua script reload in example config
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: e129965129b2377970a28fabd26b3be9b483c81b URL: https://github.com/kamailio/kamailio/commit/e129965129b2377970a28fabd26b3be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T10:02:18+01:00 misc/examples/kemi: enable lua script reload in example config --- Modified: misc/examples/kemi/kamailio-basic-kemi.cfg --- Diff: https://github.com/kamailio/kamailio/commit/e129965129b2377970a28fabd26b3be… Patch: https://github.com/kamailio/kamailio/commit/e129965129b2377970a28fabd26b3be… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi.cfg b/misc/examples/kemi/kamailio-basic-kemi.cfg index 8fe3616da2..507b7afa12 100644 --- a/misc/examples/kemi/kamailio-basic-kemi.cfg +++ b/misc/examples/kemi/kamailio-basic-kemi.cfg @@ -360,6 +360,7 @@ cfgengine "python" #!else #!ifdef WITH_CFGLUA +modparam("app_lua", "reload", 1) modparam("app_lua", "load", "/usr/local/etc/kamailio/kamailio-basic-kemi-lua.lua") cfgengine "lua" #!else

1 0

git:master:29c637c3: memcached module: several doxygen parameter fixes
by Henning Westerholt 13 Mar '18

13 Mar '18

Module: kamailio Branch: master Commit: 29c637c3b3018f5e326c6f6af956ade665b72860 URL: https://github.com/kamailio/kamailio/commit/29c637c3b3018f5e326c6f6af956ade… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-13T23:36:42+01:00 memcached module: several doxygen parameter fixes --- Modified: src/modules/memcached/memcached.c --- Diff: https://github.com/kamailio/kamailio/commit/29c637c3b3018f5e326c6f6af956ade… Patch: https://github.com/kamailio/kamailio/commit/29c637c3b3018f5e326c6f6af956ade…

1 0

git:master:bb5abe0d: ims_dialog module: several doxygen fixes
by Henning Westerholt 13 Mar '18

13 Mar '18

Module: kamailio Branch: master Commit: bb5abe0dd4774dfa990242509f96d04bbd8aacbc URL: https://github.com/kamailio/kamailio/commit/bb5abe0dd4774dfa990242509f96d04… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-13T23:04:06+01:00 ims_dialog module: several doxygen fixes --- Modified: src/modules/ims_dialog/dlg_handlers.c Modified: src/modules/ims_dialog/dlg_handlers.h Modified: src/modules/ims_dialog/dlg_hash.c Modified: src/modules/ims_dialog/dlg_hash.h Modified: src/modules/ims_dialog/dlg_profile.c Modified: src/modules/ims_dialog/dlg_profile.h Modified: src/modules/ims_dialog/dlg_timer.c Modified: src/modules/ims_dialog/dlg_timer.h --- Diff: https://github.com/kamailio/kamailio/commit/bb5abe0dd4774dfa990242509f96d04… Patch: https://github.com/kamailio/kamailio/commit/bb5abe0dd4774dfa990242509f96d04…

1 0

git:master:0e96fbca: prefix_route module: small doxygen group fix
by Henning Westerholt 13 Mar '18

13 Mar '18

Module: kamailio Branch: master Commit: 0e96fbca8e6a8fdb2edb56ea336b76d4b25e4666 URL: https://github.com/kamailio/kamailio/commit/0e96fbca8e6a8fdb2edb56ea336b76d… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-13T22:36:09+01:00 prefix_route module: small doxygen group fix --- Modified: src/modules/prefix_route/prefix_route.c --- Diff: https://github.com/kamailio/kamailio/commit/0e96fbca8e6a8fdb2edb56ea336b76d… Patch: https://github.com/kamailio/kamailio/commit/0e96fbca8e6a8fdb2edb56ea336b76d… --- diff --git a/src/modules/prefix_route/prefix_route.c b/src/modules/prefix_route/prefix_route.c index 6256b63811..8878a880aa 100644 --- a/src/modules/prefix_route/prefix_route.c +++ b/src/modules/prefix_route/prefix_route.c @@ -26,8 +26,10 @@ * \ingroup prefix_route */ -/*! \defgroup prefix_route +/*! \defgroup prefix_route Prefix routing module + * \ingroup modules * The prefix_route module does routing based on a set of prefixes from the database. + * @{ */ @@ -385,3 +387,5 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) sr_kemi_modules_add(sr_kemi_prefix_route_exports); return 0; } + +/** @} */

1 0

git:master:064c6a84: jsonrpcs module: small doxygen group fix
by Henning Westerholt 13 Mar '18

13 Mar '18

Module: kamailio Branch: master Commit: 064c6a846d3cac3ab4f325ffbea7c0c0b94deb34 URL: https://github.com/kamailio/kamailio/commit/064c6a846d3cac3ab4f325ffbea7c0c… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-13T22:35:38+01:00 jsonrpcs module: small doxygen group fix --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/064c6a846d3cac3ab4f325ffbea7c0c… Patch: https://github.com/kamailio/kamailio/commit/064c6a846d3cac3ab4f325ffbea7c0c… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index 633847fc9d..98d66cc5cb 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -50,18 +50,18 @@ #include "jsonrpcs_mod.h" +/** @file + * + * This is the main file of jsonrpc-s module which contains all the functions + * related to http processing, as well as the module interface. + */ + /** @addtogroup jsonrpc-s * @ingroup modules - * @{ * * <h1>Overview of Operation</h1> * This module provides jsonrpc over http server implementation. - */ - -/** @file - * - * This is the main file of jsonrpc-s module which contains all the functions - * related to http processing, as well as the module interface. + * @{ */ MODULE_VERSION @@ -1495,3 +1495,5 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) sr_kemi_modules_add(sr_kemi_jsonrpcs_exports); return 0; } + +/** @} */

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2018