sr-dev July 2015

sr-dev@lists.kamailio.org

26 participants
302 discussions

git:master:fe7b9786: modules/tm: unset async suspended transaction flag post-continue
by jaybeepee 16 Jul '15

16 Jul '15

Module: kamailio Branch: master Commit: fe7b9786f5e09735eea25e4f8e70ba694f8c0475 URL: https://github.com/kamailio/kamailio/commit/fe7b9786f5e09735eea25e4f8e70ba6… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-07-16T09:36:18+02:00 modules/tm: unset async suspended transaction flag post-continue --- Modified: modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/fe7b9786f5e09735eea25e4f8e70ba6… Patch: https://github.com/kamailio/kamailio/commit/fe7b9786f5e09735eea25e4f8e70ba6… --- diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index 86fb3be..64f9af8 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -437,6 +437,10 @@ int t_continue(unsigned int hash_index, unsigned int label, sip_msg_free(t->uac[branch].reply); t->uac[branch].reply = 0; } + + t->flags &= ~T_ASYNC_SUSPENDED; /*This transaction is no longer suspended so unsetting the SUSPEND flag*/ + + return 0; kill_trans:

1 0

git:4.1:10c1c00e: pua_reginfo: use ruid to fix comparation of contact
by Victor Seva 16 Jul '15

16 Jul '15

Module: kamailio Branch: 4.1 Commit: 10c1c00ed184fc3d13a0b244618a32151ec403ed URL: https://github.com/kamailio/kamailio/commit/10c1c00ed184fc3d13a0b244618a321… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-07-16T09:21:00+02:00 pua_reginfo: use ruid to fix comparation of contact (ptr == c) is always false. Using ruid instead. (cherry picked from commit 7d31d78e3ac861cddfcb70c9940242ec7f3f0dbc) --- Modified: modules/pua_reginfo/usrloc_cb.c --- Diff: https://github.com/kamailio/kamailio/commit/10c1c00ed184fc3d13a0b244618a321… Patch: https://github.com/kamailio/kamailio/commit/10c1c00ed184fc3d13a0b244618a321… --- diff --git a/modules/pua_reginfo/usrloc_cb.c b/modules/pua_reginfo/usrloc_cb.c index 8c45763..d4e9d5f 100644 --- a/modules/pua_reginfo/usrloc_cb.c +++ b/modules/pua_reginfo/usrloc_cb.c @@ -102,10 +102,14 @@ str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) { buf_len = snprintf(buf, sizeof(buf), "%p", record); xmlNewProp(registration_node, BAD_CAST "id", BAD_CAST buf); + LM_DBG("Updated Contact %.*s[%.*s]\n", c->c.len, c->c.s, + c->ruid.len, c->ruid.s); + ptr = record->contacts; while (ptr) { if (VALID_CONTACT(ptr, cur_time)) { - LM_DBG("Contact %.*s, %p\n", ptr->c.len, ptr->c.s, ptr); + LM_DBG("Contact %.*s[%.*s]\n", ptr->c.len, ptr->c.s, + ptr->ruid.len, ptr->ruid.s); /* Contact-Node */ contact_node =xmlNewChild(registration_node, NULL, BAD_CAST "contact", NULL) ; if( contact_node ==NULL) { @@ -116,7 +120,9 @@ str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) { buf_len = snprintf(buf, sizeof(buf), "%p", ptr); xmlNewProp(contact_node, BAD_CAST "id", BAD_CAST buf); /* Check, if this is the modified contact: */ - if (ptr == c) { + if ((c->ruid.len == ptr->ruid.len) && + !memcmp(c->ruid.s, ptr->ruid.s, c->ruid.len)) + { if ((type & UL_CONTACT_INSERT) || (type & UL_CONTACT_UPDATE)) { reg_active = 1; xmlNewProp(contact_node, BAD_CAST "state", BAD_CAST "active");

1 0

git:4.1:bb16ed70: pua_reginfo: use ul.get_urecord_by_ruid instead of ul.get_urecord
by Victor Seva 16 Jul '15

16 Jul '15

