sr-dev April 2015

sr-dev@lists.kamailio.org

36 participants
248 discussions

git:master:f5677682: ndb_redis: init_without_redis continue only if connection or starting commands fail.
by Vicente Hernando 14 Apr '15

14 Apr '15

Module: kamailio Branch: master Commit: f56776826584de2dd0023bc3185107d3ff9491bb URL: https://github.com/kamailio/kamailio/commit/f56776826584de2dd0023bc3185107d… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2015-04-14T11:57:13+02:00 ndb_redis: init_without_redis continue only if connection or starting commands fail. --- Modified: modules/ndb_redis/ndb_redis_mod.c Modified: modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/f56776826584de2dd0023bc3185107d… Patch: https://github.com/kamailio/kamailio/commit/f56776826584de2dd0023bc3185107d… --- diff --git a/modules/ndb_redis/ndb_redis_mod.c b/modules/ndb_redis/ndb_redis_mod.c index 525c108..c3c71f6 100644 --- a/modules/ndb_redis/ndb_redis_mod.c +++ b/modules/ndb_redis/ndb_redis_mod.c @@ -43,6 +43,7 @@ MODULE_VERSION int redis_srv_param(modparam_t type, void *val); int init_without_redis = 0; + static int w_redis_cmd3(struct sip_msg* msg, char* ssrv, char* scmd, char* sres); static int w_redis_cmd4(struct sip_msg* msg, char* ssrv, char* scmd, @@ -115,15 +116,8 @@ static int child_init(int rank) if(redisc_init()<0) { - if (init_without_redis==1) - { - LM_WARN("failed to initialize redis connections, but initializing module anyway\n"); - return 0; - } - else { - LM_ERR("failed to initialize redis connections\n"); - return -1; - } + LM_ERR("failed to initialize redis connections\n"); + return -1; } return 0; } diff --git a/modules/ndb_redis/redis_client.c b/modules/ndb_redis/redis_client.c index 0476ed2..02aa7b8 100644 --- a/modules/ndb_redis/redis_client.c +++ b/modules/ndb_redis/redis_client.c @@ -41,6 +41,8 @@ static redisc_server_t *_redisc_srv_list=NULL; static redisc_reply_t *_redisc_rpl_list=NULL; +extern int init_without_redis; + /** * */ @@ -118,6 +120,12 @@ int redisc_init(void) LM_ERR("error communicating with redis server [%.*s] (%s:%d/%d): %s\n", rsrv->sname->len, rsrv->sname->s, addr, port, db, rsrv->ctxRedis->errstr); } + if (init_without_redis==1) + { + LM_WARN("failed to initialize redis connections, but initializing module anyway.\n"); + return 0; + } + return -1; err: if (unix_sock_path != NULL) { @@ -127,6 +135,12 @@ int redisc_init(void) LM_ERR("failed to connect to redis server [%.*s] (%s:%d/%d)\n", rsrv->sname->len, rsrv->sname->s, addr, port, db); } + if (init_without_redis==1) + { + LM_WARN("failed to initialize redis connections, but initializing module anyway.\n"); + return 0; + } + return -1; }

1 0

git:master:398f2c12: Merge pull request #121 from giavac/master
by vhernando 14 Apr '15

14 Apr '15

Module: kamailio Branch: master Commit: 398f2c12d9ad8bac07444ba7670dcb4b1f335431 URL: https://github.com/kamailio/kamailio/commit/398f2c12d9ad8bac07444ba7670dcb4… Author: vhernando <bizenton(a)gmail.com> Committer: vhernando <bizenton(a)gmail.com> Date: 2015-04-14T11:14:01+02:00 Merge pull request #121 from giavac/master Optionally init ndb_redis when redis is not available --- Modified: modules/ndb_redis/README Modified: modules/ndb_redis/doc/ndb_redis_admin.xml Modified: modules/ndb_redis/ndb_redis_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/398f2c12d9ad8bac07444ba7670dcb4… Patch: https://github.com/kamailio/kamailio/commit/398f2c12d9ad8bac07444ba7670dcb4…

1 0

git:master:025887de: ndb_redis: update README with init_without_redis
by Giacomo Vacca 14 Apr '15

14 Apr '15

