@@ -15,8 +15,8 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License 

- * along with this program; if not, write to the Free Software 

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  *

  */

@@ -35,7 +35,7 @@ extern int dlginfo_increase_version;

 int pua_add_events(void)

 {

 	/* add presence */

-	if(add_pua_event(PRESENCE_EVENT, "presence", "application/pidf+xml", 

+	if(add_pua_event(PRESENCE_EVENT, "presence", "application/pidf+xml",

 				pres_process_body)< 0)

 	{

 		LM_ERR("while adding event presence\n");

@@ -68,20 +68,20 @@ int pua_add_events(void)

 	}

 	/* add message-summary*/

-	if(add_pua_event(MSGSUM_EVENT, "message-summary", 

+	if(add_pua_event(MSGSUM_EVENT, "message-summary",

 				"application/simple-message-summary", mwi_process_body)< 0)

 	{

 		LM_ERR("while adding event message-summary\n");

 		return -1;

 	}

-	

+

 	/* add presence;winfo */

 	if(add_pua_event(PWINFO_EVENT, "presence.winfo", NULL, NULL)< 0)

 	{

 		LM_ERR("while adding event presence.winfo\n");

 		return -1;

 	}

-	

+

 	/* add application/reginfo+xml */

 	if (dlginfo_increase_version) {

 		if(add_pua_event(REGINFO_EVENT, "reg", "application/reginfo+xml", reginfo_process_body)< 0) {

@@ -94,7 +94,7 @@ int pua_add_events(void)

 			return -1;

 		}

 	}

-	

+

 	/* add xcap-diff */

 	if(add_pua_event(XCAPDIFF_EVENT, "xcap-diff",

 				"application/xcap-diff+xml", 0)< 0)

@@ -105,7 +105,7 @@ int pua_add_events(void)

 	return 0;

-}	

+}

 int pres_process_body(publ_info_t* publ, str** fin_body, int ver, str** tuple_param)

 {

@@ -142,19 +142,19 @@ int pres_process_body(publ_info_t* publ, str** fin_body, int ver, str** tuple_pa

 		{

 			tuple_id= buf;

 			tuple_id_len= sprintf(tuple_id, "%p", publ);

-			tuple_id[tuple_id_len]= '\0'; 

+			tuple_id[tuple_id_len]= '\0';

 			tuple=(str*)pkg_malloc(sizeof(str));

 			if(tuple== NULL)

 			{

-				LM_ERR("No more memory\n");

+				PKG_MEM_ERROR;

 				goto error;

 			}

 			alloc_tuple = 1;

 			tuple->s= (char*)pkg_malloc(tuple_id_len* sizeof(char));

 			if(tuple->s== NULL)

 			{

-				LM_ERR("NO more memory\n");

+				PKG_MEM_ERROR;

 				goto error;

 			}

 			memcpy(tuple->s, tuple_id, tuple_id_len);

@@ -191,18 +191,18 @@ int pres_process_body(publ_info_t* publ, str** fin_body, int ver, str** tuple_pa

 			xmlFree(tuple_id);

 			tuple_id= buf;

 			tuple_id_len= strlen(tuple_id);

-		

+

 			tuple=(str*)pkg_malloc(sizeof(str));

 			if(tuple== NULL)

 			{

-				LM_ERR("No more memory\n");

+				PKG_MEM_ERROR;

 				goto error;

 			}

 			alloc_tuple= 1;

 			tuple->s= (char*)pkg_malloc(tuple_id_len* sizeof(char));

 			if(tuple->s== NULL)

 			{

-				LM_ERR("NO more memory\n");

+				PKG_MEM_ERROR;

 				goto error;

 			}

 			memcpy(tuple->s, tuple_id, tuple_id_len);

@@ -217,7 +217,7 @@ int pres_process_body(publ_info_t* publ, str** fin_body, int ver, str** tuple_pa

 		LM_DBG("found person node\n");

 		person_id= xmlNodeGetAttrContentByName(node, "id");

 		if(person_id== NULL)

-		{	

+		{

 			if(!xmlNewProp(node, BAD_CAST "id", BAD_CAST tuple_id))

 			{

 				LM_ERR("while extracting xml"

@@ -229,23 +229,23 @@ int pres_process_body(publ_info_t* publ, str** fin_body, int ver, str** tuple_pa

 		{

 			xmlFree(person_id);

 		}

-	}	

+	}

 	body= (str*)pkg_malloc(sizeof(str));

 	if(body== NULL)

 	{

-		LM_ERR("NO more memory left\n");

+		PKG_MEM_ERROR;

 		goto error;

 	}

 	memset(body, 0, sizeof(str));

-	xmlDocDumpFormatMemory(doc,(xmlChar**)(void*)&body->s, &body->len, 1);	

+	xmlDocDumpFormatMemory(doc,(xmlChar**)(void*)&body->s, &body->len, 1);

 	if(body->s== NULL || body->len== 0)

 	{

 		LM_ERR("while dumping xml format\n");

 		goto error;

-	}	

+	}

 	xmlFreeDoc(doc);

 	doc= NULL;

-	

+

 	*fin_body= body;

 	xmlMemoryDump();

 	xmlCleanupParser();

@@ -263,7 +263,7 @@ error:

 	}

 	return -1;

-}	

+}

 int bla_process_body(publ_info_t* publ, str** fin_body, int ver, str** tuple)

 {

@@ -295,20 +295,20 @@ int bla_process_body(publ_info_t* publ, str** fin_body, int ver, str** tuple)

 	if( xmlSetProp(node, (const xmlChar *)"version",(const xmlChar*)version)== NULL)

 	{

 		LM_ERR("while setting version attribute\n");

-		goto error;	

+		goto error;

 	}

 	body= (str*)pkg_malloc(sizeof(str));

 	if(body== NULL)

 	{

-		LM_ERR("NO more memory left\n");

+		PKG_MEM_ERROR;

 		goto error;

 	}

 	memset(body, 0, sizeof(str));

-	xmlDocDumpFormatMemory(doc, (xmlChar**)(void*)&body->s, &body->len, 1);	

+	xmlDocDumpFormatMemory(doc, (xmlChar**)(void*)&body->s, &body->len, 1);

 	xmlFreeDoc(doc);

 	doc= NULL;

-	*fin_body= body;	

+	*fin_body= body;

 	if(*fin_body== NULL)

 		LM_DBG("NULL fin_body\n");

@@ -322,7 +322,7 @@ error:

 		xmlFreeDoc(doc);

 	if(body)

 		pkg_free(body);

-	

+

 	xmlMemoryDump();

 	xmlCleanupParser();

 	return -1;

@@ -355,19 +355,19 @@ int reginfo_process_body(publ_info_t* publ, str** fin_body, int ver, str** tuple

 	if( xmlSetProp(node, (const xmlChar *)"version",(const xmlChar*)version)== NULL) {

 		LM_ERR("while setting version attribute\n");

-		goto error;	

+		goto error;

 	}

 	body= (str*)pkg_malloc(sizeof(str));

 	if(body== NULL) {

-		LM_ERR("NO more memory left\n");

+		PKG_MEM_ERROR;

 		goto error;

 	}

 	memset(body, 0, sizeof(str));

-	xmlDocDumpFormatMemory(doc, (xmlChar**)(void*)&body->s, &body->len, 1);	

+	xmlDocDumpFormatMemory(doc, (xmlChar**)(void*)&body->s, &body->len, 1);

 	xmlFreeDoc(doc);

 	doc= NULL;

-	*fin_body= body;	

+	*fin_body= body;

 	if(*fin_body== NULL)

 		LM_DBG("NULL fin_body\n");

@@ -381,7 +381,7 @@ error:

 		xmlFreeDoc(doc);

 	if(body)

 		pkg_free(body);

-	

+

 	xmlMemoryDump();

 	xmlCleanupParser();

 	return -1;

@@ -15,8 +15,8 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License 

- * along with this program; if not, write to the Free Software 

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  *

  */

@@ -36,11 +36,11 @@ pua_event_t* init_pua_evlist(void)

 	list= (pua_event_t*)shm_malloc(sizeof(pua_event_t));

 	if(list== NULL)

 	{

-		LM_ERR("no more share memory\n");

+		SHM_MEM_ERROR;

 		return NULL;

 	}

 	list->next= NULL;

-	

+

 	return list;

 }

@@ -48,12 +48,12 @@ pua_event_t* init_pua_evlist(void)

 int add_pua_event(int ev_flag, char* name, char* content_type,

 		evs_process_body_t* process_body)

 {

-		

+

 	pua_event_t* event= NULL;

 	int size;

 	int name_len;

 	int ctype_len= 0;

-	str str_name;	

+	str str_name;

 	name_len= strlen(name);

 	str_name.s= name;

@@ -72,9 +72,9 @@ int add_pua_event(int ev_flag, char* name, char* content_type,

 	event= (pua_event_t*)shm_malloc(size);

 	if(event== NULL)

 	{

-		LM_ERR("No more share memory\n");

+		SHM_MEM_ERROR;

 		return -1;

-	}	

+	}

 	memset(event, 0, size);

 	size= sizeof(pua_event_t);

@@ -82,13 +82,13 @@ int add_pua_event(int ev_flag, char* name, char* content_type,

 	memcpy(event->name.s, name, name_len);

 	event->name.len= name_len;

 	size+= name_len;

-			

+

 	if(content_type)

 	{

 		event->content_type.s= (char*)event+ size;

 		memcpy(event->content_type.s, content_type, ctype_len);

 		event->content_type.len= ctype_len;

-		size+= ctype_len;		

+		size+= ctype_len;

 	}

 	event->process_body= process_body;

@@ -98,7 +98,7 @@ int add_pua_event(int ev_flag, char* name, char* content_type,

 	pua_evlist->next= event;

 	return 0;

-}	

+}

 pua_event_t* contains_pua_event(str* name)

 {

@@ -110,12 +110,12 @@ pua_event_t* contains_pua_event(str* name)

 		if(event->name.len== name->len &&

 				strncmp(event->name.s, name->s, name->len)== 0)

 		{

-			return event;	

+			return event;

 		}

 		event= event->next;

-	}	

+	}

-	return NULL;	

+	return NULL;

 }

 pua_event_t* get_event(int ev_flag)

@@ -127,11 +127,11 @@ pua_event_t* get_event(int ev_flag)

 	{

 		if(event->ev_flag== ev_flag)

 		{

-			return event;	

+			return event;

 		}

 		event= event->next;

-	}	

-	return NULL;	

+	}

+	return NULL;

 }

@@ -147,8 +147,8 @@ void destroy_pua_evlist(void)

 			e2= e1->next;

 			shm_free(e1);

 			e1= e2;

-		}	

+		}

 		shm_free(pua_evlist);

-	}	

+	}

-}	

