@@ -70,6 +70,8 @@ static int w_save3(struct sip_msg* _m, char* _d, char* _cflags, char* _uri);

 static int w_lookup(struct sip_msg* _m, char* _d, char* _p2);

 static int w_lookup_to_dset(struct sip_msg* _m, char* _d, char* _p2);

 static int w_lookup_branches(struct sip_msg* _m, char* _d, char* _p2);

+static int w_lookup_xavp(sip_msg_t* _m, char* _ptname, char* _puri,

+		char *prxname, char *pcxname);

 static int w_registered(struct sip_msg* _m, char* _d, char* _uri);

 static int w_unregister(struct sip_msg* _m, char* _d, char* _uri);

 static int w_unregister2(struct sip_msg* _m, char* _d, char* _uri, char *_ruid);

@@ -206,6 +208,8 @@ static cmd_export_t cmds[] = {

 			REQUEST_ROUTE| FAILURE_ROUTE },

 	{"lookup_branches",  (cmd_function)w_lookup_branches, 1,  domain_uri_fixup, 0,

 			REQUEST_ROUTE | FAILURE_ROUTE },

+	{"lookup_xavp",  (cmd_function)w_lookup_xavp,  4,  fixup_spve_all,

+			fixup_free_spve_null, ANY_ROUTE },

 	{"reg_send_reply",   (cmd_function)w_reg_send_reply,  0, 0, 0,

 			REQUEST_ROUTE | FAILURE_ROUTE },

 	{"bind_registrar",  (cmd_function)bind_registrar,  0,

@@ -528,6 +532,34 @@ static int ki_lookup_branches(sip_msg_t* _m, str* _dtable)

 	return lookup_branches(_m, d);

 }

+static int w_lookup_xavp(sip_msg_t* _m, char* _ptname, char* _puri,

+		char *_prxname, char *_pcxname)

+{

+	str vtname = STR_NULL;

+	str vuri = STR_NULL;

+	str vrxname = STR_NULL;

+	str vcxname = STR_NULL;

+

+	if(fixup_get_svalue(_m, (gparam_t*)_ptname, &vtname) != 0) {

+		LM_ERR("failed to get location table parameter\n");

+		return -1;

+	}

+	if(fixup_get_svalue(_m, (gparam_t*)_puri, &vuri) != 0) {

+		LM_ERR("failed to get uri parameter\n");

+		return -1;

+	}

+	if(fixup_get_svalue(_m, (gparam_t*)_prxname, &vrxname) != 0) {

+		LM_ERR("failed to get record xavp parameter\n");

+		return -1;

+	}

+	if(fixup_get_svalue(_m, (gparam_t*)_pcxname, &vcxname) != 0) {

+		LM_ERR("failed to get contact xavp parameter\n");

+		return -1;

+	}

+

+	return ki_lookup_xavp(_m, &vtname, &vuri, &vrxname, &vcxname);

+}