Module: kamailio Branch: 4.1 Commit: bb16ed70ed07b51f08a2abc2582ee61ea1cc4fb8 URL: https://github.com/kamailio/kamailio/commit/bb16ed70ed07b51f08a2abc2582ee61… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-07-16T09:21:00+02:00 pua_reginfo: use ul.get_urecord_by_ruid instead of ul.get_urecord (cherry picked from commit 63bd356cc3c7aa64d64361283f630f88b8db88af) --- Modified: modules/pua_reginfo/usrloc_cb.c --- Diff: https://github.com/kamailio/kamailio/commit/bb16ed70ed07b51f08a2abc2582ee61… Patch: https://github.com/kamailio/kamailio/commit/bb16ed70ed07b51f08a2abc2582ee61… --- diff --git a/modules/pua_reginfo/usrloc_cb.c b/modules/pua_reginfo/usrloc_cb.c index 8587889..8c45763 100644 --- a/modules/pua_reginfo/usrloc_cb.c +++ b/modules/pua_reginfo/usrloc_cb.c @@ -219,9 +219,9 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { str content_type; udomain_t * domain; urecord_t * record; + ucontact_t* _c = NULL; int res; str uri = {NULL, 0}; - str user = {NULL, 0}; char* at = NULL; char id_buf[512]; @@ -246,9 +246,6 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { LM_ERR("Unknown Type %i\n", type); return; } - /* make a local copy of the AOR */ - user.len = c->aor->len; - user.s = c->aor->s; /* Get the UDomain for this account */ res = ul.get_udomain(c->domain->s, &domain); @@ -257,10 +254,11 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { return; } - /* Get the URecord for this AOR */ - res = ul.get_urecord(domain, &user, &record); - if (res > 0) { - LM_ERR("' %.*s (%.*s)' Not found in usrloc\n", c->aor->len, c->aor->s, c->domain->len, c->domain->s); + /* Get the URecord for this ruid */ + res = ul.get_urecord_by_ruid(domain, ul.get_aorhash(c->aor), &(c->ruid), + &record, &_c); + if (res < 0) { + LM_ERR("'%.*s (%.*s)' Not found in usrloc\n", c->aor->len, c->aor->s, c->domain->len, c->domain->s); return; }

1 0

git:4.2:547f1489: pua_reginfo: use ruid to fix comparation of contact
by Victor Seva 16 Jul '15

16 Jul '15

Module: kamailio Branch: 4.2 Commit: 547f1489cb51a3c72dba72adaa1f6df5429f425e URL: https://github.com/kamailio/kamailio/commit/547f1489cb51a3c72dba72adaa1f6df… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-07-16T09:20:23+02:00 pua_reginfo: use ruid to fix comparation of contact (ptr == c) is always false. Using ruid instead. (cherry picked from commit 7d31d78e3ac861cddfcb70c9940242ec7f3f0dbc) --- Modified: modules/pua_reginfo/usrloc_cb.c --- Diff: https://github.com/kamailio/kamailio/commit/547f1489cb51a3c72dba72adaa1f6df… Patch: https://github.com/kamailio/kamailio/commit/547f1489cb51a3c72dba72adaa1f6df… --- diff --git a/modules/pua_reginfo/usrloc_cb.c b/modules/pua_reginfo/usrloc_cb.c index 6f68e03..e1abef9 100644 --- a/modules/pua_reginfo/usrloc_cb.c +++ b/modules/pua_reginfo/usrloc_cb.c @@ -102,10 +102,14 @@ str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) { buf_len = snprintf(buf, sizeof(buf), "%p", record); xmlNewProp(registration_node, BAD_CAST "id", BAD_CAST buf); + LM_DBG("Updated Contact %.*s[%.*s]\n", c->c.len, c->c.s, + c->ruid.len, c->ruid.s); + ptr = record->contacts; while (ptr) { if (VALID_CONTACT(ptr, cur_time)) { - LM_DBG("Contact %.*s, %p\n", ptr->c.len, ptr->c.s, ptr); + LM_DBG("Contact %.*s[%.*s]\n", ptr->c.len, ptr->c.s, + ptr->ruid.len, ptr->ruid.s); /* Contact-Node */ contact_node =xmlNewChild(registration_node, NULL, BAD_CAST "contact", NULL) ; if( contact_node ==NULL) { @@ -116,7 +120,9 @@ str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) { buf_len = snprintf(buf, sizeof(buf), "%p", ptr); xmlNewProp(contact_node, BAD_CAST "id", BAD_CAST buf); /* Check, if this is the modified contact: */ - if (ptr == c) { + if ((c->ruid.len == ptr->ruid.len) && + !memcmp(c->ruid.s, ptr->ruid.s, c->ruid.len)) + { if ((type & UL_CONTACT_INSERT) || (type & UL_CONTACT_UPDATE)) { reg_active = 1; xmlNewProp(contact_node, BAD_CAST "state", BAD_CAST "active");

