sr-dev May 2020

sr-dev@lists.kamailio.org

24 participants
393 discussions

git:master:b2487d95: ims_usrloc_scscf: extend and fix log messages

by Henning Westerholt

Module: kamailio Branch: master Commit: b2487d95f61b46033eb2825c5f54d5f19ca1e878 URL: https://github.com/kamailio/kamailio/commit/b2487d95f61b46033eb2825c5f54d5f… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-07T14:18:21+02:00 ims_usrloc_scscf: extend and fix log messages --- Modified: src/modules/ims_usrloc_scscf/impurecord.c Modified: src/modules/ims_usrloc_scscf/subscribe.c Modified: src/modules/ims_usrloc_scscf/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/b2487d95f61b46033eb2825c5f54d5f… Patch: https://github.com/kamailio/kamailio/commit/b2487d95f61b46033eb2825c5f54d5f…

4 years, 6 months

[kamailio/kamailio] ims_registrar_scscf: pass event type as parameter (#2296)

by alexyosifov

- pass event type as parameter in notify_subscribers()   #### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2296 -- Commit Summary -- * ims_registrar_scscf: pass event type as parameter -- File Changes -- M src/modules/ims_registrar_scscf/cxdx_callbacks.c (4) M src/modules/ims_registrar_scscf/reg_rpc.c (2) M src/modules/ims_registrar_scscf/registrar_notify.c (6) M src/modules/ims_registrar_scscf/registrar_notify.h (2) M src/modules/ims_registrar_scscf/save.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2296.patch https://github.com/kamailio/kamailio/pull/2296.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/2296

4 years, 6 months

git:master:d35e9768: Merge pull request #2296 from alexyosifov/ims_registrar_scscf_event_reg

by GitHub

Module: kamailio Branch: master Commit: d35e97684ae3dcefa2351172cc477bb11927305d URL: https://github.com/kamailio/kamailio/commit/d35e97684ae3dcefa2351172cc477bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-05-07T13:16:09+02:00 Merge pull request #2296 from alexyosifov/ims_registrar_scscf_event_reg ims_registrar_scscf: pass event type as parameter --- Modified: src/modules/ims_registrar_scscf/cxdx_callbacks.c Modified: src/modules/ims_registrar_scscf/reg_rpc.c Modified: src/modules/ims_registrar_scscf/registrar_notify.c Modified: src/modules/ims_registrar_scscf/registrar_notify.h Modified: src/modules/ims_registrar_scscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/d35e97684ae3dcefa2351172cc477bb… Patch: https://github.com/kamailio/kamailio/commit/d35e97684ae3dcefa2351172cc477bb…

4 years, 6 months

git:master:1c7b7603: ims_registrar_scscf: pass event type as parameter

by Aleksandar Yosifov

Module: kamailio Branch: master Commit: 1c7b7603937cb7f32d6109c22a978bb8efd37e6c URL: https://github.com/kamailio/kamailio/commit/1c7b7603937cb7f32d6109c22a978bb… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2020-04-22T16:25:32+03:00 ims_registrar_scscf: pass event type as parameter - pass event type as parameter in notify_subscribers() --- Modified: src/modules/ims_registrar_scscf/cxdx_callbacks.c Modified: src/modules/ims_registrar_scscf/reg_rpc.c Modified: src/modules/ims_registrar_scscf/registrar_notify.c Modified: src/modules/ims_registrar_scscf/registrar_notify.h Modified: src/modules/ims_registrar_scscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/1c7b7603937cb7f32d6109c22a978bb… Patch: https://github.com/kamailio/kamailio/commit/1c7b7603937cb7f32d6109c22a978bb…

4 years, 6 months

[kamailio/kamailio] ims_registrar_scscf: fix aor generation in lookup() (#2292)

by alexyosifov

- Generate AoR in lookup() from parsed uri user and host. Skipping all user's and host's parameters.   #### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2292 -- Commit Summary -- * ims_registrar_scscf: fix aor generation in lookup() -- File Changes -- M src/modules/ims_registrar_scscf/lookup.c (55) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2292.patch https://github.com/kamailio/kamailio/pull/2292.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/2292

4 years, 6 months

git:master:465211bc: Merge pull request #2292 from alexyosifov/ims_registrar_scscf_lookup_fix

by GitHub

Module: kamailio Branch: master Commit: 465211bc18152c9a4c5b60341a9d02f82971afb0 URL: https://github.com/kamailio/kamailio/commit/465211bc18152c9a4c5b60341a9d02f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-05-07T13:14:53+02:00 Merge pull request #2292 from alexyosifov/ims_registrar_scscf_lookup_fix ims_registrar_scscf: fix aor generation in lookup() --- Modified: src/modules/ims_registrar_scscf/lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/465211bc18152c9a4c5b60341a9d02f… Patch: https://github.com/kamailio/kamailio/commit/465211bc18152c9a4c5b60341a9d02f… --- diff --git a/src/modules/ims_registrar_scscf/lookup.c b/src/modules/ims_registrar_scscf/lookup.c index 0e7b06cf60..640dbb9707 100644 --- a/src/modules/ims_registrar_scscf/lookup.c +++ b/src/modules/ims_registrar_scscf/lookup.c @@ -61,13 +61,12 @@ */ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) { impurecord_t* r; - str aor; + str aor, tmp_aor; ucontact_t* ptr = 0; int res; int ret; str path_dst; flag_t old_bflags; - int i = 0; int ue_type; /*0=any, 1=3gpp, 2=sip */ impu_contact_t *impucontact; @@ -91,29 +90,35 @@ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) { ue_type=0; } - if (_m->new_uri.s) { - aor.s = pkg_malloc(_m->new_uri.len); - if (aor.s == NULL) { - LM_ERR("memory allocation failure\n"); - return -1; - } - memcpy(aor.s, _m->new_uri.s, _m->new_uri.len); - aor.len = _m->new_uri.len; - } else { - aor.s = pkg_malloc(_m->first_line.u.request.uri.len); - if (aor.s == NULL) { - LM_ERR("memory allocation failure\n"); - return -1; - } - memcpy(aor.s, _m->first_line.u.request.uri.s, _m->first_line.u.request.uri.len); - aor.len = _m->first_line.u.request.uri.len; - } - - for (i = 4; i < aor.len; i++) - if (aor.s[i] == ':' || aor.s[i] == ';' || aor.s[i] == '?') { - aor.len = i; - break; - } + if (parse_sip_msg_uri(_m) < 0) { + LM_ERR("Error while parsing the Request-URI\n"); + return -1; + } + + if (_m->new_uri.s) { + tmp_aor = _m->new_uri; + } else { + tmp_aor = _m->first_line.u.request.uri; + } + + aor.s = pkg_malloc(tmp_aor.len); + if (aor.s == NULL) { + LM_ERR("memory allocation failure\n"); + return -1; + } + + // build aor + // add 'sip:' or 'tel:' + memcpy(aor.s, tmp_aor.s, 4); + aor.len = 4; + // add user part + memcpy(aor.s + aor.len, _m->parsed_uri.user.s, _m->parsed_uri.user.len); + aor.len += _m->parsed_uri.user.len; + // add '@' + aor.s[aor.len++] = '@'; + // add host part + memcpy(aor.s + aor.len, _m->parsed_uri.host.s, _m->parsed_uri.host.len); + aor.len += _m->parsed_uri.host.len; LM_DBG("Looking for <%.*s>\n", aor.len, aor.s);

4 years, 6 months

git:master:e53b25f8: ims_registrar_scscf: fix aor generation in lookup()

by Aleksandar Yosifov

Module: kamailio Branch: master Commit: e53b25f89a14aba93d3c48a1b2f983114db1760c URL: https://github.com/kamailio/kamailio/commit/e53b25f89a14aba93d3c48a1b2f9831… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2020-04-21T13:55:36+03:00 ims_registrar_scscf: fix aor generation in lookup() - Generate AoR in lookup() from parsed uri user and host. Skipping all user's and host's parameters. --- Modified: src/modules/ims_registrar_scscf/lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/e53b25f89a14aba93d3c48a1b2f9831… Patch: https://github.com/kamailio/kamailio/commit/e53b25f89a14aba93d3c48a1b2f9831… --- diff --git a/src/modules/ims_registrar_scscf/lookup.c b/src/modules/ims_registrar_scscf/lookup.c index 0e7b06cf60..640dbb9707 100644 --- a/src/modules/ims_registrar_scscf/lookup.c +++ b/src/modules/ims_registrar_scscf/lookup.c @@ -61,13 +61,12 @@ */ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) { impurecord_t* r; - str aor; + str aor, tmp_aor; ucontact_t* ptr = 0; int res; int ret; str path_dst; flag_t old_bflags; - int i = 0; int ue_type; /*0=any, 1=3gpp, 2=sip */ impu_contact_t *impucontact; @@ -91,29 +90,35 @@ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) { ue_type=0; } - if (_m->new_uri.s) { - aor.s = pkg_malloc(_m->new_uri.len); - if (aor.s == NULL) { - LM_ERR("memory allocation failure\n"); - return -1; - } - memcpy(aor.s, _m->new_uri.s, _m->new_uri.len); - aor.len = _m->new_uri.len; - } else { - aor.s = pkg_malloc(_m->first_line.u.request.uri.len); - if (aor.s == NULL) { - LM_ERR("memory allocation failure\n"); - return -1; - } - memcpy(aor.s, _m->first_line.u.request.uri.s, _m->first_line.u.request.uri.len); - aor.len = _m->first_line.u.request.uri.len; - } - - for (i = 4; i < aor.len; i++) - if (aor.s[i] == ':' || aor.s[i] == ';' || aor.s[i] == '?') { - aor.len = i; - break; - } + if (parse_sip_msg_uri(_m) < 0) { + LM_ERR("Error while parsing the Request-URI\n"); + return -1; + } + + if (_m->new_uri.s) { + tmp_aor = _m->new_uri; + } else { + tmp_aor = _m->first_line.u.request.uri; + } + + aor.s = pkg_malloc(tmp_aor.len); + if (aor.s == NULL) { + LM_ERR("memory allocation failure\n"); + return -1; + } + + // build aor + // add 'sip:' or 'tel:' + memcpy(aor.s, tmp_aor.s, 4); + aor.len = 4; + // add user part + memcpy(aor.s + aor.len, _m->parsed_uri.user.s, _m->parsed_uri.user.len); + aor.len += _m->parsed_uri.user.len; + // add '@' + aor.s[aor.len++] = '@'; + // add host part + memcpy(aor.s + aor.len, _m->parsed_uri.host.s, _m->parsed_uri.host.len); + aor.len += _m->parsed_uri.host.len; LM_DBG("Looking for <%.*s>\n", aor.len, aor.s);

4 years, 6 months

git:5.3:39fce673: ndb_redis: redis_cmd() check reply type to detect command errors

by Victor Seva

Module: kamailio Branch: 5.3 Commit: 39fce673e50a52dbb0b1c8c786c98b15e8bdfeb7 URL: https://github.com/kamailio/kamailio/commit/39fce673e50a52dbb0b1c8c786c98b1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-07T13:11:03+02:00 ndb_redis: redis_cmd() check reply type to detect command errors fix #2300 (cherry picked from commit d00b14704805d728f5a845a6af900eff1ed372ac) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/39fce673e50a52dbb0b1c8c786c98b1… Patch: https://github.com/kamailio/kamailio/commit/39fce673e50a52dbb0b1c8c786c98b1… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index a4531801b4..acdc978768 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -953,6 +953,14 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) goto error_exec; } } + + LM_DBG("rpl->rplRedis->type:%d\n", rpl->rplRedis->type); + if(rpl->rplRedis->type == REDIS_REPLY_ERROR) { + LM_ERR("Redis error:%.*s\n", + (int)rpl->rplRedis->len, rpl->rplRedis->str); + goto error_exec; + } + if (check_cluster_reply(rpl->rplRedis, &rsrv)) { LM_DBG("rsrv->ctxRedis = %p\n", rsrv->ctxRedis); if(rsrv->ctxRedis==NULL) @@ -987,6 +995,13 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) goto error_exec; } } + + LM_DBG("rpl->rplRedis->type:%d\n", rpl->rplRedis->type); + if(rpl->rplRedis->type == REDIS_REPLY_ERROR) { + LM_ERR("Redis error:%.*s\n", + (int)rpl->rplRedis->len, rpl->rplRedis->str); + goto error_exec; + } } cmd->s[cmd->len] = c; rsrv->disable.consecutive_errors = 0;

4 years, 6 months

git:5.2:13f4b108: ndb_redis: redis_cmd() check reply type to detect command errors

by Victor Seva

Module: kamailio Branch: 5.2 Commit: 13f4b108e1a424c42121f752de91fdeca8c0480a URL: https://github.com/kamailio/kamailio/commit/13f4b108e1a424c42121f752de91fde… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-07T13:11:27+02:00 ndb_redis: redis_cmd() check reply type to detect command errors fix #2300 (cherry picked from commit d00b14704805d728f5a845a6af900eff1ed372ac) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/13f4b108e1a424c42121f752de91fde… Patch: https://github.com/kamailio/kamailio/commit/13f4b108e1a424c42121f752de91fde… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 7e3ddb0d8c..f2dbc82244 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -953,6 +953,14 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) goto error_exec; } } + + LM_DBG("rpl->rplRedis->type:%d\n", rpl->rplRedis->type); + if(rpl->rplRedis->type == REDIS_REPLY_ERROR) { + LM_ERR("Redis error:%.*s\n", + (int)rpl->rplRedis->len, rpl->rplRedis->str); + goto error_exec; + } + if (check_cluster_reply(rpl->rplRedis, &rsrv)) { LM_DBG("rsrv->ctxRedis = %p\n", rsrv->ctxRedis); if(rsrv->ctxRedis==NULL) @@ -987,6 +995,13 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) goto error_exec; } } + + LM_DBG("rpl->rplRedis->type:%d\n", rpl->rplRedis->type); + if(rpl->rplRedis->type == REDIS_REPLY_ERROR) { + LM_ERR("Redis error:%.*s\n", + (int)rpl->rplRedis->len, rpl->rplRedis->str); + goto error_exec; + } } cmd->s[cmd->len] = c; rsrv->disable.consecutive_errors = 0;

4 years, 6 months

[kamailio/kamailio] ndb_redis: redis_cmd() doesn't return error with a faulty command (#2300)

by Victor Seva

### Description Detected that a command like this was not returning <0 ``` if(redis_cmd("test", "HSET dd field1", "r")) { [...] } ``` Same command on redis-cli: ``` # redis-cli 127.0.0.1:6379> HSET dd field1 (error) ERR wrong number of arguments for 'hset' command ``` ### Troubleshooting #### Reproduction I've added some debug to the code and I find out that the command is returning: ``` Apr 23 10:55:02 spce proxy[12880]: DEBUG: ndb_redis [redis_client.c:956]: redisc_exec(): rpl->rplRedis->type:3 ``` That's an INTEGER. From hiredis/read.h: ``` #define REDIS_REPLY_INTEGER 3 #define REDIS_REPLY_NIL 4 #define REDIS_REPLY_STATUS 5 #define REDIS_REPLY_ERROR 6 ``` I've created a simple test code to check the same command: ``` #include <stdio.h> #include <stdarg.h> #include "hiredis.h" void check(redisContext *c, const char *cmd, ...) { va_list ap; va_start(ap,cmd); redisReply *r = redisvCommand(c, cmd, ap); va_end(ap); if(r == NULL) { printf("reply NULL\n"); } printf("reply->type:%d\n", r->type); freeReplyObject(r); } int main(void) { redisContext *c = redisConnect("127.0.0.1", 6379); if (c == NULL || c->err) { if (c) { printf("Error: %s\n", c->errstr); } else { printf("Can't allocate redis context\n"); } return 1; } check(c, "HSET dd field"); redisFree(c); return 0; } ``` ``` root@spce:/usr/local/devel# cc t.c -o t -lhiredis -I/usr/include/hiredis root@spce:/usr/local/devel# ./t reply->type:6 ``` No problems there. The reply is ERROR. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.3 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, NO_SIG_DEBUG, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 8.3.0 ``` -- 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/2300

4 years, 6 months

← Newer
1
...
26
27
28
29
30
31
32
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2020