sr-dev May 2017

sr-dev@lists.kamailio.org

32 participants
298 discussions

git:4.4:d480941d: msrp: fix missed break in parsing pv name

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: d480941d52756a974e9f473b0474e4675c84f862 URL: https://github.com/kamailio/kamailio/commit/d480941d52756a974e9f473b0474e46… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-06T09:19:16+02:00 msrp: fix missed break in parsing pv name - closes GH #1122 (cherry picked from commit c32ba91fbbe59e144ddcb40be33b3379bcf3d64d) (cherry picked from commit 1686d9d7519a3a72293245687d307f0d99a2b503) --- Modified: modules/msrp/msrp_vars.c --- Diff: https://github.com/kamailio/kamailio/commit/d480941d52756a974e9f473b0474e46… Patch: https://github.com/kamailio/kamailio/commit/d480941d52756a974e9f473b0474e46… --- diff --git a/modules/msrp/msrp_vars.c b/modules/msrp/msrp_vars.c index 98452fe..6cbf1a6 100644 --- a/modules/msrp/msrp_vars.c +++ b/modules/msrp/msrp_vars.c @@ -46,12 +46,12 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) switch(in->len) { - case 3: + case 3: if(strncmp(in->s, "buf", 3)==0) sp->pvp.pvn.u.isname.name.n = 1; else goto error; break; - case 4: + case 4: if(strncmp(in->s, "body", 4)==0) sp->pvp.pvn.u.isname.name.n = 2; else if(strncmp(in->s, "code", 4)==0) @@ -66,6 +66,7 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) else if(strncmp(in->s, "conid", 5)==0) sp->pvp.pvn.u.isname.name.n = 21; else goto error; + break; case 6: if(strncmp(in->s, "method", 6)==0) sp->pvp.pvn.u.isname.name.n = 6; @@ -79,7 +80,7 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 12; else goto error; break; - case 7: + case 7: if(strncmp(in->s, "bodylen", 7)==0) sp->pvp.pvn.u.isname.name.n = 10; else if(strncmp(in->s, "transid", 7)==0) @@ -96,7 +97,7 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 20; else goto error; break; - case 8: + case 8: if(strncmp(in->s, "firsthop", 8)==0) sp->pvp.pvn.u.isname.name.n = 16; else if(strncmp(in->s, "prevhops", 8)==0)

7 years, 6 months

git:5.0:1686d9d7: msrp: fix missed break in parsing pv name

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: 1686d9d7519a3a72293245687d307f0d99a2b503 URL: https://github.com/kamailio/kamailio/commit/1686d9d7519a3a72293245687d307f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-06T09:17:46+02:00 msrp: fix missed break in parsing pv name - closes GH #1122 (cherry picked from commit c32ba91fbbe59e144ddcb40be33b3379bcf3d64d) --- Modified: src/modules/msrp/msrp_vars.c --- Diff: https://github.com/kamailio/kamailio/commit/1686d9d7519a3a72293245687d307f0… Patch: https://github.com/kamailio/kamailio/commit/1686d9d7519a3a72293245687d307f0… --- diff --git a/src/modules/msrp/msrp_vars.c b/src/modules/msrp/msrp_vars.c index 3267bc5..fddabde 100644 --- a/src/modules/msrp/msrp_vars.c +++ b/src/modules/msrp/msrp_vars.c @@ -46,12 +46,12 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) switch(in->len) { - case 3: + case 3: if(strncmp(in->s, "buf", 3)==0) sp->pvp.pvn.u.isname.name.n = 1; else goto error; break; - case 4: + case 4: if(strncmp(in->s, "body", 4)==0) sp->pvp.pvn.u.isname.name.n = 2; else if(strncmp(in->s, "code", 4)==0) @@ -66,6 +66,7 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) else if(strncmp(in->s, "conid", 5)==0) sp->pvp.pvn.u.isname.name.n = 21; else goto error; + break; case 6: if(strncmp(in->s, "method", 6)==0) sp->pvp.pvn.u.isname.name.n = 6; @@ -79,7 +80,7 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 12; else goto error; break; - case 7: + case 7: if(strncmp(in->s, "bodylen", 7)==0) sp->pvp.pvn.u.isname.name.n = 10; else if(strncmp(in->s, "transid", 7)==0) @@ -96,7 +97,7 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 20; else goto error; break; - case 8: + case 8: if(strncmp(in->s, "firsthop", 8)==0) sp->pvp.pvn.u.isname.name.n = 16; else if(strncmp(in->s, "prevhops", 8)==0)

7 years, 6 months