+}

@@ -15,8 +15,8 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License 

- * along with this program; if not, write to the Free Software 

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

@@ -31,7 +31,7 @@

 #include "../../core/hashes.h"

 #include "../../core/parser/msg_parser.h"

 #include "../../core/parser/parse_from.h"

-#include "hash.h" 

+#include "hash.h"

 #include "pua.h"

 #include "pua_db.h"

 #include "send_publish.h"

@@ -40,14 +40,14 @@ void print_ua_pres(ua_pres_t* p)

 {

 	LM_DBG("\tpres_uri= %.*s   len= %d\n", p->pres_uri->len, p->pres_uri->s, p->pres_uri->len);

 	if(p->watcher_uri)

-	{	

+	{

 		LM_DBG("\twatcher_uri= %.*s  len= %d\n", p->watcher_uri->len, p->watcher_uri->s, p->watcher_uri->len);

 		LM_DBG("\tcall_id= %.*s   len= %d\n", p->call_id.len, p->call_id.s, p->call_id.len);

 		LM_DBG("\tfrom_tag= %.*s   len= %d\n", p->from_tag.len, p->from_tag.s, p->from_tag.len);

 		LM_DBG("\tto_tag= %.*s  len= %d\n", p->to_tag.len, p->to_tag.s, p->to_tag.len);

 		LM_DBG("\tflag= %d\n", p->flag);

 		LM_DBG("\tevent= %d\n", p->event);

-	}	

+	}

 	else

 	{

 		LM_DBG("\tetag= %.*s - len= %d\n", p->etag.len, p->etag.s, p->etag.len);

@@ -71,7 +71,7 @@ htable_t* new_htable(void)

 	if(H== NULL)

 	{

-		LM_ERR("No more memory\n");

+		SHM_MEM_ERROR;

 		return NULL;

 	}

 	memset(H, 0, sizeof(htable_t));

@@ -79,8 +79,8 @@ htable_t* new_htable(void)

 	H->p_records= (hash_entry_t*)shm_malloc(HASH_SIZE* sizeof(hash_entry_t));

 	if(H->p_records== NULL)

 	{

-		LM_ERR("No more share memory\n");

-		goto error;		

+		SHM_MEM_ERROR;

+		goto error;

 	}

 	for(i=0; i<HASH_SIZE; i++)

@@ -93,9 +93,9 @@ htable_t* new_htable(void)

 		H->p_records[i].entity= (ua_pres_t*)shm_malloc(sizeof(ua_pres_t));

 		if(H->p_records[i].entity== NULL)

 		{

-			LM_ERR("No more share memory\n");

-			goto error;		

-		}	

+			SHM_MEM_ERROR;

+			goto error;

+		}

 		H->p_records[i].entity->next= NULL;

 	}

 	return H;