Module: kamailio Branch: master Commit: 025887dea5be7f40c6c9b1ba7e2b2cf522c4c9f0 URL: https://github.com/kamailio/kamailio/commit/025887dea5be7f40c6c9b1ba7e2b2cf… Author: Giacomo Vacca <giacomo.vacca(a)gmail.com> Committer: Giacomo Vacca <giacomo.vacca(a)gmail.com> Date: 2015-04-13T10:19:01-04:00 ndb_redis: update README with init_without_redis --- Modified: modules/ndb_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/025887dea5be7f40c6c9b1ba7e2b2cf… Patch: https://github.com/kamailio/kamailio/commit/025887dea5be7f40c6c9b1ba7e2b2cf… --- diff --git a/modules/ndb_redis/README b/modules/ndb_redis/README index 02a69f7..96a3363 100644 --- a/modules/ndb_redis/README +++ b/modules/ndb_redis/README @@ -32,6 +32,7 @@ Vicente Hernando 3. Parameters 3.1. server (str) + 3.2. init_without_redis (integer) 4. Functions @@ -41,8 +42,9 @@ Vicente Hernando List of Examples 1.1. Set server parameter - 1.2. redis_cmd usage - 1.3. redis_free usage + 1.2. Set init_without_redis parameter + 1.3. redis_cmd usage + 1.4. redis_free usage Chapter 1. Admin Guide @@ -57,6 +59,7 @@ Chapter 1. Admin Guide 3. Parameters 3.1. server (str) + 3.2. init_without_redis (integer) 4. Functions @@ -91,6 +94,7 @@ Chapter 1. Admin Guide 3. Parameters 3.1. server (str) + 3.2. init_without_redis (integer) 3.1. server (str) @@ -113,13 +117,25 @@ Chapter 1. Admin Guide Example 1.1. Set server parameter ... modparam("ndb_redis", "server", "name=srvN;addr=127.0.0.1;port=6379;db=1") -modparam("ndb_redis", "server", "name=srvX;addr=127.0.0.2;port=6379;db=4;pass=my -password") +modparam("ndb_redis", "server", "name=srvX;addr=127.0.0.2;port=6379;db=4;pass=m +ypassword") # Unix domain socket modparam("ndb_redis", "server", "name=srvY;unix=/tmp/redis.sock;db=3") ... +3.2. init_without_redis (integer) + + If set to 1, the module will correctly initialize even if redis is not + available at start up. + + Default value is “0”. + + Example 1.2. Set init_without_redis parameter +... +modparam("ndb_redis", "init_without_redis", 1) +... + 4. Functions 4.1. redis_cmd(srvname, command, ..., replyid) @@ -148,7 +164,7 @@ modparam("ndb_redis", "server", "name=srvY;unix=/tmp/redis.sock;db=3") * value[n] - returns value of the nth element. value - returns null for an array. You need to get each element by index. - Example 1.2. redis_cmd usage + Example 1.3. redis_cmd usage ... if(redis_cmd("srvN", "INCR cnt", "r")) { # success - the incremented value is in $redis(r=>value) @@ -189,7 +205,7 @@ if(redis_cmd("srvN", "HMGET foo_key field1 field3", "r")) { function. When ndb_redis module closes, all pending replies are freed automatically. - Example 1.3. redis_free usage + Example 1.4. redis_free usage ... After a redis command call: redis_cmd("srvN", "INCR cnt", "r");

1 0

git:master:7b18dcc3: ndb_redis: update doc with init_without_redis
by Giacomo Vacca 14 Apr '15

14 Apr '15

Module: kamailio Branch: master Commit: 7b18dcc3017baeb5b918c98765f1526f22438788 URL: https://github.com/kamailio/kamailio/commit/7b18dcc3017baeb5b918c98765f1526… Author: Giacomo Vacca <giacomo.vacca(a)gmail.com> Committer: Giacomo Vacca <giacomo.vacca(a)gmail.com> Date: 2015-04-13T16:15:51+02:00 ndb_redis: update doc with init_without_redis --- Modified: modules/ndb_redis/doc/ndb_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7b18dcc3017baeb5b918c98765f1526… Patch: https://github.com/kamailio/kamailio/commit/7b18dcc3017baeb5b918c98765f1526… --- diff --git a/modules/ndb_redis/doc/ndb_redis_admin.xml b/modules/ndb_redis/doc/ndb_redis_admin.xml index 6a9635a..b5e47d9 100644 --- a/modules/ndb_redis/doc/ndb_redis_admin.xml +++ b/modules/ndb_redis/doc/ndb_redis_admin.xml @@ -93,6 +93,25 @@ modparam("ndb_redis", "server", "name=srvY;unix=/tmp/redis.sock;db=3") </programlisting> </example> </section> + <section id="ndb_redis.p.init_without_redis"> + <title><varname>init_without_redis</varname> (integer)</title> + <para> + If set to 1, the module will correctly initialize even if redis is not available at start up. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>init_without_redis</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ndb_redis", "init_without_redis", 1) +... + </programlisting> + </example> + </section> </section> <section>