+

 static int w_registered(struct sip_msg* _m, char* _d, char* _uri)

 {

 	str uri = {0};

@@ -950,6 +982,11 @@ static sr_kemi_t sr_kemi_registrar_exports[] = {

 		{ SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

 			SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }

 	},

+	{ str_init("registrar"), str_init("lookup_xavp"),

+		SR_KEMIP_INT, ki_lookup_xavp,

+		{ SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_STR,

+			SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE }

+	},

 	{ str_init("registrar"), str_init("registered"),

 		SR_KEMIP_INT, regapi_registered,

 		{ SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

@@ -863,4 +863,134 @@ void reg_ul_expired_contact(ucontact_t* ptr, int type, void* param)

 	return;

 error:

 	regpv_free_profile(rpp);

-	return; }

+	return;

+}

+

+int ki_lookup_xavp(sip_msg_t* msg, str *utname, str* uri,

+		str* rxname, str *cxname)

+{

+	udomain_t* dt;

+	urecord_t* r;

+	ucontact_t* ptr;

+	str aor = {0, 0};

+	sr_xavp_t *rxavp=NULL;

+	sr_xavp_t *cxavp=NULL;

+	sr_xavp_t *pxavp=NULL;

+	sr_xval_t nxval;

+	str fxname = {0, 0};

+	int res;

+	int n;

+

+	if (extract_aor(uri, &aor, NULL) < 0) {

+		LM_ERR("failed to extract Address Of Record\n");

+		return -1;

+	}

+

+	if(ul.get_udomain(utname->s, &dt)<0) {

+		LM_ERR("usrloc domain [%s] not found\n", utname->s);

+		return -1;

+	}

+

+	/* add record aor field */

+	memset(&nxval, 0, sizeof(sr_xval_t));

+	nxval.type = SR_XTYPE_STR;

+	nxval.v.s = aor;

+	STR_STATIC_SET(fxname, "aor");

+	if(xavp_add_value(&fxname, &nxval, &rxavp)==NULL) {

+		LM_ERR("failed to add xavp %.*s field\n", fxname.len, fxname.s);

+		return -1;

+	}

+

+	/* copy contacts */

+	ul.lock_udomain(dt, &aor);

+	res = ul.get_urecord(dt, &aor, &r);

+	if (res > 0) {

+		LM_DBG("'%.*s' not found in usrloc\n", aor.len, ZSW(aor.s));

+		ul.unlock_udomain(dt, &aor);

+		xavp_destroy_list(&rxavp);

+		return -1;

+	}

+

+	ptr = r->contacts;

+	n = 0;

+	while(ptr) {

+		/* add record uri field */

+		memset(&nxval, 0, sizeof(sr_xval_t));

+		nxval.type = SR_XTYPE_STR;

+		nxval.v.s = ptr->c;

+		STR_STATIC_SET(fxname, "uri");

+		if(xavp_add_value(&fxname, &nxval, &cxavp)==NULL) {

+			LM_ERR("failed to add xavp %.*s field\n", fxname.len, fxname.s);

+			goto error;

+		}

+		if(ptr->sock) {

+			memset(&nxval, 0, sizeof(sr_xval_t));

+			nxval.type = SR_XTYPE_STR;

+			nxval.v.s = ptr->sock->sock_str;

+			STR_STATIC_SET(fxname, "socket");

+			if(xavp_add_value(&fxname, &nxval, &cxavp)==NULL) {

+				LM_ERR("failed to add xavp %.*s field\n", fxname.len, fxname.s);

+				goto error;

+			}

+		}

+		if(ptr->received.s!=NULL) {

+			memset(&nxval, 0, sizeof(sr_xval_t));

+			nxval.type = SR_XTYPE_STR;

+			nxval.v.s = ptr->received;

+			STR_STATIC_SET(fxname, "socket");

+			if(xavp_add_value(&fxname, &nxval, &cxavp)==NULL) {

+				LM_ERR("failed to add xavp %.*s field\n", fxname.len, fxname.s);

+				goto error;

+			}

+		}

+		/* add cxavp in root list */

+		memset(&nxval, 0, sizeof(sr_xval_t));

+		nxval.type = SR_XTYPE_XAVP;

+		nxval.v.xavp = cxavp;

+		if((pxavp = xavp_add_value_after(cxname, &nxval, pxavp))==NULL) {

+			LM_ERR("cannot add dst xavp to root list\n");

+			goto error;

+		}

+		cxavp = NULL;

+		n++;

+		ptr = ptr->next;

+	}

+	ul.release_urecord(r);

+	ul.unlock_udomain(dt, &aor);

+

+	/* add record count field */

+	memset(&nxval, 0, sizeof(sr_xval_t));

+	nxval.type = SR_XTYPE_INT;

+	nxval.v.i = n;

+	STR_STATIC_SET(fxname, "count");

+	if(xavp_add_value(&fxname, &nxval, &rxavp)==NULL) {

+		LM_ERR("failed to add xavp %.*s field\n", fxname.len, fxname.s);

+		xavp_destroy_list(&rxavp);

+		return -1;

+	}

+

+	/* add rxavp in root list */

+	memset(&nxval, 0, sizeof(sr_xval_t));

+	nxval.type = SR_XTYPE_XAVP;

+	nxval.v.xavp = rxavp;

+	if((pxavp = xavp_add_value(rxname, &nxval, NULL))==NULL) {

+		LM_ERR("cannot add rxavp to root list\n");

+		xavp_destroy_list(&rxavp);

+		return -1;

+	}

+

+	LM_DBG("fetched <%d> contacts for <%.*s> in [%.*s]\n",

+			n, aor.len, aor.s, cxname->len, cxname->s);

+	return 1;

+

+error:

+	ul.release_urecord(r);

+	ul.unlock_udomain(dt, &aor);

+	if(cxavp!=NULL) {

+		xavp_destroy_list(&cxavp);

+	}

+	if(rxavp!=NULL) {

+		xavp_destroy_list(&rxavp);

+	}

+	return -1;

+}

@@ -53,4 +53,7 @@ void reg_ul_expired_contact(ucontact_t* c, int type, void* param);

 sr_kemi_xval_t* ki_reg_ulc_rget(sip_msg_t* msg, str* rid, str* attr);

 sr_kemi_xval_t* ki_reg_ulc_cget(sip_msg_t* msg, str* rid, str* attr, int idx);

+int ki_lookup_xavp(sip_msg_t* msg, str *utname, str* uri,

+		str* rxname, str *cxname);

+

 #endif