1 0

git:4.2:eb97d380: pua_reginfo: use ul.get_urecord_by_ruid instead of ul.get_urecord
by Victor Seva 16 Jul '15

16 Jul '15

Module: kamailio Branch: 4.2 Commit: eb97d380a2fca3b9ce30596aad9493bc11cd5d8d URL: https://github.com/kamailio/kamailio/commit/eb97d380a2fca3b9ce30596aad9493b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-07-16T09:20:23+02:00 pua_reginfo: use ul.get_urecord_by_ruid instead of ul.get_urecord (cherry picked from commit 63bd356cc3c7aa64d64361283f630f88b8db88af) --- Modified: modules/pua_reginfo/usrloc_cb.c --- Diff: https://github.com/kamailio/kamailio/commit/eb97d380a2fca3b9ce30596aad9493b… Patch: https://github.com/kamailio/kamailio/commit/eb97d380a2fca3b9ce30596aad9493b… --- diff --git a/modules/pua_reginfo/usrloc_cb.c b/modules/pua_reginfo/usrloc_cb.c index 0164a67..6f68e03 100644 --- a/modules/pua_reginfo/usrloc_cb.c +++ b/modules/pua_reginfo/usrloc_cb.c @@ -219,9 +219,9 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { str content_type; udomain_t * domain; urecord_t * record; + ucontact_t* _c = NULL; int res; str uri = {NULL, 0}; - str user = {NULL, 0}; char* at = NULL; char id_buf[512]; @@ -246,9 +246,6 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { LM_ERR("Unknown Type %i\n", type); return; } - /* make a local copy of the AOR */ - user.len = c->aor->len; - user.s = c->aor->s; /* Get the UDomain for this account */ res = ul.get_udomain(c->domain->s, &domain); @@ -257,10 +254,11 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { return; } - /* Get the URecord for this AOR */ - res = ul.get_urecord(domain, &user, &record); - if (res > 0) { - LM_ERR("' %.*s (%.*s)' Not found in usrloc\n", c->aor->len, c->aor->s, c->domain->len, c->domain->s); + /* Get the URecord for this ruid */ + res = ul.get_urecord_by_ruid(domain, ul.get_aorhash(c->aor), &(c->ruid), + &record, &_c); + if (res < 0) { + LM_ERR("'%.*s (%.*s)' Not found in usrloc\n", c->aor->len, c->aor->s, c->domain->len, c->domain->s); return; }

1 0

git:4.3:6e6f679c: pua_reginfo: use ruid to fix comparation of contact
by Victor Seva 16 Jul '15

16 Jul '15