1 0

git:master:2058793b: ndb_redis: optionally allow mod init with redis unavailable
by Giacomo Vacca 14 Apr '15

14 Apr '15

Module: kamailio Branch: master Commit: 2058793b61d1e4ad251ded334750bf4ec1ff1f6b URL: https://github.com/kamailio/kamailio/commit/2058793b61d1e4ad251ded334750bf4… Author: Giacomo Vacca <giacomo.vacca(a)gmail.com> Committer: Giacomo Vacca <giacomo.vacca(a)gmail.com> Date: 2015-04-13T16:09:03+02:00 ndb_redis: optionally allow mod init with redis unavailable --- Modified: modules/ndb_redis/ndb_redis_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2058793b61d1e4ad251ded334750bf4… Patch: https://github.com/kamailio/kamailio/commit/2058793b61d1e4ad251ded334750bf4… --- diff --git a/modules/ndb_redis/ndb_redis_mod.c b/modules/ndb_redis/ndb_redis_mod.c index a24ada3..525c108 100644 --- a/modules/ndb_redis/ndb_redis_mod.c +++ b/modules/ndb_redis/ndb_redis_mod.c @@ -42,6 +42,7 @@ MODULE_VERSION /** parameters */ int redis_srv_param(modparam_t type, void *val); +int init_without_redis = 0; static int w_redis_cmd3(struct sip_msg* msg, char* ssrv, char* scmd, char* sres); static int w_redis_cmd4(struct sip_msg* msg, char* ssrv, char* scmd, @@ -84,6 +85,7 @@ static cmd_export_t cmds[]={ static param_export_t params[]={ {"server", PARAM_STRING|USE_FUNC_PARAM, (void*)redis_srv_param}, + {"init_without_redis", INT_PARAM, &init_without_redis}, {0, 0, 0} }; @@ -113,8 +115,15 @@ static int child_init(int rank) if(redisc_init()<0) { - LM_ERR("failed to initialize redis connections\n"); - return -1; + if (init_without_redis==1) + { + LM_WARN("failed to initialize redis connections, but initializing module anyway\n"); + return 0; + } + else { + LM_ERR("failed to initialize redis connections\n"); + return -1; + } } return 0; }

1 0

git:master:2c4e8ef6: modules/ims_qos: fixed stat typo
by Richard Good 14 Apr '15

14 Apr '15

Module: kamailio Branch: master Commit: 2c4e8ef671a3b38b7a3a52f36bbd6191f620b4c6 URL: https://github.com/kamailio/kamailio/commit/2c4e8ef671a3b38b7a3a52f36bbd619… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2015-04-14T10:03:21+02:00 modules/ims_qos: fixed stat typo --- Modified: modules/ims_qos/ims_qos_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/2c4e8ef671a3b38b7a3a52f36bbd619… Patch: https://github.com/kamailio/kamailio/commit/2c4e8ef671a3b38b7a3a52f36bbd619… --- diff --git a/modules/ims_qos/ims_qos_stats.c b/modules/ims_qos/ims_qos_stats.c index f659ee7..280603d 100644 --- a/modules/ims_qos/ims_qos_stats.c +++ b/modules/ims_qos/ims_qos_stats.c @@ -66,7 +66,7 @@ counter_def_t ims_qos_cnt_defs[] = { {&ims_qos_cnts_h.asrs, "asrs", 0, 0, 0, "total number of registration ASRs"}, {&ims_qos_cnts_h.successful_registration_aars, "successful_registration_aars", 0, 0, 0, "total number of successful registration AARs"}, {&ims_qos_cnts_h.registration_aar_response_time, "registration_aar_response_time", 0, 0, 0, "total number of seconds waiting for registration AAR responses"}, - {&ims_qos_cnts_h.registration_aar_replies_received, "registration_aar_replies_received", 0, 0, 0, "total number of media AAR replies received"}, + {&ims_qos_cnts_h.registration_aar_replies_received, "registration_aar_replies_received", 0, 0, 0, "total number of registration AAR replies received"}, {&ims_qos_cnts_h.active_media_rx_sessions, "active_media_rx_sessions", 0, 0, 0, "number of currently active media Rx sessions"}, {&ims_qos_cnts_h.media_aar_avg_response_time, "media_aar_avg_response_time", 0, ims_qos_internal_stats, (void*) (long) IMS_QOS_MEDIA_AAR_AVG_RSP, "avg response time for media AARs"},

