[sr-dev] git:4.3:cb644d50: Revert "pua_reginfo: use ul.get_urecord_by_ruid instead of ul.get_urecord"

[Victor Seva]

Module: kamailio
Branch: 4.3
Commit: cb644d50f76c80f0f24b34e5adf8723d89aab636
URL: https://github.com/kamailio/kamailio/commit/cb644d50f76c80f0f24b34e5adf8723d89aab636

Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Committer: Victor Seva <linuxmaniac at torreviejawireless.org>
Date: 2015-08-06T15:22:34+02:00

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

This reverts commit 9a6d8d2bffe13b442ed5e880fb0dd2c6572c29e2.

---

Modified: modules/pua_reginfo/usrloc_cb.c

---

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

---

diff --git a/modules/pua_reginfo/usrloc_cb.c b/modules/pua_reginfo/usrloc_cb.c
index 95ec762..7f84788 100644
--- a/modules/pua_reginfo/usrloc_cb.c
+++ b/modules/pua_reginfo/usrloc_cb.c
@@ -224,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];
@@ -251,6 +251,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);
@@ -259,11 +262,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;
 	}