sr-dev December 2017

sr-dev@lists.kamailio.org

26 participants
475 discussions

git:5.0:6234a3c7: usrloc: copy server_id when updating contact in memory

by Charles Chance

Module: kamailio Branch: 5.0 Commit: 6234a3c73f5311a5e67e20cc13e660d80187b0db URL: https://github.com/kamailio/kamailio/commit/6234a3c73f5311a5e67e20cc13e660d… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2017-12-14T09:39:27Z usrloc: copy server_id when updating contact in memory (cherry picked from commit 282cb4395b5c31476f97a168f509b2904727e88a) --- Modified: src/modules/usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/6234a3c73f5311a5e67e20cc13e660d… Patch: https://github.com/kamailio/kamailio/commit/6234a3c73f5311a5e67e20cc13e660d… --- diff --git a/src/modules/usrloc/ucontact.c b/src/modules/usrloc/ucontact.c index 630a4bd8c5..b0a6f046c7 100644 --- a/src/modules/usrloc/ucontact.c +++ b/src/modules/usrloc/ucontact.c @@ -308,6 +308,7 @@ int mem_update_ucontact(ucontact_t* _c, ucontact_info_t* _ci) _c->last_keepalive = _ci->last_modified; _c->flags = _ci->flags; _c->cflags = _ci->cflags; + _c->server_id = _ci->server_id; _c->tcpconn_id = _ci->tcpconn_id; return 0;

7 years

git:master:d82733e4: Makefile.defs: version set to 5.2.0-dev2

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d82733e4974250648a367a247d66f621ca042777 URL: https://github.com/kamailio/kamailio/commit/d82733e4974250648a367a247d66f62… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-14T09:07:15+01:00 Makefile.defs: version set to 5.2.0-dev2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/d82733e4974250648a367a247d66f62… Patch: https://github.com/kamailio/kamailio/commit/d82733e4974250648a367a247d66f62… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 0ffaa291db..48ec3c919d 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -dev1 +EXTRAVERSION = -dev2 # memory manager switcher # 0 - f_malloc (fast malloc)

7 years

git:5.1:83a28b39: group: use proper variable to get the domain

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 83a28b3906c6262e4909aac284958e8b9aa024a3 URL: https://github.com/kamailio/kamailio/commit/83a28b3906c6262e4909aac284958e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-14T08:26:25+01:00 group: use proper variable to get the domain - mode debug messages - closes GH #1363 (cherry picked from commit f4a1a9b3b79a0437bc2fa5e68fc82d1415af1a5e) --- Modified: src/modules/group/group.c --- Diff: https://github.com/kamailio/kamailio/commit/83a28b3906c6262e4909aac284958e8… Patch: https://github.com/kamailio/kamailio/commit/83a28b3906c6262e4909aac284958e8… --- diff --git a/src/modules/group/group.c b/src/modules/group/group.c index 05cc761b7b..329587a69c 100644 --- a/src/modules/group/group.c +++ b/src/modules/group/group.c @@ -158,8 +158,19 @@ int is_user_in_helper(sip_msg_t* _msg, str *user, str *domain, str *grp) VAL_STR(vals) = *user; - if(domain) { - VAL_STR(vals + 2) = *domain; + if(use_domain) { + if(domain && domain->s) { + VAL_STR(vals + 2) = *domain; + } else { + LM_ERR("no domain\n"); + return -1; + } + LM_DBG("checking if '%.*s(a)%.*s' is in '%.*s'\n", + user->len, user->s, domain->len, domain->s, + grp->len, grp->s); + } else { + LM_DBG("checking if '%.*s' is in '%.*s'\n", + user->len, user->s, grp->len, grp->s); } VAL_TYPE(vals) = VAL_TYPE(vals + 1) = VAL_TYPE(vals + 2) = DB1_STR; @@ -200,9 +211,8 @@ int is_user_in(sip_msg_t* _msg, char* _hf, char* _grp) { str user = STR_NULL; str domain = STR_NULL; - str group = STR_NULL; - if ( get_username_domain( _msg, (group_check_p)_hf, &user, &group)!=0) { + if ( get_username_domain( _msg, (group_check_p)_hf, &user, &domain)!=0) { LM_ERR("failed to get username@domain\n"); return -1; }

7 years

git:master:f4a1a9b3: group: use proper variable to get the domain

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f4a1a9b3b79a0437bc2fa5e68fc82d1415af1a5e URL: https://github.com/kamailio/kamailio/commit/f4a1a9b3b79a0437bc2fa5e68fc82d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-12-14T08:23:13+01:00 group: use proper variable to get the domain - mode debug messages - closes GH #1363 --- Modified: src/modules/group/group.c --- Diff: https://github.com/kamailio/kamailio/commit/f4a1a9b3b79a0437bc2fa5e68fc82d1… Patch: https://github.com/kamailio/kamailio/commit/f4a1a9b3b79a0437bc2fa5e68fc82d1… --- diff --git a/src/modules/group/group.c b/src/modules/group/group.c index 05cc761b7b..329587a69c 100644 --- a/src/modules/group/group.c +++ b/src/modules/group/group.c @@ -158,8 +158,19 @@ int is_user_in_helper(sip_msg_t* _msg, str *user, str *domain, str *grp) VAL_STR(vals) = *user; - if(domain) { - VAL_STR(vals + 2) = *domain; + if(use_domain) { + if(domain && domain->s) { + VAL_STR(vals + 2) = *domain; + } else { + LM_ERR("no domain\n"); + return -1; + } + LM_DBG("checking if '%.*s(a)%.*s' is in '%.*s'\n", + user->len, user->s, domain->len, domain->s, + grp->len, grp->s); + } else { + LM_DBG("checking if '%.*s' is in '%.*s'\n", + user->len, user->s, grp->len, grp->s); } VAL_TYPE(vals) = VAL_TYPE(vals + 1) = VAL_TYPE(vals + 2) = DB1_STR; @@ -200,9 +211,8 @@ int is_user_in(sip_msg_t* _msg, char* _hf, char* _grp) { str user = STR_NULL; str domain = STR_NULL; - str group = STR_NULL; - if ( get_username_domain( _msg, (group_check_p)_hf, &user, &group)!=0) { + if ( get_username_domain( _msg, (group_check_p)_hf, &user, &domain)!=0) { LM_ERR("failed to get username@domain\n"); return -1; }

7 years