Module: kamailio Branch: 4.3 Commit: 6e6f679c7d7894bd0e268581022ed111c33384c5 URL: https://github.com/kamailio/kamailio/commit/6e6f679c7d7894bd0e268581022ed11… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-07-16T09:19:40+02:00 pua_reginfo: use ruid to fix comparation of contact (ptr == c) is always false. Using ruid instead. (cherry picked from commit 7d31d78e3ac861cddfcb70c9940242ec7f3f0dbc) --- Modified: modules/pua_reginfo/usrloc_cb.c --- Diff: https://github.com/kamailio/kamailio/commit/6e6f679c7d7894bd0e268581022ed11… Patch: https://github.com/kamailio/kamailio/commit/6e6f679c7d7894bd0e268581022ed11… --- diff --git a/modules/pua_reginfo/usrloc_cb.c b/modules/pua_reginfo/usrloc_cb.c index 0c68cec..95ec762 100644 --- a/modules/pua_reginfo/usrloc_cb.c +++ b/modules/pua_reginfo/usrloc_cb.c @@ -101,10 +101,14 @@ str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) { snprintf(buf, sizeof(buf), "%p", record); xmlNewProp(registration_node, BAD_CAST "id", BAD_CAST buf); + LM_DBG("Updated Contact %.*s[%.*s]\n", c->c.len, c->c.s, + c->ruid.len, c->ruid.s); + ptr = record->contacts; while (ptr) { if (VALID_CONTACT(ptr, cur_time)) { - LM_DBG("Contact %.*s, %p\n", ptr->c.len, ptr->c.s, ptr); + LM_DBG("Contact %.*s[%.*s]\n", ptr->c.len, ptr->c.s, + ptr->ruid.len, ptr->ruid.s); /* Contact-Node */ contact_node =xmlNewChild(registration_node, NULL, BAD_CAST "contact", NULL) ; if( contact_node ==NULL) { @@ -115,7 +119,9 @@ str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) { snprintf(buf, sizeof(buf), "%p", ptr); xmlNewProp(contact_node, BAD_CAST "id", BAD_CAST buf); /* Check, if this is the modified contact: */ - if (ptr == c) { + if ((c->ruid.len == ptr->ruid.len) && + !memcmp(c->ruid.s, ptr->ruid.s, c->ruid.len)) + { if ((type & UL_CONTACT_INSERT) || (type & UL_CONTACT_UPDATE)) { reg_active = 1; xmlNewProp(contact_node, BAD_CAST "state", BAD_CAST "active");

1 0

git:4.3:9a6d8d2b: pua_reginfo: use ul.get_urecord_by_ruid instead of ul.get_urecord
by Victor Seva 16 Jul '15

16 Jul '15

Module: kamailio Branch: 4.3 Commit: 9a6d8d2bffe13b442ed5e880fb0dd2c6572c29e2 URL: https://github.com/kamailio/kamailio/commit/9a6d8d2bffe13b442ed5e880fb0dd2c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-07-16T09:19:40+02:00 pua_reginfo: use ul.get_urecord_by_ruid instead of ul.get_urecord (cherry picked from commit 63bd356cc3c7aa64d64361283f630f88b8db88af) --- Modified: modules/pua_reginfo/usrloc_cb.c --- Diff: https://github.com/kamailio/kamailio/commit/9a6d8d2bffe13b442ed5e880fb0dd2c… Patch: https://github.com/kamailio/kamailio/commit/9a6d8d2bffe13b442ed5e880fb0dd2c… --- diff --git a/modules/pua_reginfo/usrloc_cb.c b/modules/pua_reginfo/usrloc_cb.c index 6b8cd68..0c68cec 100644 --- a/modules/pua_reginfo/usrloc_cb.c +++ b/modules/pua_reginfo/usrloc_cb.c @@ -218,9 +218,9 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { str content_type; udomain_t * domain; urecord_t * record; + ucontact_t* _c = NULL; int res; str uri = {NULL, 0}; - str user = {NULL, 0}; char* at = NULL; char id_buf[512]; @@ -245,9 +245,6 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { LM_ERR("Unknown Type %i\n", type); return; } - /* make a local copy of the AOR */ - user.len = c->aor->len; - user.s = c->aor->s; /* Get the UDomain for this account */ res = ul.get_udomain(c->domain->s, &domain); @@ -256,10 +253,11 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { return; } - /* Get the URecord for this AOR */ - res = ul.get_urecord(domain, &user, &record); - if (res > 0) { - LM_ERR("' %.*s (%.*s)' Not found in usrloc\n", c->aor->len, c->aor->s, c->domain->len, c->domain->s); + /* Get the URecord for this ruid */ + res = ul.get_urecord_by_ruid(domain, ul.get_aorhash(c->aor), &(c->ruid), + &record, &_c); + if (res < 0) { + LM_ERR("'%.*s (%.*s)' Not found in usrloc\n", c->aor->len, c->aor->s, c->domain->len, c->domain->s); return; }

1 0

git:master:8f3caea2: Merge pull request #247 from kamailio/vseva/pua_reginfo
by ng-voice GmbH 15 Jul '15

15 Jul '15

