sr-dev September 2018

sr-dev@lists.kamailio.org

24 participants
331 discussions

[kamailio/kamailio] dispatcher algorithm 11 with congestion control memory corruption problem (#1649)

by Julien Chavanton

### Description Segfault , suspected cause, writing out of bound of an array ### Troubleshooting In progress #### Reproduction Hard #### Debugging Data ``` /* code reference */ typedef struct _ds_set { int id; /*!< id of dst set */ int nr; /*!< number of items in dst set */ int last; /*!< last used item in dst set (round robin) */ int wlast; /*!< last used item in dst set (by weight) */ int rwlast; /*!< last used item in dst set (by relative weight) */ ds_dest_t *dlist; unsigned int wlist[100]; unsigned int rwlist[100]; struct _ds_set *next[2]; int longer; gen_lock_t lock; } ds_set_t; Here we can see that next is having invalid value (in fact it should have been 0/NULL in this case) : 20000000220000000220 2964>->-->--ds_ping_set(node->next[i]); (gdb) bt #0 0x00007f3b1cfde6c7 in ds_ping_set (node=0x200000002) at dispatch.c:2964 #1 0x00007f3b1cfde6d3 in ds_ping_set (node=0x7f3a99a09fc8) at dispatch.c:2964 #2 0x00007f3b1cfde6d3 in ds_ping_set (node=0x7f3a99a09828) at dispatch.c:2964 #3 0x00007f3b1cfdf9ad in ds_check_timer (ticks=9987101, param=0x0) at dispatch.c:3022 #4 0x00005644376a3652 in sr_wtimer_exec (ticks=9987101, param=0x0) at core/timer_proc.c:390 #5 0x00005644376a276d in fork_sync_timer (child_id=-1, desc=0x5644378904c1 "secondary timer", make_sock=1, f=0x5644376a330c <sr_wtimer_exec>, param=0x0, interval=1000) at core/timer_proc.c:224 #6 0x00005644376a39ca in sr_wtimer_start () at core/timer_proc.c:416 #7 0x00005644374d2d59 in main_loop () at main.c:1702 #8 0x00005644374da171 in main (argc=12, argv=0x7ffe7c214ac8) at main.c:2650 (gdb) p (ds_set_t) *0x7f3a99a09828 $1 = {id = 2, nr = 2, last = 0, wlast = 0, rwlast = 0, dlist = 0x7f3a99a0aab8, wlist = {0 <repeats 100 times>}, rwlist = {0 <repeats 100 times>}, next = {0x7f3a99a09fc8, 0x0}, longer = 0, lock = {val = 0}} (gdb) p (ds_set_t) *0x0x7f3a99a09fc8 Invalid number "0x0x7f3a99a09fc8". (gdb) p (ds_set_t) *0x7f3a99a09fc8 $2 = {id = 1, nr = 3, last = 0, wlast = 0, rwlast = 0, dlist = 0x7f3a99a0a7f8, wlist = {1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1,~ 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1}, rwlist = {1, 1, 2, 2, 1, 0, 1, 0, 2, 2, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 0, 1, 2, 1, 0, 0, 0, 0, 2, 1, 0, 2, 1, 2, 1, 1, 0, 2, 1, 2, 2, 2, 0, 0,~ 2, 0, 2, 2, 0, 2, 2, 0, 1, 2, 1, 1, 2, 1, 1, 0, 1, 1, 0, 1, 0, 2, 2, 2, 2, 2, 0, 0, 2, 0, 1, 0, 2, 1, 1, 2, 0, 2, 1, 2, 1, 1, 0, 2, 1, 2, 2, 1, 2, 1, 1, 0}, next = {0x200000002, 0x200000002}, longer = 2, lock = {val = 0}} (gdb) ``` ### Possible Solutions Further analysis of the relevant source code around dp_init_relative_weights() and the way it was reused with congestion control. -- 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/1649

5 years, 9 months

git:master:2bfef639: dispatcher: test pkg malloc return in relative weights function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2bfef63949f2577a7b7ff80bbcc97250884dd26f URL: https://github.com/kamailio/kamailio/commit/2bfef63949f2577a7b7ff80bbcc9725… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-25T13:08:18+02:00 dispatcher: test pkg malloc return in relative weights function - declare vars at the beginning --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/2bfef63949f2577a7b7ff80bbcc9725… Patch: https://github.com/kamailio/kamailio/commit/2bfef63949f2577a7b7ff80bbcc9725… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 70dc2d4919..b5677af058 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -532,17 +532,32 @@ int dp_init_relative_weights(ds_set_t *dset) int j; int k; int t; + int *ds_dests_flags = NULL; + int *ds_dests_rweights = NULL; + int current_slice; + int rw_sum; + unsigned int last_insert; if(dset == NULL || dset->dlist == NULL || dset->nr < 2) return -1; /* local copy to avoid syncronization problems */ - int *ds_dests_flags = pkg_malloc(sizeof(int) * dset->nr); - int *ds_dests_rweights = pkg_malloc(sizeof(int) * dset->nr); + ds_dests_flags = pkg_malloc(sizeof(int) * dset->nr); + if(ds_dests_flags == NULL) { + LM_ERR("no more pkg\n"); + return -1; + } + ds_dests_rweights = pkg_malloc(sizeof(int) * dset->nr); + if(ds_dests_rweights == NULL) { + LM_ERR("no more pkg\n"); + pkg_free(ds_dests_flags); + return -1; + } + /* needed to sync the rwlist access */ lock_get(&dset->lock); - int rw_sum = 0; + rw_sum = 0; /* find the sum of relative weights */ for(j = 0; j < dset->nr; j++) { ds_dests_flags[j] = dset->dlist[j].flags; @@ -561,8 +576,8 @@ int dp_init_relative_weights(ds_set_t *dset) if(ds_skip_dst(ds_dests_flags[j])) continue; - int current_slice = - ds_dests_rweights[j] * 100 / rw_sum; //truncate here; + current_slice = + ds_dests_rweights[j] * 100 / rw_sum; /* truncate here */ LM_DBG("rw_sum[%d][%d][%d]\n",j, rw_sum, current_slice); for(k = 0; k < current_slice; k++) { dset->rwlist[t] = (unsigned int)j; @@ -572,8 +587,7 @@ int dp_init_relative_weights(ds_set_t *dset) /* if the array was not completely filled (i.e., the sum of rweights is * less than 100 due to truncated), then use last address to fill the rest */ - unsigned int last_insert = - t > 0 ? dset->rwlist[t - 1] : (unsigned int)(dset->nr - 1); + last_insert = t > 0 ? dset->rwlist[t - 1] : (unsigned int)(dset->nr - 1); for(j = t; j < 100; j++) dset->rwlist[j] = last_insert;

5 years, 9 months

[kamailio/kamailio] dispatcher: fix syncronization problem with (#1650)

by Julien Chavanton

relative weight based load distribution, issue #1649 #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #1649 #### Description synchronization problem in dispatcher relative weight based distribution You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1650 -- Commit Summary -- * dispatcher: fix syncronization problem with -- File Changes -- M src/modules/dispatcher/dispatch.c (30) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1650.patch https://github.com/kamailio/kamailio/pull/1650.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/1650

5 years, 9 months

git:master:b0e12c7e: Merge pull request #1650 from jchavanton/issue_1649

by GitHub

Module: kamailio Branch: master Commit: b0e12c7ede93a47cc3912285a5ee4eef647f0b69 URL: https://github.com/kamailio/kamailio/commit/b0e12c7ede93a47cc3912285a5ee4ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-09-25T13:04:23+02:00 Merge pull request #1650 from jchavanton/issue_1649 dispatcher: fix syncronization problem with --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/b0e12c7ede93a47cc3912285a5ee4ee… Patch: https://github.com/kamailio/kamailio/commit/b0e12c7ede93a47cc3912285a5ee4ee… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 20077f1506..70dc2d4919 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -533,31 +533,36 @@ int dp_init_relative_weights(ds_set_t *dset) int k; int t; - if(dset == NULL || dset->dlist == NULL) + if(dset == NULL || dset->dlist == NULL || dset->nr < 2) return -1; + /* local copy to avoid syncronization problems */ + int *ds_dests_flags = pkg_malloc(sizeof(int) * dset->nr); + int *ds_dests_rweights = pkg_malloc(sizeof(int) * dset->nr); + + /* needed to sync the rwlist access */ lock_get(&dset->lock); int rw_sum = 0; - /* find the sum of relative weights*/ + /* find the sum of relative weights */ for(j = 0; j < dset->nr; j++) { - if(ds_skip_dst(dset->dlist[j].flags)) + ds_dests_flags[j] = dset->dlist[j].flags; + ds_dests_rweights[j] = dset->dlist[j].attrs.rweight; + if(ds_skip_dst(ds_dests_flags[j])) continue; - rw_sum += dset->dlist[j].attrs.rweight; + rw_sum += ds_dests_rweights[j]; } - if(rw_sum == 0) { - lock_release(&dset->lock); - return 0; - } + if(rw_sum == 0) + goto ret; /* fill the array based on the relative weight of each destination */ t = 0; for(j = 0; j < dset->nr; j++) { - if(ds_skip_dst(dset->dlist[j].flags)) + if(ds_skip_dst(ds_dests_flags[j])) continue; int current_slice = - dset->dlist[j].attrs.rweight * 100 / rw_sum; //truncate here; + ds_dests_rweights[j] * 100 / rw_sum; //truncate here; LM_DBG("rw_sum[%d][%d][%d]\n",j, rw_sum, current_slice); for(k = 0; k < current_slice; k++) { dset->rwlist[t] = (unsigned int)j; @@ -577,7 +582,12 @@ int dp_init_relative_weights(ds_set_t *dset) * sending first 20 calls to it, but ensure that within a 100 calls, * 20 go to first address */ shuffle_uint100array(dset->rwlist); + goto ret; + +ret: lock_release(&dset->lock); + pkg_free(ds_dests_flags); + pkg_free(ds_dests_rweights); return 0; }

5 years, 9 months

git:master:fe35aab4: dispatcher: fix syncronization problem with

by Julien Chavanton

Module: kamailio Branch: master Commit: fe35aab46536e7ccc709ea8556049b675bcc8d2b URL: https://github.com/kamailio/kamailio/commit/fe35aab46536e7ccc709ea8556049b6… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2018-09-24T08:56:26-07:00 dispatcher: fix syncronization problem with relative weight based load distribution, issue #1649 --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/fe35aab46536e7ccc709ea8556049b6… Patch: https://github.com/kamailio/kamailio/commit/fe35aab46536e7ccc709ea8556049b6… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 20077f1506..70dc2d4919 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -533,31 +533,36 @@ int dp_init_relative_weights(ds_set_t *dset) int k; int t; - if(dset == NULL || dset->dlist == NULL) + if(dset == NULL || dset->dlist == NULL || dset->nr < 2) return -1; + /* local copy to avoid syncronization problems */ + int *ds_dests_flags = pkg_malloc(sizeof(int) * dset->nr); + int *ds_dests_rweights = pkg_malloc(sizeof(int) * dset->nr); + + /* needed to sync the rwlist access */ lock_get(&dset->lock); int rw_sum = 0; - /* find the sum of relative weights*/ + /* find the sum of relative weights */ for(j = 0; j < dset->nr; j++) { - if(ds_skip_dst(dset->dlist[j].flags)) + ds_dests_flags[j] = dset->dlist[j].flags; + ds_dests_rweights[j] = dset->dlist[j].attrs.rweight; + if(ds_skip_dst(ds_dests_flags[j])) continue; - rw_sum += dset->dlist[j].attrs.rweight; + rw_sum += ds_dests_rweights[j]; } - if(rw_sum == 0) { - lock_release(&dset->lock); - return 0; - } + if(rw_sum == 0) + goto ret; /* fill the array based on the relative weight of each destination */ t = 0; for(j = 0; j < dset->nr; j++) { - if(ds_skip_dst(dset->dlist[j].flags)) + if(ds_skip_dst(ds_dests_flags[j])) continue; int current_slice = - dset->dlist[j].attrs.rweight * 100 / rw_sum; //truncate here; + ds_dests_rweights[j] * 100 / rw_sum; //truncate here; LM_DBG("rw_sum[%d][%d][%d]\n",j, rw_sum, current_slice); for(k = 0; k < current_slice; k++) { dset->rwlist[t] = (unsigned int)j; @@ -577,7 +582,12 @@ int dp_init_relative_weights(ds_set_t *dset) * sending first 20 calls to it, but ensure that within a 100 calls, * 20 go to first address */ shuffle_uint100array(dset->rwlist); + goto ret; + +ret: lock_release(&dset->lock); + pkg_free(ds_dests_flags); + pkg_free(ds_dests_rweights); return 0; }

5 years, 9 months

git:master:b4b358f1: db_redis: Makefile - added -I/usr/include/hiredis for old distro

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b4b358f1fe79362babe637921666b3d6001407b4 URL: https://github.com/kamailio/kamailio/commit/b4b358f1fe79362babe637921666b3d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-25T10:09:15+02:00 db_redis: Makefile - added -I/usr/include/hiredis for old distro --- Modified: src/modules/db_redis/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/b4b358f1fe79362babe637921666b3d… Patch: https://github.com/kamailio/kamailio/commit/b4b358f1fe79362babe637921666b3d… --- diff --git a/src/modules/db_redis/Makefile b/src/modules/db_redis/Makefile index 8e7ad1f74b..bf3b66e8fb 100644 --- a/src/modules/db_redis/Makefile +++ b/src/modules/db_redis/Makefile @@ -16,7 +16,7 @@ ifeq ($(HIREDIS_BUILDER),) HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis HIREDISLIBS=-L$(LOCALBASE)/lib -lhiredis else - HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) + HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) -I/usr/include/hiredis HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs) ifeq ($(HIREDISLIBS),-L -lhiredis)

5 years, 9 months

git:master:806bf49b: ndb_redis: Makefile - added -I/usr/include/hiredis for old distro

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 806bf49bc9142c80f991d8441c84d7ba5316c0c3 URL: https://github.com/kamailio/kamailio/commit/806bf49bc9142c80f991d8441c84d7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-25T10:06:41+02:00 ndb_redis: Makefile - added -I/usr/include/hiredis for old distro --- Modified: src/modules/ndb_redis/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/806bf49bc9142c80f991d8441c84d7b… Patch: https://github.com/kamailio/kamailio/commit/806bf49bc9142c80f991d8441c84d7b… --- diff --git a/src/modules/ndb_redis/Makefile b/src/modules/ndb_redis/Makefile index e426088489..58a476ecd5 100644 --- a/src/modules/ndb_redis/Makefile +++ b/src/modules/ndb_redis/Makefile @@ -16,7 +16,7 @@ ifeq ($(HIREDIS_BUILDER),) HIREDISDEFS=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/hiredis HIREDISLIBS=-L$(LOCALBASE)/lib -lhiredis else - HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) + HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) -I/usr/include/hiredis HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs) ifeq ($(HIREDISLIBS),-L -lhiredis)

5 years, 9 months

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

by Kamailio Dev

Module: kamailio Branch: master Commit: c8daa313031a9560670f829c4bdd482058f3d303 URL: https://github.com/kamailio/kamailio/commit/c8daa313031a9560670f829c4bdd482… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-25T09:01:59+02:00 modules: readme files regenerated - ndb_redis ... [skip ci] --- Modified: src/modules/ndb_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/c8daa313031a9560670f829c4bdd482… Patch: https://github.com/kamailio/kamailio/commit/c8daa313031a9560670f829c4bdd482… --- diff --git a/src/modules/ndb_redis/README b/src/modules/ndb_redis/README index 90f51516e6..2ca2c52c58 100644 --- a/src/modules/ndb_redis/README +++ b/src/modules/ndb_redis/README @@ -355,6 +355,10 @@ modparam("ndb_redis", "allow_dynamic_nodes", 1) The first value[n] references the element in the first array, while the next key references an element of the referenced array. + The result type can be compared with $redisd(key) variable to test its + value. The key can be: rpl_str, rpl_arr, rpl_int, rpl_err, rpl_sts, + rpl_nil. + Example 1.10. redis_cmd usage ... if(redis_cmd("srvN", "INCR cnt", "r")) {

5 years, 9 months

git:master:4b5ad867: ndb_redis: note about $redisd(key) variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4b5ad86748a4f53ec1ca3d0043984cfdcef0ae75 URL: https://github.com/kamailio/kamailio/commit/4b5ad86748a4f53ec1ca3d0043984cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-25T08:47:08+02:00 ndb_redis: note about $redisd(key) variable --- Modified: src/modules/ndb_redis/doc/ndb_redis_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4b5ad86748a4f53ec1ca3d0043984cf… Patch: https://github.com/kamailio/kamailio/commit/4b5ad86748a4f53ec1ca3d0043984cf… --- diff --git a/src/modules/ndb_redis/doc/ndb_redis_admin.xml b/src/modules/ndb_redis/doc/ndb_redis_admin.xml index 8a4646cc39..e71ce806a1 100644 --- a/src/modules/ndb_redis/doc/ndb_redis_admin.xml +++ b/src/modules/ndb_redis/doc/ndb_redis_admin.xml @@ -362,6 +362,10 @@ modparam("ndb_redis", "allow_dynamic_nodes", 1) 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. </para> + <para> + The result type can be compared with $redisd(key) variable to test + its value. The key can be: rpl_str, rpl_arr, rpl_int, rpl_err, rpl_sts, rpl_nil. + </para> <example> <title><function>redis_cmd</function> usage</title> <programlisting format="linespecific"> @@ -413,23 +417,23 @@ if (redis_cmd("srvN", "EXEC", "r")) { <function moreinfo="none">redis_pipe_cmd(srvname, command, ..., replyid)</function> </title> <para> - Add a command to be sent to REDIS server identified by srvname. - All the commands will be stored in a buffer until a call to - redis_execute is made. When calling redis_execute the stored commands + Add a command to be sent to REDIS server identified by srvname. + All the commands will be stored in a buffer until a call to + redis_execute is made. When calling redis_execute the stored commands are sent using the pipelining functionality of redis. The replies - will be stored in local containers identified by the replyid of each + will be stored in local containers identified by the replyid of each added command. All the parameters can be strings with pseudo-variables that are evaluated at runtime. </para> <para> - This command is similar in syntax with redis_cmd, the only difference + This command is similar in syntax with redis_cmd, the only difference is that it does not send the command but instead appends it to a buffer. </para> <para> See examples from redis_execute. </para> <para> - Note: Pipelining feature is incompatible with the clustering feature. + Note: Pipelining feature is incompatible with the clustering feature. If cluster parameter is set to 1, this function will log an error and do nothing. </para> </section> @@ -438,20 +442,20 @@ if (redis_cmd("srvN", "EXEC", "r")) { <function moreinfo="none">redis_execute(srvname)</function> </title> <para> - Sends commands to REDIS server identified by srvname. Commands are added + Sends commands to REDIS server identified by srvname. Commands are added with redis_pipe_cmd function, and will be stored for an existing REDIS server. When this function is called all the commands will be sent in a single message to the REDIS server. </para> <para> - When using redis_cmd together with redis_pipe_cmd it is recommended that a call to + When using redis_cmd together with redis_pipe_cmd it is recommended that a call to redis_execute is made before calling redis_cmd in case there are pipelined commands, otherwise when calling redis_cmd, if pipelined messages exist, a call to redis_execute - is made automatically and a warning message is logged. + is made automatically and a warning message is logged. </para> <para> - Note: Pipelining feature is incompatible with the clustering feature. + Note: Pipelining feature is incompatible with the clustering feature. If cluster parameter is set to 1, this function will log an error and do nothing. </para> <example> @@ -475,7 +479,7 @@ Using both redis_cmd and redis_pipe_cmd: redis_pipe_cmd("srvA", "SET ruri $ru", "r2"); - redis_execute("srvA"); //send commands to srvA and wait for reply. Store replies in r1 and r2 + redis_execute("srvA"); //send commands to srvA and wait for reply. Store replies in r1 and r2 redis_cmd("srvA", "GET foo", "r3"); //send command, wait for reply and store it in r3

5 years, 9 months

git:master:52a08a73: ndb_redis: $redisd(...) - pv that exports defined values by redis lib

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 52a08a7375a86966b9f179b8e416eea1e06f7973 URL: https://github.com/kamailio/kamailio/commit/52a08a7375a86966b9f179b8e416eea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-25T08:23:33+02:00 ndb_redis: $redisd(...) - pv that exports defined values by redis lib --- Modified: src/modules/ndb_redis/ndb_redis_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/52a08a7375a86966b9f179b8e416eea… Patch: https://github.com/kamailio/kamailio/commit/52a08a7375a86966b9f179b8e416eea… --- diff --git a/src/modules/ndb_redis/ndb_redis_mod.c b/src/modules/ndb_redis/ndb_redis_mod.c index c95d3b0342..ffb18a9eeb 100644 --- a/src/modules/ndb_redis/ndb_redis_mod.c +++ b/src/modules/ndb_redis/ndb_redis_mod.c @@ -83,10 +83,15 @@ int bind_ndb_redis(ndb_redis_api_t *api); static int pv_get_redisc(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); static int pv_parse_redisc_name(pv_spec_p sp, str *in); +static int pv_get_rediscd(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); +static int pv_parse_rediscd_name(pv_spec_p sp, str *in); static pv_export_t mod_pvs[] = { { {"redis", sizeof("redis")-1}, PVT_OTHER, pv_get_redisc, 0, pv_parse_redisc_name, 0, 0, 0 }, + { {"redisd", sizeof("redisd")-1}, PVT_OTHER, pv_get_rediscd, 0, + pv_parse_rediscd_name, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; @@ -915,6 +920,71 @@ static int pv_get_redisc(struct sip_msg *msg, pv_param_t *param, } } +/** + * + */ +int pv_parse_rediscd_name(pv_spec_p sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + switch(in->len) + { + case 7: + if(strncmp(in->s, "rpl_str", 7)==0) + sp->pvp.pvn.u.isname.name.n = 0; + else if(strncmp(in->s, "rpl_arr", 7)==0) + sp->pvp.pvn.u.isname.name.n = 1; + else if(strncmp(in->s, "rpl_int", 7)==0) + sp->pvp.pvn.u.isname.name.n = 2; + else if(strncmp(in->s, "rpl_nil", 7)==0) + sp->pvp.pvn.u.isname.name.n = 3; + else if(strncmp(in->s, "rpl_sts", 7)==0) + sp->pvp.pvn.u.isname.name.n = 4; + else if(strncmp(in->s, "rpl_err", 7)==0) + sp->pvp.pvn.u.isname.name.n = 5; + else goto error; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown redisd name %.*s\n", in->len, in->s); + return -1; +} + +/** + * + */ +int pv_get_rediscd(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(param==NULL) + return -1; + switch(param->pvn.u.isname.name.n) + { + case 0: + return pv_get_uintval(msg, param, res, REDIS_REPLY_STRING); + case 1: + return pv_get_uintval(msg, param, res, REDIS_REPLY_ARRAY); + case 2: + return pv_get_uintval(msg, param, res, REDIS_REPLY_INTEGER); + case 3: + return pv_get_uintval(msg, param, res, REDIS_REPLY_NIL); + case 4: + return pv_get_uintval(msg, param, res, REDIS_REPLY_STATUS); + case 5: + return pv_get_uintval(msg, param, res, REDIS_REPLY_ERROR); + default: + return pv_get_uintval(msg, param, res, 0); + } +} + /** * @brief bind functions to NDB_REDIS API structure */

5 years, 9 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2018