1 0

git:master:51578d83: modules:ims_qos: separated stat aar_replies_received into media_aar_replies_received and registration_aar_replies_received
by Richard Good 14 Apr '15

14 Apr '15

Module: kamailio Branch: master Commit: 51578d83811129c895428cce0828b613be044130 URL: https://github.com/kamailio/kamailio/commit/51578d83811129c895428cce0828b61… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2015-04-14T10:01:02+02:00 modules:ims_qos: separated stat aar_replies_received into media_aar_replies_received and registration_aar_replies_received --- Modified: modules/ims_qos/ims_qos_stats.c Modified: modules/ims_qos/ims_qos_stats.h Modified: modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/51578d83811129c895428cce0828b61… Patch: https://github.com/kamailio/kamailio/commit/51578d83811129c895428cce0828b61… --- diff --git a/modules/ims_qos/ims_qos_stats.c b/modules/ims_qos/ims_qos_stats.c index 2b08ccc..f659ee7 100644 --- a/modules/ims_qos/ims_qos_stats.c +++ b/modules/ims_qos/ims_qos_stats.c @@ -66,6 +66,7 @@ counter_def_t ims_qos_cnt_defs[] = { {&ims_qos_cnts_h.asrs, "asrs", 0, 0, 0, "total number of registration ASRs"}, {&ims_qos_cnts_h.successful_registration_aars, "successful_registration_aars", 0, 0, 0, "total number of successful registration AARs"}, {&ims_qos_cnts_h.registration_aar_response_time, "registration_aar_response_time", 0, 0, 0, "total number of seconds waiting for registration AAR responses"}, + {&ims_qos_cnts_h.registration_aar_replies_received, "registration_aar_replies_received", 0, 0, 0, "total number of media AAR replies received"}, {&ims_qos_cnts_h.active_media_rx_sessions, "active_media_rx_sessions", 0, 0, 0, "number of currently active media Rx sessions"}, {&ims_qos_cnts_h.media_aar_avg_response_time, "media_aar_avg_response_time", 0, ims_qos_internal_stats, (void*) (long) IMS_QOS_MEDIA_AAR_AVG_RSP, "avg response time for media AARs"}, @@ -74,7 +75,7 @@ counter_def_t ims_qos_cnt_defs[] = { {&ims_qos_cnts_h.media_aars, "media_aars", 0, 0, 0, "total number of media AARs"}, {&ims_qos_cnts_h.successful_media_aars, "successful_media_aars", 0, 0, 0, "total number of successful media AARs"}, {&ims_qos_cnts_h.media_aar_response_time, "media_aar_response_time", 0, 0, 0, "total number of seconds waiting for media AAR responses"}, - {&ims_qos_cnts_h.aar_replies_received, "aar_replies_received", 0, 0, 0, "total number of AAR replies received"}, + {&ims_qos_cnts_h.media_aar_replies_received, "media_aar_replies_received", 0, 0, 0, "total number of media AAR replies received"}, {0, 0, 0, 0, 0, 0} }; diff --git a/modules/ims_qos/ims_qos_stats.h b/modules/ims_qos/ims_qos_stats.h index 3b1638f..20d3a8c 100644 --- a/modules/ims_qos/ims_qos_stats.h +++ b/modules/ims_qos/ims_qos_stats.h @@ -26,7 +26,8 @@ struct ims_qos_counters_h { counter_handle_t media_aars; counter_handle_t successful_media_aars; counter_handle_t active_media_rx_sessions; - counter_handle_t aar_replies_received; + counter_handle_t media_aar_replies_received; + counter_handle_t registration_aar_replies_received; }; int ims_qos_init_counters(); diff --git a/modules/ims_qos/rx_aar.c b/modules/ims_qos/rx_aar.c index a09feaf..233fb66 100644 --- a/modules/ims_qos/rx_aar.c +++ b/modules/ims_qos/rx_aar.c @@ -130,7 +130,7 @@ void async_aar_callback(int is_timeout, void *param, AAAMessage *aaa, long elaps counter_inc(ims_qos_cnts_h.media_aars); counter_add(ims_qos_cnts_h.media_aar_response_time, elapsed_msecs); - counter_inc(ims_qos_cnts_h.aar_replies_received); + counter_inc(ims_qos_cnts_h.media_aar_replies_received); /* Process the response to AAR, retrieving result code and associated Rx session ID */ if (rx_process_aaa(aaa, &cdp_result) < 0) { @@ -242,7 +242,7 @@ void async_aar_reg_callback(int is_timeout, void *param, AAAMessage *aaa, long e counter_inc(ims_qos_cnts_h.registration_aars); counter_add(ims_qos_cnts_h.registration_aar_response_time, elapsed_msecs); - counter_inc(ims_qos_cnts_h.aar_replies_received); + counter_inc(ims_qos_cnts_h.registration_aar_replies_received); /* Process the response to AAR, retrieving result code and associated Rx session ID */ if (rx_process_aaa(aaa, &cdp_result) < 0) {

