107,108c107,108
< 		|| (ul.get_ucontact(*ul_record, &contact_uri, &callid, &no_str, cseq+1, &ul_contact) != 0)) {
< 		if (ul.insert_ucontact(*ul_record, &contact_uri, &ci, &ul_contact) < 0) {
---
> 		|| (ul.get_ucontact(*ul_record, &aor, &callid, &no_str, cseq+1, &ul_contact) != 0)) {
> 		if (ul.insert_ucontact(*ul_record, &aor, &ci, &ul_contact) < 0) {
203,205d202
< 	str received = {0,0};
< 	str path = {0,0};
< 	str user_agent = {0, 0};
215c212
< 	
---
> 
253c250
< 		ul.lock_udomain(domain, &aor);
---
> 		ul.lock_udomain(domain, &parsed_aor.user);
255c252
< 		result = ul.get_urecord(domain, &aor, &ul_record);
---
> 		result = ul.get_urecord(domain, &parsed_aor.user, &ul_record);
257c254
< 			ul.unlock_udomain(domain, &aor);
---
> 			ul.unlock_udomain(domain, &parsed_aor.user);
277c274
< 				if (ul.delete_urecord(domain, &aor, ul_record) < 0) {
---
> 				if (ul.delete_urecord(domain, &parsed_aor.user, ul_record) < 0) {
297,314d293
< 				
< 				received.s = xmlGetAttrContentByName(contacts, "received");
< 				if (received.s == NULL) {
<                                         LM_DBG("No received for this contact!\n");
<                                 }
< 				received.len - strlen(received.s);
< 
< 				path.s = xmlGetAttrContentByName(contacts, "path");	
< 				if (received.s == NULL) {
<                                         LM_DBG("No path for this contact!\n");
<                                 }
< 				path.len = strlen(path.s);
< 
< 				user_agent.s = xmlGetAttrContentByName(contacts, "user_agent");
< 				if (received.s == NULL) {
<                                         LM_DBG("No user_agent for this contact!\n");
<                                 }
< 				user_agent.len = strlen(user_agent.s);
373c352
< 		ul.unlock_udomain(domain, &aor);
---
> 		ul.unlock_udomain(domain, &parsed_aor.user);
386c365
< 	
---
>