sr-dev June 2017

sr-dev@lists.kamailio.org

28 participants
389 discussions

git:master:0bf90196: modules: readme files regenerated - ndb_redis ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 0bf901966aac3026cd0ba4798f5689c66d7f7b4f URL: https://github.com/kamailio/kamailio/commit/0bf901966aac3026cd0ba4798f5689c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-06-02T15:31:37+02:00 modules: readme files regenerated - ndb_redis ... [skip ci] --- Modified: src/modules/ndb_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/0bf901966aac3026cd0ba4798f5689c… Patch: https://github.com/kamailio/kamailio/commit/0bf901966aac3026cd0ba4798f5689c… --- diff --git a/src/modules/ndb_redis/README b/src/modules/ndb_redis/README index 8ef7d7dd9c..c51fe48c3b 100644 --- a/src/modules/ndb_redis/README +++ b/src/modules/ndb_redis/README @@ -314,6 +314,12 @@ modparam("ndb_redis", "flush_on_reconnect", 1) * value[n] - returns value of the nth element. value - returns null for an array. You need to get each element by index. + In case one of the members of the array is also an array (for example + calling SMEMBERS in a MULTI/EXEC transaction), the members of the array + can be accessed by adding any of the above keys, after a value[n] key. + The first value[n] references the element in the first array, while the + next key references an element of the referenced array. + Example 1.9. redis_cmd usage ... if(redis_cmd("srvN", "INCR cnt", "r")) { @@ -344,6 +350,16 @@ if(redis_cmd("srvN", "HMGET foo_key field1 field3", "r")) { xlog("array size: $redis(r=>size)\n"); xlog("first values: $redis(r=>value[0]) , $redis(r=>value[1])\n"); } + + +# array as element of an array example +redis_cmd("srvN", "MULTI", "r1"); +redis_cmd("srvN", "SMEMBERS foo", "r2"); +if (redis_cmd("srvN", "EXEC", "r")) { + xlog("array size: $redis(r=>value[0]=>size)\n"); + xlog("first member of the set:$redis(r=>value[0]=>value[0])\n"); + xlog("type of the second member of the set:$redis(r=>value[0]=>type[1])\n"); +} ... 4.2. redis_pipe_cmd(srvname, command, ..., replyid)

7 years, 5 months

git:5.0:12d86f9e: kazoo: remove unused variable

by Luis Azedo

Module: kamailio Branch: 5.0 Commit: 12d86f9eaa06d0d3ff9e4892ebd4d3e139690b03 URL: https://github.com/kamailio/kamailio/commit/12d86f9eaa06d0d3ff9e4892ebd4d3e… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-06-02T14:29:03+01:00 kazoo: remove unused variable (cherry picked from commit 5d628a4093fc4f7ecb1ad6bec7172879e331f2dc) --- Modified: src/modules/kazoo/kz_json.c --- Diff: https://github.com/kamailio/kamailio/commit/12d86f9eaa06d0d3ff9e4892ebd4d3e… Patch: https://github.com/kamailio/kamailio/commit/12d86f9eaa06d0d3ff9e4892ebd4d3e… --- diff --git a/src/modules/kazoo/kz_json.c b/src/modules/kazoo/kz_json.c index 3f51cbf574..1211bc4b8c 100644 --- a/src/modules/kazoo/kz_json.c +++ b/src/modules/kazoo/kz_json.c @@ -123,7 +123,6 @@ struct json_object * kz_json_get_field_object(str* json, str* field) json_keys keys; json_key key; char* dup; - char* token; char f1[250], f2[250];//, f3[25]; int i, parts;

7 years, 5 months

git:5.0:8311b2ef: kazoo: add ksr_msg_env_reset after processing events

by Luis Azedo

Module: kamailio Branch: 5.0 Commit: 8311b2ef9dd604ba86ede7d9ca34710762095162 URL: https://github.com/kamailio/kamailio/commit/8311b2ef9dd604ba86ede7d9ca34710… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-06-02T14:28:47+01:00 kazoo: add ksr_msg_env_reset after processing events (cherry picked from commit afed885f8591ebb505511dba750d9671081c5d64) --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/8311b2ef9dd604ba86ede7d9ca34710… Patch: https://github.com/kamailio/kamailio/commit/8311b2ef9dd604ba86ede7d9ca34710… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index da310893c9..ca3a86a19c 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -42,6 +42,10 @@ #include "../../core/mod_fix.h" #include "../../core/lvalue.h" #include "../tm/tm_load.h" +#include "../../core/route.h" +#include "../../core/receive.h" +#include "../../core/action.h" +#include "../../core/script_cb.h" #include "kz_amqp.h" @@ -2280,11 +2284,14 @@ int kz_amqp_consumer_fire_event(char *eventkey) fmsg = faked_msg_get_next(); rtb = get_route_type(); set_route_type(REQUEST_ROUTE); - init_run_actions_ctx(&ctx); - run_top_route(event_rt.rlist[rt], fmsg, 0); + if (exec_pre_script_cb(fmsg, REQUEST_CB_TYPE)!=0 ) { + init_run_actions_ctx(&ctx); + run_top_route(event_rt.rlist[rt], fmsg, 0); + exec_post_script_cb(fmsg, REQUEST_CB_TYPE); + ksr_msg_env_reset(); + } set_route_type(rtb); return 0; - } void kz_amqp_consumer_event(char *payload, char* event_key, char* event_subkey) @@ -2408,6 +2415,7 @@ void kz_amqp_cb_ok(kz_amqp_cmd_ptr cmd) } struct action *a = main_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); + ksr_msg_env_reset(); } void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd) @@ -2419,6 +2427,7 @@ void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd) } struct action *a = main_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); + ksr_msg_env_reset(); } int kz_send_worker_error_event(kz_amqp_cmd_ptr cmd)