Module: kamailio Branch: master Commit: 8f3caea21172893abb3f6be8856058f41f2bb17f URL: https://github.com/kamailio/kamailio/commit/8f3caea21172893abb3f6be8856058f… Author: ng-voice GmbH <carsten(a)ng-voice.com> Committer: ng-voice GmbH <carsten(a)ng-voice.com> Date: 2015-07-15T21:36:04+02:00 Merge pull request #247 from kamailio/vseva/pua_reginfo pua_reginfo: fix NOTIFY xml --- Modified: modules/pua_reginfo/usrloc_cb.c --- Diff: https://github.com/kamailio/kamailio/commit/8f3caea21172893abb3f6be8856058f… Patch: https://github.com/kamailio/kamailio/commit/8f3caea21172893abb3f6be8856058f… --- diff --git a/modules/pua_reginfo/usrloc_cb.c b/modules/pua_reginfo/usrloc_cb.c index 6b8cd68..95ec762 100644 --- a/modules/pua_reginfo/usrloc_cb.c +++ b/modules/pua_reginfo/usrloc_cb.c @@ -101,10 +101,14 @@ str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) { snprintf(buf, sizeof(buf), "%p", record); xmlNewProp(registration_node, BAD_CAST "id", BAD_CAST buf); + LM_DBG("Updated Contact %.*s[%.*s]\n", c->c.len, c->c.s, + c->ruid.len, c->ruid.s); + ptr = record->contacts; while (ptr) { if (VALID_CONTACT(ptr, cur_time)) { - LM_DBG("Contact %.*s, %p\n", ptr->c.len, ptr->c.s, ptr); + LM_DBG("Contact %.*s[%.*s]\n", ptr->c.len, ptr->c.s, + ptr->ruid.len, ptr->ruid.s); /* Contact-Node */ contact_node =xmlNewChild(registration_node, NULL, BAD_CAST "contact", NULL) ; if( contact_node ==NULL) { @@ -115,7 +119,9 @@ str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) { snprintf(buf, sizeof(buf), "%p", ptr); xmlNewProp(contact_node, BAD_CAST "id", BAD_CAST buf); /* Check, if this is the modified contact: */ - if (ptr == c) { + if ((c->ruid.len == ptr->ruid.len) && + !memcmp(c->ruid.s, ptr->ruid.s, c->ruid.len)) + { if ((type & UL_CONTACT_INSERT) || (type & UL_CONTACT_UPDATE)) { reg_active = 1; xmlNewProp(contact_node, BAD_CAST "state", BAD_CAST "active"); @@ -218,9 +224,9 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { str content_type; udomain_t * domain; urecord_t * record; + ucontact_t* _c = NULL; int res; str uri = {NULL, 0}; - str user = {NULL, 0}; char* at = NULL; char id_buf[512]; @@ -245,9 +251,6 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { LM_ERR("Unknown Type %i\n", type); return; } - /* make a local copy of the AOR */ - user.len = c->aor->len; - user.s = c->aor->s; /* Get the UDomain for this account */ res = ul.get_udomain(c->domain->s, &domain); @@ -256,10 +259,11 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { return; } - /* Get the URecord for this AOR */ - res = ul.get_urecord(domain, &user, &record); - if (res > 0) { - LM_ERR("' %.*s (%.*s)' Not found in usrloc\n", c->aor->len, c->aor->s, c->domain->len, c->domain->s); + /* Get the URecord for this ruid */ + res = ul.get_urecord_by_ruid(domain, ul.get_aorhash(c->aor), &(c->ruid), + &record, &_c); + if (res < 0) { + LM_ERR("'%.*s (%.*s)' Not found in usrloc\n", c->aor->len, c->aor->s, c->domain->len, c->domain->s); return; }

1 0

git:master:7d31d78e: pua_reginfo: use ruid to fix comparation of contact
by Victor Seva 15 Jul '15

15 Jul '15