git:master:c32ba91f: msrp: fix missed break in parsing pv name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c32ba91fbbe59e144ddcb40be33b3379bcf3d64d URL: https://github.com/kamailio/kamailio/commit/c32ba91fbbe59e144ddcb40be33b337… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-06T08:58:25+02:00 msrp: fix missed break in parsing pv name - closes GH #1122 --- Modified: src/modules/msrp/msrp_vars.c --- Diff: https://github.com/kamailio/kamailio/commit/c32ba91fbbe59e144ddcb40be33b337… Patch: https://github.com/kamailio/kamailio/commit/c32ba91fbbe59e144ddcb40be33b337… --- diff --git a/src/modules/msrp/msrp_vars.c b/src/modules/msrp/msrp_vars.c index 3267bc5..fddabde 100644 --- a/src/modules/msrp/msrp_vars.c +++ b/src/modules/msrp/msrp_vars.c @@ -46,12 +46,12 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) switch(in->len) { - case 3: + case 3: if(strncmp(in->s, "buf", 3)==0) sp->pvp.pvn.u.isname.name.n = 1; else goto error; break; - case 4: + case 4: if(strncmp(in->s, "body", 4)==0) sp->pvp.pvn.u.isname.name.n = 2; else if(strncmp(in->s, "code", 4)==0) @@ -66,6 +66,7 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) else if(strncmp(in->s, "conid", 5)==0) sp->pvp.pvn.u.isname.name.n = 21; else goto error; + break; case 6: if(strncmp(in->s, "method", 6)==0) sp->pvp.pvn.u.isname.name.n = 6; @@ -79,7 +80,7 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 12; else goto error; break; - case 7: + case 7: if(strncmp(in->s, "bodylen", 7)==0) sp->pvp.pvn.u.isname.name.n = 10; else if(strncmp(in->s, "transid", 7)==0) @@ -96,7 +97,7 @@ int pv_parse_msrp_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 20; else goto error; break; - case 8: + case 8: if(strncmp(in->s, "firsthop", 8)==0) sp->pvp.pvn.u.isname.name.n = 16; else if(strncmp(in->s, "prevhops", 8)==0)

7 years, 6 months

git:master:d268d935: misc/examples: fixed typo in sqlang kemi example

by GitHub

Module: kamailio Branch: master Commit: d268d935a4e1e92389ef1c7299f83933c23e6d91 URL: https://github.com/kamailio/kamailio/commit/d268d935a4e1e92389ef1c7299f8393… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-05-06T08:10:44+02:00 misc/examples: fixed typo in sqlang kemi example --- Modified: misc/examples/kemi/kamailio-basic-kemi-sqlang.sq --- Diff: https://github.com/kamailio/kamailio/commit/d268d935a4e1e92389ef1c7299f8393… Patch: https://github.com/kamailio/kamailio/commit/d268d935a4e1e92389ef1c7299f8393… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq b/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq index e3c82f9..9eda6a9 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq +++ b/misc/examples/kemi/kamailio-basic-kemi-sqlang.sq @@ -336,7 +336,7 @@ function ksr_route_sipout() KSR.hdr.append_hf("P-Hint: outbound\r\n"); ksr_route_relay(); - KSR.xexit();; + KSR.x.exit(); } // Manage outgoing branches

7 years, 6 months

git:master:0e84e7b1: misc/examples: fixed typo in kemi js example

by GitHub

Module: kamailio Branch: master Commit: 0e84e7b13fa934f47d1c68a2b040109db473e082 URL: https://github.com/kamailio/kamailio/commit/0e84e7b13fa934f47d1c68a2b040109… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-05-06T07:52:43+02:00 misc/examples: fixed typo in kemi js example --- Modified: misc/examples/kemi/kamailio-basic-kemi-jsdt.js --- Diff: https://github.com/kamailio/kamailio/commit/0e84e7b13fa934f47d1c68a2b040109… Patch: https://github.com/kamailio/kamailio/commit/0e84e7b13fa934f47d1c68a2b040109… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js index 733b759..f215176 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-jsdt.js +++ b/misc/examples/kemi/kamailio-basic-kemi-jsdt.js @@ -335,7 +335,7 @@ function ksr_route_sipout() KSR.hdr.append_hf("P-Hint: outbound\r\n"); ksr_route_relay(); - KSR.xexit();; + KSR.x.exit(); } // Manage outgoing branches

7 years, 6 months

git:master:37a2dc07: modules: readme files regenerated - rtpengine ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 37a2dc075a98ea79b44d3e1ea422b65c852d4a09 URL: https://github.com/kamailio/kamailio/commit/37a2dc075a98ea79b44d3e1ea422b65… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-05-05T16:01:21+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/37a2dc075a98ea79b44d3e1ea422b65… Patch: https://github.com/kamailio/kamailio/commit/37a2dc075a98ea79b44d3e1ea422b65…

7 years, 6 months

git:master:1aa2e58f: rtpengine: consume MOS values reported back by RTP proxy