7 years, 5 months

git:5.0:5add6c44: core: wrapper function to reset avps/xavps from msg environment

by Luis Azedo

Module: kamailio Branch: 5.0 Commit: 5add6c44cc8d268748488b8f2683c88bbfd4572e URL: https://github.com/kamailio/kamailio/commit/5add6c44cc8d268748488b8f2683c88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-06-02T14:28:09+01:00 core: wrapper function to reset avps/xavps from msg environment - use it to clean after processing received msg (cherry picked from commit 46ea6b0a6bcf55243a0d11be41f60a2678dbbcfb) --- Modified: src/core/receive.c Modified: src/core/receive.h --- Diff: https://github.com/kamailio/kamailio/commit/5add6c44cc8d268748488b8f2683c88… Patch: https://github.com/kamailio/kamailio/commit/5add6c44cc8d268748488b8f2683c88… --- diff --git a/src/core/receive.c b/src/core/receive.c index 0e622274f9..7f2599af69 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -360,11 +360,7 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) #ifdef STATS skipped = 0; #endif - /* free possible loaded avps -bogdan */ - reset_avps(); -#ifdef WITH_XAVP - xavp_reset_list(); -#endif + ksr_msg_env_reset(); LM_DBG("cleaning up\n"); free_sip_msg(msg); pkg_free(msg); @@ -390,13 +386,21 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) free_sip_msg(msg); pkg_free(msg); error00: - reset_avps(); -#ifdef WITH_XAVP - xavp_reset_list(); -#endif + ksr_msg_env_reset(); STATS_RX_DROPS; /* reset log prefix */ log_prefix_set(NULL); return -1; } +/** + * clean up msg environment, such as avp and xavp lists + */ +void ksr_msg_env_reset(void) +{ + reset_avps(); +#ifdef WITH_XAVP + xavp_reset_list(); +#endif + +} diff --git a/src/core/receive.h b/src/core/receive.h index 4e6a13d3fd..0a928c5d42 100644 --- a/src/core/receive.h +++ b/src/core/receive.h @@ -33,5 +33,6 @@ int receive_msg(char* buf, unsigned int len, struct receive_info *ri); unsigned int inc_msg_no(void); +void ksr_msg_env_reset(void); #endif

7 years, 5 months

git:5.0:72012440: core: reset avps and xavps lists in all error cases

by Luis Azedo

Module: kamailio Branch: 5.0 Commit: 72012440214b0827e6ae7e1dd494c5ecd3fdbaa8 URL: https://github.com/kamailio/kamailio/commit/72012440214b0827e6ae7e1dd494c5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-06-02T14:28:04+01:00 core: reset avps and xavps lists in all error cases - just for safety when one uses some srevent routes (cherry picked from commit bc336bfcba127a9232583a3d7b7e10d994c369eb) --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/72012440214b0827e6ae7e1dd494c5e… Patch: https://github.com/kamailio/kamailio/commit/72012440214b0827e6ae7e1dd494c5e… --- diff --git a/src/core/receive.c b/src/core/receive.c index f2cdeeb4f5..0e622274f9 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -379,10 +379,6 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) error_rpl: /* execute post reply-script callbacks */ exec_post_script_cb(msg, ONREPLY_CB_TYPE); - reset_avps(); -#ifdef WITH_XAVP - xavp_reset_list(); -#endif goto error02; #endif /* NO_ONREPLY_ROUTE_ERROR */ error_req: @@ -390,15 +386,14 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) /* execute post request-script callbacks */ exec_post_script_cb(msg, REQUEST_CB_TYPE); error03: - /* free possible loaded avps -bogdan */ - reset_avps(); -#ifdef WITH_XAVP - xavp_reset_list(); -#endif error02: free_sip_msg(msg); pkg_free(msg); error00: + reset_avps(); +#ifdef WITH_XAVP + xavp_reset_list(); +#endif STATS_RX_DROPS; /* reset log prefix */ log_prefix_set(NULL);