@@ -138,12 +138,12 @@ ua_pres_t* search_htable(ua_pres_t* pres, unsigned int hash_code)

 			if((p->pres_uri->len==pres->pres_uri->len) &&

 					(strncmp(p->pres_uri->s, pres->pres_uri->s,pres->pres_uri->len)==0))

 			{

-				if(pres->id.s && pres->id.len) 

-				{	

+				if(pres->id.s && pres->id.len)

+				{

 					if(!(pres->id.len== p->id.len &&

 						strncmp(p->id.s, pres->id.s,pres->id.len)==0))

 							continue;

-				}				

+				}

 				if(pres->watcher_uri)

 				{

@@ -167,7 +167,7 @@ ua_pres_t* search_htable(ua_pres_t* pres, unsigned int hash_code)

 					{

 						if(pres->etag.len== p->etag.len &&

 							strncmp(p->etag.s, pres->etag.s,pres->etag.len)==0)

-							break;		

+							break;

 					}

 					else

 					{

@@ -198,16 +198,20 @@ void update_htable(ua_pres_t* p, time_t desired_expires, int expires,

 	}

 	if(etag)

-	{	

+	{

 		shm_free(p->etag.s);

 		p->etag.s= (char*)shm_malloc(etag->len);

+		if(p->etag.s == NULL) {

+			SHM_MEM_ERROR;

+			return;

+		}

 		memcpy(p->etag.s, etag->s, etag->len);

 		p->etag.len= etag->len;

 	}

 	p->expires= expires+ (int)time(NULL);

 	p->desired_expires= desired_expires;

-		

+

 	if(p->db_flag & NO_UPDATEDB_FLAG)

 		p->db_flag= UPDATEDB_FLAG;

@@ -216,7 +220,7 @@ void update_htable(ua_pres_t* p, time_t desired_expires, int expires,

 	if(contact)

 	{

-		if(!(p->remote_contact.len== contact->len && 

+		if(!(p->remote_contact.len== contact->len &&

 				strncmp(p->remote_contact.s, contact->s, contact->len)==0))

 		{

 			/* update remote contact */

@@ -224,7 +228,7 @@ void update_htable(ua_pres_t* p, time_t desired_expires, int expires,

 			p->remote_contact.s= (char*)shm_malloc(contact->len* sizeof(char));

 			if(p->remote_contact.s== NULL)

 			{

-				LM_ERR("no more shared memory\n");

+				SHM_MEM_ERROR;

 				return;

 			}

 			memcpy(p->remote_contact.s, contact->s, contact->len);

@@ -247,7 +251,7 @@ void insert_htable(ua_pres_t* presentity, unsigned int hash_code)

 	presentity->db_flag= INSERTDB_FLAG;

 	presentity->next= p->next;

-	

+

 	p->next= presentity;

 }

@@ -256,7 +260,7 @@ void insert_htable(ua_pres_t* presentity, unsigned int hash_code)

    everywhere it is used it is passed a pointer to the correct

    hash table entry already...  so let's just delete that */

 void delete_htable(ua_pres_t* presentity, unsigned int hash_code)

-{ 

+{

 	ua_pres_t *q = NULL;

 	if (dbmode==PUA_DB_ONLY)

@@ -273,7 +277,7 @@ void delete_htable(ua_pres_t* presentity, unsigned int hash_code)

 	while (q->next != presentity)

 		q = q->next;

 	q->next = presentity->next;

-	

+

 	if(presentity->etag.s)

 		shm_free(presentity->etag.s);

 	else

@@ -284,7 +288,7 @@ void delete_htable(ua_pres_t* presentity, unsigned int hash_code)

 	presentity = NULL;

 }

-	

+

 void destroy_htable(void)

 {

 	ua_pres_t* p= NULL,*q= NULL;

@@ -297,7 +301,7 @@ void destroy_htable(void)

 	}

 	for(i=0; i<HASH_SIZE; i++)

-	{	

+	{

 		lock_destroy(&HashT->p_records[i].lock);

 		p=HashT->p_records[i].entity;

 		while(p->next)

@@ -317,7 +321,7 @@ void destroy_htable(void)

 	}

     shm_free(HashT->p_records);

 	shm_free(HashT);

-  

+

   return;

 }

@@ -326,7 +330,7 @@ int convert_temporary_dialog(ua_pres_t *dialog)

 	ua_pres_t *temp_dialog;

 	unsigned int hash_code;

-	hash_code= core_hash(dialog->pres_uri,dialog->watcher_uri, HASH_SIZE); 

+	hash_code= core_hash(dialog->pres_uri,dialog->watcher_uri, HASH_SIZE);

 	lock_get(&HashT->p_records[hash_code].lock);

 	temp_dialog = get_temporary_dialog(dialog, hash_code);

@@ -374,19 +378,19 @@ ua_pres_t* get_dialog(ua_pres_t* dialog, unsigned int hash_code)

 			LM_DBG("searched to_tag= %.*s\tfrom_tag= %.*s\n",

 				 p->to_tag.len, p->to_tag.s, p->from_tag.len, p->from_tag.s);

-	    

+

 			if( (strncmp(p->call_id.s, dialog->call_id.s, p->call_id.len)== 0) &&

 				p->to_tag.len > 0 &&

 				(strncmp(p->to_tag.s, dialog->to_tag.s, p->to_tag.len)== 0) &&

 				(strncmp(p->from_tag.s, dialog->from_tag.s, p->from_tag.len)== 0) )

-				{	

+				{

 					LM_DBG("FOUND dialog\n");

 					break;

 				}

-		}	

-	

+		}

+

 	}

-		

+

 	return p;

 }

@@ -449,14 +453,14 @@ int get_record_id(ua_pres_t* dialog, str** rec_id)

 	id= (str*)pkg_malloc(sizeof(str));

 	if(id== NULL)

 	{

-		LM_ERR("No more memory\n");

+		PKG_MEM_ERROR;

 		lock_release(&HashT->p_records[hash_code].lock);

 		return -1;

 	}

 	id->s= (char*)pkg_malloc(rec->id.len* sizeof(char));

 	if(id->s== NULL)

 	{

-		LM_ERR("No more memory\n");

+		PKG_MEM_ERROR;

 		pkg_free(id);

 		lock_release(&HashT->p_records[hash_code].lock);

 		return -1;

@@ -484,7 +488,7 @@ int is_dialog(ua_pres_t* dialog)

 	if (dbmode==PUA_DB_ONLY)

 	{

 		return( is_dialog_puadb(dialog) );

-	}	

+	}

 	hash_code= core_hash(dialog->pres_uri, dialog->watcher_uri, HASH_SIZE);

 	lock_get(&HashT->p_records[hash_code].lock);

@@ -499,7 +503,7 @@ int is_dialog(ua_pres_t* dialog)

 		ret_code= 0;

 	}

 	lock_release(&HashT->p_records[hash_code].lock);

-	

+

 	return ret_code;

 }

@@ -522,8 +526,8 @@ int ki_pua_update_contact(struct sip_msg* msg)

 	{

 		LM_ERR("cannot parse callid header\n");

 		return -1;

-	}		

-	

+	}

+

 	if (!msg->from || !msg->from->body.s)

 	{

 		LM_ERR("cannot find 'from' header!\n");

@@ -531,27 +535,27 @@ int ki_pua_update_contact(struct sip_msg* msg)

 	}

 	if (msg->from->parsed == NULL)

 	{

-		if ( parse_from_header( msg )<0 ) 

+		if ( parse_from_header( msg )<0 )

 		{

 			LM_ERR("cannot parse From header\n");

 			return -1;

 		}

 	}

-	

+

 	pfrom = (struct to_body*)msg->from->parsed;

-	

+

 	if( pfrom->tag_value.s ==NULL || pfrom->tag_value.len == 0)

 	{

 		LM_ERR("no from tag value present\n");

 		return -1;

-	}		

-	

+	}

+

 	if( msg->to==NULL || msg->to->body.s==NULL)

 	{

 		LM_ERR("cannot parse TO header\n");

 		return -1;

-	}			

-	

+	}

+

 	if(msg->to->parsed != NULL)

 	{

 		pto = (struct to_body*)msg->to->parsed;

@@ -561,24 +565,24 @@ int ki_pua_update_contact(struct sip_msg* msg)

 	{

 		parse_to(msg->to->body.s,msg->to->body.s +

 			msg->to->body.len + 1, &TO);

-		if(TO.uri.len <= 0) 

+		if(TO.uri.len <= 0)

 		{

 			LM_DBG("'To' header NOT parsed\n");

 			goto error;

 		}

 		pto = &TO;

-	}			

+	}

 	if( pto->tag_value.s ==NULL || pto->tag_value.len == 0)

 	{

 		LM_ERR("no from tag value present\n");

 		goto error;

 	}

 	hentity.watcher_uri= &pto->uri;

-	hentity.pres_uri= &pfrom->uri; 

+	hentity.pres_uri= &pfrom->uri;

 	hentity.call_id=  msg->callid->body;

 	hentity.to_tag= pto->tag_value;

 	hentity.from_tag= pfrom->tag_value;

-	

+

 	/* extract the contact */

 	if(msg->contact== NULL || msg->contact->body.s== NULL)

@@ -610,7 +614,7 @@ int ki_pua_update_contact(struct sip_msg* msg)

 	shm_free(p->remote_contact.s);

-	if(!(p->remote_contact.len== contact.len && 

+	if(!(p->remote_contact.len== contact.len &&

 				strncmp(p->remote_contact.s, contact.s, contact.len)==0))

 	{

 		/* update remote contact */

@@ -618,7 +622,7 @@ int ki_pua_update_contact(struct sip_msg* msg)

 		p->remote_contact.s= (char*)shm_malloc(contact.len* sizeof(char));

 		if(p->remote_contact.s== NULL)

 		{

-			LM_ERR("no more shared memory\n");

+			SHM_MEM_ERROR;

 			lock_release(&HashT->p_records[hash_code].lock);

 			goto error;

 		}

@@ -665,14 +669,14 @@ list_entry_t *get_subs_list(str *did)

 			{

 				if ((tmp_str = (str *)pkg_malloc(sizeof(str))) == NULL)

 				{

-					LM_ERR("out of private memory\n");

+					PKG_MEM_ERROR;

 					lock_release(&HashT->p_records[i].lock);

 					goto done;

 				}

 				if ((tmp_str->s = (char *)pkg_malloc(sizeof(char) * dialog->pres_uri->len + 1)) == NULL)

 				{

 					pkg_free(tmp_str);

-					LM_ERR("out of private memory\n");

+					PKG_MEM_ERROR;

 					lock_release(&HashT->p_records[i].lock);

 					goto done;

 				}

@@ -498,7 +498,7 @@ static int db_restore(void)

 			p= (ua_pres_t*)shm_malloc(size);

 			if(p== NULL)

 			{

-				LM_ERR("no more share memmory");

+				SHM_MEM_ERROR;

 				goto error;

 			}

 			memset(p, 0, size);

@@ -568,7 +568,7 @@ static int db_restore(void)

 				p->remote_contact.s= (char*)shm_malloc(remote_contact.len* sizeof(char));

 				if(p->remote_contact.s== NULL)

 				{

-					LM_ERR("No more shared memory\n");

+					SHM_MEM_ERROR;

 					goto error;

 				}

 				memcpy(p->remote_contact.s, remote_contact.s, remote_contact.len);

@@ -600,7 +600,7 @@ static int db_restore(void)

 				p->etag.s= (char*)shm_malloc(etag.len* sizeof(char));

 				if(p->etag.s==  NULL)

 				{

-					LM_ERR("no more share memory\n");

+					SHM_MEM_ERROR;

 					goto error;

 				}

 				memcpy(p->etag.s, etag.s, etag.len);

@@ -15,8 +15,8 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License 

- * along with this program; if not, write to the Free Software 

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

@@ -35,7 +35,7 @@ int init_puacb_list(void)

 		( sizeof(struct puacb_head_list) );

 	if (puacb_list==0)

 	{

-		LM_CRIT("no more shared mem\n");

+		SHM_MEM_ERROR;

 		return -1;

 	}

 	puacb_list->first = 0;

@@ -55,7 +55,7 @@ void destroy_puacb_list(void)

 	{

 		cbp_tmp = cbp;

 		cbp = cbp->next;

-		if (cbp_tmp->param) 

+		if (cbp_tmp->param)

 			shm_free( cbp_tmp->param );

 		shm_free( cbp_tmp );

 	}

@@ -71,7 +71,7 @@ int register_puacb( int types, pua_cb f, void* param )

 	struct pua_callback *cbp;

 	/* are the callback types valid?... */

-	if ( types<0 || types>PUACB_MAX ) 

+	if ( types<0 || types>PUACB_MAX )

 	{

 		LM_CRIT("invalid callback types: mask=%d\n",types);

 		return E_BUG;

@@ -84,9 +84,9 @@ int register_puacb( int types, pua_cb f, void* param )

 	}

 	/* build a new callback structure */

-	if (!(cbp=(struct pua_callback*)shm_malloc(sizeof( struct pua_callback)))) 

+	if (!(cbp=(struct pua_callback*)shm_malloc(sizeof( struct pua_callback))))

 	{

-		LM_ERR("out of share mem\n");

+		SHM_MEM_ERROR;

 		return E_OUT_OF_MEM;

 	}

@@ -1,5 +1,5 @@

 /*

- * pua db - presence user agent database support 

+ * pua db - presence user agent database support

  *

  * Copyright (C) 2011 Crocodile RCS Ltd

  *

@@ -15,8 +15,8 @@

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

  *

- * You should have received a copy of the GNU General Public License 

- * along with this program; if not, write to the Free Software 

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

@@ -62,7 +62,7 @@ static str str_version_col = str_init("version");

 void free_results_puadb( db1_res_t *res )

 {

-	if (res) 

+	if (res)

 	{

 		pua_dbf.free_result(pua_db, res);

 		res = NULL;

@@ -164,7 +164,7 @@ int clean_puadb( int update_period, int min_expires )

 	q_vals[0].type = DB1_INT;

 	q_vals[0].nul = 0;

 	q_vals[0].val.int_val = now+update_period;

-	q_ops[0] = OP_LT; 	

+	q_ops[0] = OP_LT;

 	if (pua_dbf.use_table(pua_db, &db_table) < 0) {

 	    LM_ERR("error in use_table pua\n");

@@ -186,7 +186,7 @@ int clean_puadb( int update_period, int min_expires )

 	if (RES_ROW_N(res) == 0)

 	{

-		/* no match */ 

+		/* no match */

 		LM_DBG( "No records matched for clean\n");

 		pua_dbf.free_result(pua_db, res);

 		return(0);

@@ -202,7 +202,7 @@ int clean_puadb( int update_period, int min_expires )

 		{

 			values = ROW_VALUES(rows+i);

-			extract_row( values, &p ); 

+			extract_row( values, &p );

 			id = VAL_INT(values);

 			if((p.desired_expires> p.expires + min_expires) || (p.desired_expires== 0 ))

@@ -224,8 +224,8 @@ int clean_puadb( int update_period, int min_expires )

 				if ( pua_dbf.delete(pua_db, q_cols, 0, q_vals, 1) < 0 )

 				{

-					LM_ERR( "Failed to delete from db\n" ); 

-				}			

+					LM_ERR( "Failed to delete from db\n" );

+				}

 			}

 		}

@@ -238,7 +238,7 @@ int clean_puadb( int update_period, int min_expires )

 /******************************************************************************/

-int is_dialog_puadb(ua_pres_t *pres) 

+int is_dialog_puadb(ua_pres_t *pres)

 {

 	int nr_rows;

@@ -254,26 +254,26 @@ int is_dialog_puadb(ua_pres_t *pres)

 	}

 	/* cols and values used for search query */

-	q_cols[n_query_cols] = &str_call_id_col;	

+	q_cols[n_query_cols] = &str_call_id_col;

 	q_vals[n_query_cols].type = DB1_STR;

 	q_vals[n_query_cols].nul = 0;

 	q_vals[n_query_cols].val.str_val = pres->call_id;

 	n_query_cols++;

-	q_cols[n_query_cols] = &str_to_tag_col;	

+	q_cols[n_query_cols] = &str_to_tag_col;

 	q_vals[n_query_cols].type = DB1_STR;

 	q_vals[n_query_cols].nul = 0;

 	q_vals[n_query_cols].val.str_val = pres->to_tag;

 	n_query_cols++;

-	q_cols[n_query_cols] = &str_from_tag_col;	

+	q_cols[n_query_cols] = &str_from_tag_col;

 	q_vals[n_query_cols].type = DB1_STR;

 	q_vals[n_query_cols].nul = 0;

 	q_vals[n_query_cols].val.str_val = pres->from_tag;

 	n_query_cols++;

 	/* return the id column, even though don't actually need */

-	res_cols[n_res_cols] = &str_id_col;	

+	res_cols[n_res_cols] = &str_id_col;

 	n_res_cols++;

 	if(pua_db == NULL)

@@ -306,7 +306,7 @@ int is_dialog_puadb(ua_pres_t *pres)

 	if (nr_rows == 0)

 	{

-		/* no match */ 

+		/* no match */

 		LM_DBG("No rows found.\n");

 		return(-1);