1 0

git:master:aa8d1ff2: modules/ims_charging: added extra stat replies received for CCRs (reverted from commit 90d0a995a150b32f5300e919dca22bd0176642a2)
by jaybeepee 14 Apr '15

14 Apr '15

Module: kamailio Branch: master Commit: aa8d1ff214630f2b3bc2bc6d03c57e6b17a995a4 URL: https://github.com/kamailio/kamailio/commit/aa8d1ff214630f2b3bc2bc6d03c57e6… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-04-14T09:51:25+02:00 modules/ims_charging: added extra stat replies received for CCRs (reverted from commit 90d0a995a150b32f5300e919dca22bd0176642a2) --- Modified: modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/aa8d1ff214630f2b3bc2bc6d03c57e6… Patch: https://github.com/kamailio/kamailio/commit/aa8d1ff214630f2b3bc2bc6d03c57e6… --- diff --git a/modules/ims_charging/ims_ro.c b/modules/ims_charging/ims_ro.c index 8078ad6..56b88a0 100644 --- a/modules/ims_charging/ims_ro.c +++ b/modules/ims_charging/ims_ro.c @@ -664,7 +664,7 @@ static void resume_on_interim_ccr(int is_timeout, void *param, AAAMessage *cca, } counter_add(ims_charging_cnts_h.ccr_response_time, elapsed_msecs); - counter_add(ims_charging_cnts_h.ccr_response_time, 1); + counter_inc(ims_charging_cnts_h.ccr_replies_received); if (!i_req) { LM_ERR("This is so wrong: ro session is NULL\n"); @@ -885,7 +885,7 @@ static void resume_on_termination_ccr(int is_timeout, void *param, AAAMessage *c goto error; } - counter_add(ims_charging_cnts_h.ccr_response_time, 1); + counter_inc(ims_charging_cnts_h.ccr_replies_received); counter_add(ims_charging_cnts_h.ccr_response_time, elapsed_msecs); if (!cca) { @@ -1171,7 +1171,7 @@ static void resume_on_initial_ccr(int is_timeout, void *param, AAAMessage *cca, goto error0; } - counter_add(ims_charging_cnts_h.ccr_response_time, 1); + counter_inc(ims_charging_cnts_h.ccr_replies_received); counter_add(ims_charging_cnts_h.ccr_response_time, elapsed_msecs); if (!cca) {

1 0

git:master:e7e90952: modules/ims_charging: added extra stat replies received for CCRs (reverted from commit 90d0a995a150b32f5300e919dca22bd0176642a2)
by jaybeepee 14 Apr '15

14 Apr '15

Module: kamailio Branch: master Commit: e7e9095238d8fb2cd420e80641398d5f7c654065 URL: https://github.com/kamailio/kamailio/commit/e7e9095238d8fb2cd420e80641398d5… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-04-14T09:46:22+02:00 modules/ims_charging: added extra stat replies received for CCRs (reverted from commit 90d0a995a150b32f5300e919dca22bd0176642a2) --- Removed: parser/case_pani.h Removed: parser/parse_pani.c Removed: parser/parse_pani.h --- Diff: https://github.com/kamailio/kamailio/commit/e7e9095238d8fb2cd420e80641398d5… Patch: https://github.com/kamailio/kamailio/commit/e7e9095238d8fb2cd420e80641398d5…

1 0

git:master:90d0a995: modules/ims_charging: added extra stat replies received for CCRs
by jaybeepee 14 Apr '15

14 Apr '15

Module: kamailio Branch: master Commit: 90d0a995a150b32f5300e919dca22bd0176642a2 URL: https://github.com/kamailio/kamailio/commit/90d0a995a150b32f5300e919dca22bd… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-04-14T09:41:28+02:00 modules/ims_charging: added extra stat replies received for CCRs --- Added: parser/case_pani.h Added: parser/parse_pani.c Added: parser/parse_pani.h --- Diff: https://github.com/kamailio/kamailio/commit/90d0a995a150b32f5300e919dca22bd… Patch: https://github.com/kamailio/kamailio/commit/90d0a995a150b32f5300e919dca22bd…

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2015