sr-dev

sr-dev@lists.kamailio.org

15 participants
45332 discussions

[kamailio/kamailio] keepalive: update rpc response to include current state (#2323)
by Kinshuk Bairagi 12 May '20

12 May '20

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Expose current state of keepalive monitor in rpc response so that the response can be parsed easlily and used to populate external dashboards You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2323 -- Commit Summary -- * keepalive: update rpc response -- File Changes -- M src/modules/keepalive/keepalive_rpc.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2323.patch https://github.com/kamailio/kamailio/pull/2323.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/2323

2 3

git:master:2372dc93: Merge pull request #2323 from voiceip/keepalive-rpc-change
by GitHub 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 2372dc933926611dad22812e0d550ae736249a06 URL: https://github.com/kamailio/kamailio/commit/2372dc933926611dad22812e0d550ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-05-12T14:05:27+02:00 Merge pull request #2323 from voiceip/keepalive-rpc-change keepalive: update rpc response to include current state --- Modified: src/modules/keepalive/keepalive_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/2372dc933926611dad22812e0d550ae… Patch: https://github.com/kamailio/kamailio/commit/2372dc933926611dad22812e0d550ae… --- diff --git a/src/modules/keepalive/keepalive_rpc.c b/src/modules/keepalive/keepalive_rpc.c index 8d9a84a428..3a72b31474 100644 --- a/src/modules/keepalive/keepalive_rpc.c +++ b/src/modules/keepalive/keepalive_rpc.c @@ -96,6 +96,7 @@ static void keepalive_rpc_list(rpc_t *rpc, void *ctx) _dtime = ctime(&dest->last_down); _dtime[strlen(_dtime) - 1] = '\0'; rpc->struct_add(sub, "s", "last down", _dtime); + rpc->struct_add(sub, "d", "state", (int) dest->state); } return;

1 0

git:master:7ae22f68: keepalive: update rpc response
by kinshuk.bairagi 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 7ae22f6872cc3f74fecb0ebee797ff3f80c34fd3 URL: https://github.com/kamailio/kamailio/commit/7ae22f6872cc3f74fecb0ebee797ff3… Author: kinshuk.bairagi <me(a)kinshuk.in> Committer: kinshuk.bairagi <me(a)kinshuk.in> Date: 2020-05-11T17:53:28+05:30 keepalive: update rpc response - Adds current state as part of rpc response per destination wise --- Modified: src/modules/keepalive/keepalive_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/7ae22f6872cc3f74fecb0ebee797ff3… Patch: https://github.com/kamailio/kamailio/commit/7ae22f6872cc3f74fecb0ebee797ff3… --- diff --git a/src/modules/keepalive/keepalive_rpc.c b/src/modules/keepalive/keepalive_rpc.c index 136a150c95..cdf8008541 100644 --- a/src/modules/keepalive/keepalive_rpc.c +++ b/src/modules/keepalive/keepalive_rpc.c @@ -96,6 +96,7 @@ static void keepalive_rpc_list(rpc_t *rpc, void *ctx) _dtime = ctime(&dest->last_down); _dtime[strlen(_dtime) - 1] = '\0'; rpc->struct_add(sub, "s", "last down", _dtime); + rpc->struct_add(sub, "d", "state", (int) dest->state); } return;

1 0

[kamailio/kamailio] ndb_redis: add sentinel support to reconnection logic (#2319)
by Carlos Cruz Luengo 12 May '20

12 May '20

#### 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: - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description This PR replicates sentinel logic added in initial redis connection (via cc8e621) into reconnection function. This way, in case of loosing connection with Redis, Kamailio will be able to reconnect to redis asking to sentinel servers defined in modparams. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2319 -- Commit Summary -- * ndb_redis: add sentinel support to reconnection logic -- File Changes -- M src/modules/ndb_redis/redis_client.c (84) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2319.patch https://github.com/kamailio/kamailio/pull/2319.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/2319

2 2

git:master:62e51095: Merge pull request #2319 from cruzccl/redis-sentinel-reconnection
by GitHub 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 62e510957c28e8b8419f7f65b6a866c1a9d0de5b URL: https://github.com/kamailio/kamailio/commit/62e510957c28e8b8419f7f65b6a866c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-05-12T14:04:21+02:00 Merge pull request #2319 from cruzccl/redis-sentinel-reconnection ndb_redis: add sentinel support to reconnection logic --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/62e510957c28e8b8419f7f65b6a866c… Patch: https://github.com/kamailio/kamailio/commit/62e510957c28e8b8419f7f65b6a866c… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 44460aa2fd..5ad063f89a 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -408,8 +408,11 @@ redisc_server_t *redisc_get_server(str *name) */ int redisc_reconnect_server(redisc_server_t *rsrv) { - char addr[256], pass[256], unix_sock_path[256]; - unsigned int port, db, sock = 0, haspass = 0; + char addr[256], pass[256], unix_sock_path[256], sentinel_group[256]; + unsigned int port, db, sock = 0, haspass = 0, sentinel_master = 1; + char sentinels[MAXIMUM_SENTINELS][256]; + uint8_t sentinels_count = 0; + int i, row; param_t *pit = NULL; struct timeval tv_conn; struct timeval tv_cmd; @@ -442,6 +445,84 @@ int redisc_reconnect_server(redisc_server_t *rsrv) } else if(pit->name.len==4 && strncmp(pit->name.s, "pass", 4)==0) { snprintf(pass, sizeof(pass)-1, "%.*s", pit->body.len, pit->body.s); haspass = 1; + } else if(pit->name.len==14 && strncmp(pit->name.s, + "sentinel_group", 14)==0) { + snprintf(sentinel_group, sizeof(sentinel_group)-1, "%.*s", + pit->body.len, pit->body.s); + } else if(pit->name.len==15 && strncmp(pit->name.s, + "sentinel_master", 15)==0) { + if(str2int(&pit->body, &sentinel_master) < 0) + sentinel_master = 1; + } else if(pit->name.len==8 && strncmp(pit->name.s, + "sentinel", 8)==0) { + if( sentinels_count < MAXIMUM_SENTINELS ){ + snprintf(sentinels[sentinels_count], + sizeof(sentinels[sentinels_count])-1, "%.*s", + pit->body.len, pit->body.s); + sentinels_count++; + } + else { + LM_ERR("too many sentinels, maximum %d supported.\n", + MAXIMUM_SENTINELS); + return -1; + } + } + } + + // if sentinels are provided, we need to connect to them and retrieve the redis server + // address / port + if(sentinels_count > 0) { + for(i= 0; i< sentinels_count; i++) { + char *sentinelAddr = sentinels[i]; + char *pos; + redisContext *redis; + redisReply *res, *res2; + + port = 6379; + if( (pos = strchr(sentinelAddr, ':')) != NULL ) { + port = atoi(pos+1); + pos[i] = '\0'; + } + + redis = redisConnectWithTimeout(sentinelAddr, port, tv_conn); + if( redis ) { + if(sentinel_master != 0) { + res = redisCommand(redis, + "SENTINEL get-master-addr-by-name %s", + sentinel_group); + if( res && (res->type == REDIS_REPLY_ARRAY) + && (res->elements == 2) ) { + strncpy(addr, res->element[0]->str, + res->element[0]->len + 1); + port = atoi(res->element[1]->str); + LM_DBG("sentinel replied: %s:%d\n", addr, port); + } + } + else { + res = redisCommand(redis, "SENTINEL slaves %s", + sentinel_group); + if( res && (res->type == REDIS_REPLY_ARRAY) ) { + for(row = 0; row< res->elements; row++){ + res2 = res->element[row]; + for(i= 0; i< res2->elements; i+= 2) { + if( strncmp(res2->element[i]->str, + "ip", 2) == 0 ) { + strncpy(addr, res2->element[i+1]->str, + res2->element[i+1]->len); + addr[res2->element[i+1]->len] = '\0'; + } + else if( strncmp(res2->element[i]->str, + "port", 4) == 0) { + port = atoi(res2->element[i+1]->str); + break; + } + } + } + LM_DBG("slave for %s: %s:%d\n", sentinel_group, + addr, port); + } + } + } } }

1 0

[kamailio/kamailio] Keepalive/response callback (#2318)
by Nacho G. 12 May '20

12 May '20

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [x] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This change allows you to set a new callback for keepalive that will be executed each time it receives a response for an OPTIONS message. This change is compatible (not breaking) with .cfg or kemi invocations, but it's breaking developers api. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2318 -- Commit Summary -- * keepalive: Added callback to run on each destination response. * drouting: update to new keepalive interface, using new on response callback -- File Changes -- M src/modules/drouting/drouting.c (2) M src/modules/keepalive/api.h (3) M src/modules/keepalive/doc/keepalive.xml (1) M src/modules/keepalive/doc/keepalive_devel.xml (32) M src/modules/keepalive/keepalive.h (7) M src/modules/keepalive/keepalive_api.c (5) M src/modules/keepalive/keepalive_core.c (3) M src/modules/keepalive/keepalive_mod.c (6) M src/modules/keepalive/keepalive_rpc.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2318.patch https://github.com/kamailio/kamailio/pull/2318.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/2318

2 2

git:master:2373495a: Merge pull request #2318 from NGSegovia/keepalive/response_callback
by GitHub 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 2373495a3f79509a2f79830da0105d02bf1b649e URL: https://github.com/kamailio/kamailio/commit/2373495a3f79509a2f79830da0105d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-05-12T14:02:18+02:00 Merge pull request #2318 from NGSegovia/keepalive/response_callback Keepalive/response callback --- Modified: src/modules/drouting/drouting.c Modified: src/modules/keepalive/api.h Modified: src/modules/keepalive/doc/keepalive.xml Modified: src/modules/keepalive/doc/keepalive_devel.xml Modified: src/modules/keepalive/keepalive.h Modified: src/modules/keepalive/keepalive_api.c Modified: src/modules/keepalive/keepalive_core.c Modified: src/modules/keepalive/keepalive_mod.c Modified: src/modules/keepalive/keepalive_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/2373495a3f79509a2f79830da0105d0… Patch: https://github.com/kamailio/kamailio/commit/2373495a3f79509a2f79830da0105d0…

1 0

git:master:9700a8da: keepalive: Added callback to run on each destination response.
by Nacho Garcia Segovia 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 9700a8dae237758e162e509455bc3a62b19730f4 URL: https://github.com/kamailio/kamailio/commit/9700a8dae237758e162e509455bc3a6… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Date: 2020-05-07T23:50:10+02:00 keepalive: Added callback to run on each destination response. - This functionality it's just available when using api.h bindings. For exported functions no callback will be used, so this doesn't break cfg or rpc api. - Modified add_destination function to provide this new callback as a parameter. --- Modified: src/modules/keepalive/api.h Modified: src/modules/keepalive/doc/keepalive.xml Modified: src/modules/keepalive/doc/keepalive_devel.xml Modified: src/modules/keepalive/keepalive.h Modified: src/modules/keepalive/keepalive_api.c Modified: src/modules/keepalive/keepalive_core.c Modified: src/modules/keepalive/keepalive_mod.c Modified: src/modules/keepalive/keepalive_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/9700a8dae237758e162e509455bc3a6… Patch: https://github.com/kamailio/kamailio/commit/9700a8dae237758e162e509455bc3a6…

1 0

git:master:9cd73c58: drouting: update to new keepalive interface, using new on response callback
by Nacho Garcia Segovia 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 9cd73c58239e50574d73d88792240a4ca569d709 URL: https://github.com/kamailio/kamailio/commit/9cd73c58239e50574d73d88792240a4… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Date: 2020-05-07T23:50:20+02:00 drouting: update to new keepalive interface, using new on response callback - Changes required because of dependencies from module keepalive. --- Modified: src/modules/drouting/drouting.c --- Diff: https://github.com/kamailio/kamailio/commit/9cd73c58239e50574d73d88792240a4… Patch: https://github.com/kamailio/kamailio/commit/9cd73c58239e50574d73d88792240a4… --- diff --git a/src/modules/drouting/drouting.c b/src/modules/drouting/drouting.c index 4fd0786ffe..394049ac51 100644 --- a/src/modules/drouting/drouting.c +++ b/src/modules/drouting/drouting.c @@ -223,7 +223,7 @@ static int dr_update_keepalive(pgw_t *addrs) for(cur = addrs; cur != NULL; cur = cur->next) { LM_DBG("uri: %.*s\n", cur->ip.len, cur->ip.s); keepalive_api.add_destination( - &cur->ip, &owner, 0, 0, dr_keepalive_statechanged, cur); + &cur->ip, &owner, 0, 0, dr_keepalive_statechanged, 0, cur); } return 0;

1 0

git:master:66aebfd6: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 66aebfd65be6b6f9645413b1c2cff932c9dfc2dd URL: https://github.com/kamailio/kamailio/commit/66aebfd65be6b6f9645413b1c2cff93… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-12T10:31:19+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/66aebfd65be6b6f9645413b1c2cff93… Patch: https://github.com/kamailio/kamailio/commit/66aebfd65be6b6f9645413b1c2cff93…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev