[sr-dev] git:4.2:05cdb458: Revert "pua_reginfo: use ul.get_urecord_by_ruid instead of ul.get_urecord"

[Victor Seva]

Module: kamailio
Branch: 4.2
Commit: 05cdb45872af66c733dd810fc7877a0a7fd9bce6
URL: https://github.com/kamailio/kamailio/commit/05cdb45872af66c733dd810fc7877a0a7fd9bce6

Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Committer: Victor Seva <linuxmaniac at torreviejawireless.org>
Date: 2016-02-05T12:07:54+01:00

Revert "pua_reginfo: use ul.get_urecord_by_ruid instead of ul.get_urecord"

This reverts commit eb97d380a2fca3b9ce30596aad9493bc11cd5d8d.

Fixes #499

---

Modified: modules/pua_reginfo/usrloc_cb.c

---

Diff:  https://github.com/kamailio/kamailio/commit/05cdb45872af66c733dd810fc7877a0a7fd9bce6.diff
Patch: https://github.com/kamailio/kamailio/commit/05cdb45872af66c733dd810fc7877a0a7fd9bce6.patch

---

diff --git a/modules/pua_reginfo/usrloc_cb.c b/modules/pua_reginfo/usrloc_cb.c
index e1abef9..1a6f56f 100644
--- a/modules/pua_reginfo/usrloc_cb.c
+++ b/modules/pua_reginfo/usrloc_cb.c
@@ -225,9 +225,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];
@@ -252,6 +252,9 @@ 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);
@@ -260,11 +263,10 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) {
 		return;
 	}
 
-	/* 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);
+	/* 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);
 		return;
 	}