Module: kamailio Branch: master Commit: 7d31d78e3ac861cddfcb70c9940242ec7f3f0dbc URL: https://github.com/kamailio/kamailio/commit/7d31d78e3ac861cddfcb70c9940242e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-07-15T16:00:03+02:00 pua_reginfo: use ruid to fix comparation of contact (ptr == c) is always false. Using ruid instead. --- Modified: modules/pua_reginfo/usrloc_cb.c --- Diff: https://github.com/kamailio/kamailio/commit/7d31d78e3ac861cddfcb70c9940242e… Patch: https://github.com/kamailio/kamailio/commit/7d31d78e3ac861cddfcb70c9940242e… --- diff --git a/modules/pua_reginfo/usrloc_cb.c b/modules/pua_reginfo/usrloc_cb.c index 0c68cec..95ec762 100644 --- a/modules/pua_reginfo/usrloc_cb.c +++ b/modules/pua_reginfo/usrloc_cb.c @@ -101,10 +101,14 @@ str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) { snprintf(buf, sizeof(buf), "%p", record); xmlNewProp(registration_node, BAD_CAST "id", BAD_CAST buf); + LM_DBG("Updated Contact %.*s[%.*s]\n", c->c.len, c->c.s, + c->ruid.len, c->ruid.s); + ptr = record->contacts; while (ptr) { if (VALID_CONTACT(ptr, cur_time)) { - LM_DBG("Contact %.*s, %p\n", ptr->c.len, ptr->c.s, ptr); + LM_DBG("Contact %.*s[%.*s]\n", ptr->c.len, ptr->c.s, + ptr->ruid.len, ptr->ruid.s); /* Contact-Node */ contact_node =xmlNewChild(registration_node, NULL, BAD_CAST "contact", NULL) ; if( contact_node ==NULL) { @@ -115,7 +119,9 @@ str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) { snprintf(buf, sizeof(buf), "%p", ptr); xmlNewProp(contact_node, BAD_CAST "id", BAD_CAST buf); /* Check, if this is the modified contact: */ - if (ptr == c) { + if ((c->ruid.len == ptr->ruid.len) && + !memcmp(c->ruid.s, ptr->ruid.s, c->ruid.len)) + { if ((type & UL_CONTACT_INSERT) || (type & UL_CONTACT_UPDATE)) { reg_active = 1; xmlNewProp(contact_node, BAD_CAST "state", BAD_CAST "active");

1 0

git:master:63bd356c: pua_reginfo: use ul.get_urecord_by_ruid instead of ul.get_urecord
by Victor Seva 15 Jul '15

15 Jul '15

Module: kamailio Branch: master Commit: 63bd356cc3c7aa64d64361283f630f88b8db88af URL: https://github.com/kamailio/kamailio/commit/63bd356cc3c7aa64d64361283f630f8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-07-15T15:51:26+02:00 pua_reginfo: use ul.get_urecord_by_ruid instead of ul.get_urecord --- Modified: modules/pua_reginfo/usrloc_cb.c --- Diff: https://github.com/kamailio/kamailio/commit/63bd356cc3c7aa64d64361283f630f8… Patch: https://github.com/kamailio/kamailio/commit/63bd356cc3c7aa64d64361283f630f8… --- diff --git a/modules/pua_reginfo/usrloc_cb.c b/modules/pua_reginfo/usrloc_cb.c index 6b8cd68..0c68cec 100644 --- a/modules/pua_reginfo/usrloc_cb.c +++ b/modules/pua_reginfo/usrloc_cb.c @@ -218,9 +218,9 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { str content_type; udomain_t * domain; urecord_t * record; + ucontact_t* _c = NULL; int res; str uri = {NULL, 0}; - str user = {NULL, 0}; char* at = NULL; char id_buf[512]; @@ -245,9 +245,6 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { LM_ERR("Unknown Type %i\n", type); return; } - /* make a local copy of the AOR */ - user.len = c->aor->len; - user.s = c->aor->s; /* Get the UDomain for this account */ res = ul.get_udomain(c->domain->s, &domain); @@ -256,10 +253,11 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { return; } - /* Get the URecord for this AOR */ - res = ul.get_urecord(domain, &user, &record); - if (res > 0) { - LM_ERR("' %.*s (%.*s)' Not found in usrloc\n", c->aor->len, c->aor->s, c->domain->len, c->domain->s); + /* Get the URecord for this ruid */ + res = ul.get_urecord_by_ruid(domain, ul.get_aorhash(c->aor), &(c->ruid), + &record, &_c); + if (res < 0) { + LM_ERR("'%.*s (%.*s)' Not found in usrloc\n", c->aor->len, c->aor->s, c->domain->len, c->domain->s); return; }

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2015