@@ -79,6 +79,8 @@ static int w_registered3(struct sip_msg* _m, char* _d, char* _uri, char* _flags)

 static int w_registered4(struct sip_msg* _m, char* _d, char* _uri, char* _flags,

 		char* _actionflags);

 static int w_reg_send_reply(sip_msg_t* _m, char* _p1, char* _p2);

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

+		char *_pmode);

 /*! \brief Fixup functions */

 static int domain_fixup(void** param, int param_no);

@@ -210,6 +212,8 @@ static cmd_export_t cmds[] = {

 			REQUEST_ROUTE | FAILURE_ROUTE },

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

 			fixup_free_spve_null, ANY_ROUTE },

+	{"reg_from_user",  (cmd_function)w_reg_from_user,  3,  fixup_ssi,

+			fixup_free_ssi, 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,

@@ -560,6 +564,29 @@ static int w_lookup_xavp(sip_msg_t* _m, char* _ptname, char* _puri,

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

 }

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

+		char *_pmode)

+{

+	str vtname = STR_NULL;

+	str vuri = STR_NULL;

+	int vmode = 0;

+

+	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_ivalue(_m, (gparam_t*)_pmode, &vmode) != 0) {

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

+		return -1;

+	}

+

+	return ki_reg_from_user(_m, &vtname, &vuri, vmode);

+}

+

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

 {

 	str uri = {0};

@@ -984,7 +1011,7 @@ static sr_kemi_t sr_kemi_registrar_exports[] = {

 	},

 	{ 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_STR, SR_KEMIP_STR,

 			SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE }

 	},

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

@@ -1037,6 +1064,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("reg_from_user"),

+		SR_KEMIP_INT, ki_reg_from_user,

+		{ SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT,

+			SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }

+	},

 	{ str_init("registrar"), str_init("reg_send_reply"),

 		SR_KEMIP_INT, ki_reg_send_reply,

 		{ SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

@@ -33,6 +33,7 @@

 #include "../../core/mod_fix.h"

 #include "../../core/route.h"

 #include "../../core/action.h"

+#include "../../core/resolve.h"

 #include "../../core/fmsg.h"

 #include "../../core/kemi.h"

 #include "../../core/receive.h"

@@ -994,3 +995,88 @@ error:

 	}

 	return -1;

 }

+

+#define REG_FROM_USER_MPORT (1)

+#define REG_FROM_USER_MPROTO (1<<1)

+/**

+ *

+ */

+int ki_reg_from_user(sip_msg_t* msg, str *utname, str* uri, int vmode)

+{

+	udomain_t* dt;

+	urecord_t* r;

+	ucontact_t* ptr;

+	str aor = {0, 0};

+	sip_uri_t rcvuri;

+	int res = -1;

+	int ret = -1;

+	ip_addr_t ipb;

+

+	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;

+	}

+

+	/* 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);

+		return -1;

+	}

+

+	for(ptr = r->contacts; ptr; ptr = ptr->next) {

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

+			if (parse_uri(ptr->received.s, ptr->received.len, &rcvuri) < 0) {

+				LM_ERR("failed to parse rcv uri [%.*s]\n",

+						ptr->received.len, ptr->received.s);

+				goto error;

+			}

+		} else {

+			if (parse_uri(ptr->c.s, ptr->c.len, &rcvuri) < 0) {

+				LM_ERR("failed to parse contact uri [%.*s]\n",

+						ptr->received.len, ptr->received.s);

+				goto error;

+			}

+		}

+		if(str2ipxbuf(&rcvuri.host, &ipb) < 0) {

+			LM_WARN("failed to convert ip [%.*s] - ignoring\n",

+					rcvuri.host.len, rcvuri.host.s);

+			continue;

+		}

+		if(!ip_addr_cmp(&msg->rcv.src_ip, &ipb)) {

+			continue;

+		}

+		if(vmode & REG_FROM_USER_MPORT) {

+			if(msg->rcv.src_port!=rcvuri.port_no) {

+				continue;

+			}

+		}

+		if(vmode & REG_FROM_USER_MPROTO) {

+			if(msg->rcv.proto!=rcvuri.proto) {

+				continue;

+			}

+		}

+		LM_DBG("matched contact record with source address [%.*s]\n",

+				rcvuri.host.len, rcvuri.host.s);

+		ret = 1;

+		break;

+	}

+	ul.release_urecord(r);

+	ul.unlock_udomain(dt, &aor);

+

+	return ret;

+

+error:

+	ul.release_urecord(r);

+	ul.unlock_udomain(dt, &aor);

+	return -1;

+

+}

+

@@ -55,5 +55,6 @@ 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);

+int ki_reg_from_user(sip_msg_t* msg, str *utname, str* uri, int vmode);

 #endif