by Richard Fuchs

Module: kamailio Branch: master Commit: 1aa2e58fb5d167c1fd43d3c9ba2f341379983508 URL: https://github.com/kamailio/kamailio/commit/1aa2e58fb5d167c1fd43d3c9ba2f341… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2017-05-05T09:57:44-04:00 rtpengine: consume MOS values reported back by RTP proxy --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/1aa2e58fb5d167c1fd43d3c9ba2f341… Patch: https://github.com/kamailio/kamailio/commit/1aa2e58fb5d167c1fd43d3c9ba2f341…

7 years, 6 months

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

by Kamailio Dev

Module: kamailio Branch: master Commit: ce7c10ca81541137b08ae962008dcef9ecc6f7d9 URL: https://github.com/kamailio/kamailio/commit/ce7c10ca81541137b08ae962008dcef… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-05-05T10:16:21+02:00 modules: readme files regenerated - ndb_redis ... [skip ci] --- Modified: src/modules/ndb_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/ce7c10ca81541137b08ae962008dcef… Patch: https://github.com/kamailio/kamailio/commit/ce7c10ca81541137b08ae962008dcef… --- diff --git a/src/modules/ndb_redis/README b/src/modules/ndb_redis/README index 280a6f4..43d283f 100644 --- a/src/modules/ndb_redis/README +++ b/src/modules/ndb_redis/README @@ -46,6 +46,8 @@ Carsten Bock 3.3. connect_timeout (int) 3.4. cmd_timeout (int) 3.5. cluster (integer) + 3.6. allowed_timeouts (integer) + 3.7. disable_time (integer) 4. Functions @@ -61,9 +63,11 @@ Carsten Bock 1.3. Set connect_timeout parameter 1.4. Set cmd_timeout parameter 1.5. Set cluster parameter - 1.6. redis_cmd usage - 1.7. redis_execute usage - 1.8. redis_free usage + 1.6. Set allowed_timeots parameter + 1.7. Set disable_time parameter + 1.8. redis_cmd usage + 1.9. redis_execute usage + 1.10. redis_free usage Chapter 1. Admin Guide @@ -82,6 +86,8 @@ Chapter 1. Admin Guide 3.3. connect_timeout (int) 3.4. cmd_timeout (int) 3.5. cluster (integer) + 3.6. allowed_timeouts (integer) + 3.7. disable_time (integer) 4. Functions @@ -122,6 +128,8 @@ Chapter 1. Admin Guide 3.3. connect_timeout (int) 3.4. cmd_timeout (int) 3.5. cluster (integer) + 3.6. allowed_timeouts (integer) + 3.7. disable_time (integer) 3.1. server (str) @@ -211,6 +219,46 @@ modparam("ndb_redis", "server", "name=127.0.0.1:26008;addr=127.0.0.1;port=26008" modparam("ndb_redis", "cluster", 1) ... +3.6. allowed_timeouts (integer) + + If this is set to a non-negative value, it sets the number of + consecutive REDIS commands that can fail before temporarily disabling + the REDIS server. This is similar to rtpengine_disable_tout parameter + from the rtpengine module. + + When communicating with a REDIS server, if redis_cmd or redis_execute + will fail for more than “allowed_timeouts” consecutive times, the + server will be temporary disabled for a number of seconds configured by + the “disable_time” parameter. + + Disabling a server means that further redis_cmd and redis_execute + commands will not do anything and return a negative value “-2”. + Messages are also logged when disabling and re-enabling a server. + + The number of consecutive fails are counted by each Kamailio process, + so when disabling a server this is done just for that process, not + globally. + + Default value is “-1” (disabled). + + Example 1.6. Set allowed_timeots parameter +... +modparam("ndb_redis", "allowed_timeouts", 3) +... + +3.7. disable_time (integer) + + If allowed_timeouts is set to a non negative value this determines the + number of seconds the REDIS server will be disabled + + Default value is “0”. + + Example 1.7. Set disable_time parameter +... +modparam("ndb_redis", "allowed_timeouts", 0) +modparam("ndb_redis", "disable_time", 30) +... + 4. Functions 4.1. redis_cmd(srvname, command, ..., replyid) @@ -241,7 +289,7 @@ modparam("ndb_redis", "cluster", 1) * value[n] - returns value of the nth element. value - returns null for an array. You need to get each element by index. - Example 1.6. redis_cmd usage + Example 1.8. redis_cmd usage ... if(redis_cmd("srvN", "INCR cnt", "r")) { # success - the incremented value is in $redis(r=>value) @@ -310,7 +358,7 @@ if(redis_cmd("srvN", "HMGET foo_key field1 field3", "r")) { If cluster parameter is set to 1, this function will log an error and do nothing. - Example 1.7. redis_execute usage + Example 1.9. redis_execute usage ... After several redis command calls: redis_pipe_cmd("srvA", "SET foo bar", "r1"); @@ -358,7 +406,7 @@ d commands. The call is not necessary function. When ndb_redis module closes, all pending replies are freed automatically. - Example 1.8. redis_free usage + Example 1.10. redis_free usage ... After a redis command call: redis_cmd("srvN", "INCR cnt", "r");