7 years, 5 months

git:master:3188ae67: Merge pull request #1147 from claudiupb/redis_enhance_reply_access

by GitHub

Module: kamailio Branch: master Commit: 3188ae670ba1b43dc939e13e745edc0b0066b657 URL: https://github.com/kamailio/kamailio/commit/3188ae670ba1b43dc939e13e745edc0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-06-02T15:27:48+02:00 Merge pull request #1147 from claudiupb/redis_enhance_reply_access ndb_redis: enhance access to REDIS replies --- Modified: src/modules/ndb_redis/doc/ndb_redis_admin.xml Modified: src/modules/ndb_redis/ndb_redis_mod.c Modified: src/modules/ndb_redis/redis_client.h --- Diff: https://github.com/kamailio/kamailio/commit/3188ae670ba1b43dc939e13e745edc0… Patch: https://github.com/kamailio/kamailio/commit/3188ae670ba1b43dc939e13e745edc0…

7 years, 5 months

git:master:f4a793ee: ndb_redis: enhance access to REDIS replies

by Claudiu Boriga

Module: kamailio Branch: master Commit: f4a793ee33e7cc8266fd9010726a7372e56a379c URL: https://github.com/kamailio/kamailio/commit/f4a793ee33e7cc8266fd9010726a737… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Claudiu Boriga <paul.boriga(a)1and1.ro> Date: 2017-06-02T15:34:43+03:00 ndb_redis: enhance access to REDIS replies - add support to access array within arrays --- Modified: src/modules/ndb_redis/doc/ndb_redis_admin.xml Modified: src/modules/ndb_redis/ndb_redis_mod.c Modified: src/modules/ndb_redis/redis_client.h --- Diff: https://github.com/kamailio/kamailio/commit/f4a793ee33e7cc8266fd9010726a737… Patch: https://github.com/kamailio/kamailio/commit/f4a793ee33e7cc8266fd9010726a737…

7 years, 5 months

[kamailio/kamailio] ndb_redis: enhance access to REDIS replies (#1147)

by Paul Claudiu Boriga

Hello, I have enhanced the way REDIS replied are accessed in the Kamailio config, to be able to access arrays that are members of other arrays. In the original code, we could access members of an array like this: $redis(reply=>value[0]). But if that member was itself an array it was impossible to access it, as accessing an array directly returns (null). This case can happen if we use redis transactions with, and all commands are given between MULTI and EXEC commands. Then the EXEC command returns an array with the responses of the individual commands, so if any command returns an array, then we have an array within that array. I have modified the syntax of the redis replies in the config, to be able to add other keys after value[n] keys. This way we can access members of the array within the first array. For example after the following sequence: ``` redis_cmd("srvN", "MULTI", "r1"); redis_cmd("srvN", "SMEMBERS foo", "r2"); redis_cmd("srvN", "EXEC", "reply") ``` The PV to access the response will look like this - to access the first elemenent of SMEMBERS: `$redis(reply=>value[0]=>value[0])` - to access the second element of SMEMBERS: `$redis(reply=>value[0]=>value[1])` - to see how many elements SMEMBERS returned: `$redis(reply=>value[0]=>size)` - to see the type the first element returned by SMEMBERS: `$redis(reply=>value[0]=>type[0])` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1147 -- Commit Summary -- * ndb_redis: enhance access to REDIS replies -- File Changes -- M src/modules/ndb_redis/doc/ndb_redis_admin.xml (16) M src/modules/ndb_redis/ndb_redis_mod.c (181) M src/modules/ndb_redis/redis_client.h (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1147.patch https://github.com/kamailio/kamailio/pull/1147.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/1147

7 years, 5 months

Errored: kamailio/kamailio#4357 (4.4 - b4cb653)

by Travis CI

Build Update for kamailio/kamailio ------------------------------------- Build: #4357 Status: Errored Duration: 21 seconds Commit: b4cb653 (4.4) Author: lazedo Message: htable: release pkg memory before returning resets 'first' when esize == 0 (cherry picked from commit 2d771f563d19fccad0a28e56a5d99de571ef5da6) View the changeset: https://github.com/kamailio/kamailio/compare/8351c7a81f43...b4cb65354de5 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/238748194?utm_source=email&u… -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

7 years, 5 months

[kamailio/kamailio] htable: fix crash if deleted entry is reused (#1142)

by lazedo

resets 'first' when esize == 0 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1142 -- Commit Summary -- * htable: fix crash if deleted entry is reused -- File Changes -- M src/modules/htable/ht_api.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1142.patch https://github.com/kamailio/kamailio/pull/1142.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/1142

7 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2017