7 years, 6 months

git:master:c55ad4e7: Merge pull request #1116 from claudiupb/redis_disable_server

by GitHub

Module: kamailio Branch: master Commit: c55ad4e71041961417370ebcca5d564daca8fa95 URL: https://github.com/kamailio/kamailio/commit/c55ad4e71041961417370ebcca5d564… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-05-05T10:05:12+02:00 Merge pull request #1116 from claudiupb/redis_disable_server ndb_redis: add disable server on failure feature --- 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.c Modified: src/modules/ndb_redis/redis_client.h --- Diff: https://github.com/kamailio/kamailio/commit/c55ad4e71041961417370ebcca5d564… Patch: https://github.com/kamailio/kamailio/commit/c55ad4e71041961417370ebcca5d564…

7 years, 6 months

git:master:395699a8: ndb_redis: rename variables to avoind name conflicts

by Claudiu Boriga

Module: kamailio Branch: master Commit: 395699a80345e5721580ebac3b5944f603acdb32 URL: https://github.com/kamailio/kamailio/commit/395699a80345e5721580ebac3b5944f… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Claudiu Boriga <paul.boriga(a)1and1.ro> Date: 2017-05-05T09:37:29+03:00 ndb_redis: rename variables to avoind name conflicts --- Modified: src/modules/ndb_redis/ndb_redis_mod.c Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/395699a80345e5721580ebac3b5944f… Patch: https://github.com/kamailio/kamailio/commit/395699a80345e5721580ebac3b5944f… --- diff --git a/src/modules/ndb_redis/ndb_redis_mod.c b/src/modules/ndb_redis/ndb_redis_mod.c index 0906aab..6e43849 100644 --- a/src/modules/ndb_redis/ndb_redis_mod.c +++ b/src/modules/ndb_redis/ndb_redis_mod.c @@ -48,8 +48,8 @@ int init_without_redis = 0; int redis_connect_timeout_param = 1000; int redis_cmd_timeout_param = 1000; int redis_cluster_param = 0; -int disable_time=0; -int allowed_timeouts=-1; +int redis_disable_time_param=0; +int redis_allowed_timeouts_param=-1; static int w_redis_cmd3(struct sip_msg* msg, char* ssrv, char* scmd, char* sres); @@ -122,8 +122,8 @@ static param_export_t params[]={ {"connect_timeout", INT_PARAM, &redis_connect_timeout_param}, {"cmd_timeout", INT_PARAM, &redis_cmd_timeout_param}, {"cluster", INT_PARAM, &redis_cluster_param}, - {"disable_time", INT_PARAM, &disable_time}, - {"allowed_timeouts", INT_PARAM, &allowed_timeouts}, + {"disable_time", INT_PARAM, &redis_disable_time_param}, + {"allowed_timeouts", INT_PARAM, &redis_allowed_timeouts_param}, {0, 0, 0} }; diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 728a93d..0bf9838 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -49,8 +49,8 @@ extern int init_without_redis; extern int redis_connect_timeout_param; extern int redis_cmd_timeout_param; extern int redis_cluster_param; -extern int disable_time; -extern int allowed_timeouts; +extern int redis_disable_time_param; +extern int redis_allowed_timeouts_param; /* backwards compatibility with hiredis < 0.12 */ #if (HIREDIS_MAJOR == 0) && (HIREDIS_MINOR < 12) @@ -1043,17 +1043,17 @@ int redis_check_server(redisc_server_t *rsrv) int redis_count_err_and_disable(redisc_server_t *rsrv) { - if (allowed_timeouts < 0) + if (redis_allowed_timeouts_param < 0) { return 0; } rsrv->disable.consecutive_errors++; - if (rsrv->disable.consecutive_errors > allowed_timeouts) + if (rsrv->disable.consecutive_errors > redis_allowed_timeouts_param) { rsrv->disable.disabled=1; - rsrv->disable.restore_tick=get_ticks() + disable_time; - LM_WARN("REDIS server %.*s disabled for %d seconds",rsrv->sname->len,rsrv->sname->s,disable_time); + rsrv->disable.restore_tick=get_ticks() + redis_disable_time_param; + LM_WARN("REDIS server %.*s disabled for %d seconds",rsrv->sname->len,rsrv->sname->s,redis_disable_time_param); return 1; } return 0;

7 years, 6 months

← Newer
1
...
20
21
22
23
24
25
26
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2017