@@ -38,6 +38,8 @@ Anca-Maria Vamanu

         2.1. bind_pua(pua_api_t* api)

         2.2. send_publish(publ_info_t*)

         2.3. send_subscribe(subs_info_t*)

+        2.4. pua_is_dialog(ua_prea_t*)

+        2.5. register_puacb(int types, pua_cb f, void* param)

    3. Frequently Asked Questions

@@ -50,6 +52,8 @@ Anca-Maria Vamanu

    1-6. Set update_period parameter

    1-7. PUA tables

    2-1. pua_api structure

+   2-2. pua_is_dialog usage example

+   2-3. register_puacb usage example

      _________________________________________________________

 Chapter 1. User's Guide

@@ -60,12 +64,16 @@ Chapter 1. User's Guide

    client, sending Subscribe and Publish messages.

    Now it can be used with the following modules: pua_mi and

-   pua_usrloc. The pua_mi offer the possiblity to publish any

-   kind of information or subscribing to a resource through fifo.

-   The pua_usrloc module calls a function exported by pua modules

-   to publish elementary presence information, such as basic

-   status "open" or "closed", for clients that do not implement

-   client-to-server presence.

+   pua_usrloc, pua_bla and pua_xmpp. The pua_mi offer the

+   possibility to publish any kind of information or subscribing

+   to a resource through fifo. The pua_usrloc module calls a

+   function exported by pua modules to publish elementary

+   presence information, such as basic status "open" or "closed",

+   for clients that do not implement client-to-server presence.

+   Through pua_bla , BRIDGED LINE APPEARANCE features are added

+   to openser. The pua_xmpp module represents a gateway between

+   SIP and XMPP, so that jabber and SIP clients can exchange

+   presence information.

    The module use cache to store presentity list and writes to

    database on timer to be able to recover upon restart.

@@ -187,6 +195,7 @@ CREATE TABLE pua (

   id int(10) unsigned NOT NULL auto_increment,

   pres_uri varchar(128) NOT NULL,

   pres_id varchar(128) NOT NULL,

+  event int(11) NOT NULL,

   expires int(11) NOT NULL,

   flag int(11) NOT NULL,

   etag varchar(128) NOT NULL,

@@ -196,6 +205,7 @@ CREATE TABLE pua (

   to_tag varchar(128) NOT NULL,

   from_tag varchar(128) NOT NULL,

   cseq int(11) NOT NULL,

+  version int(11) NOT NULL,

   PRIMARY KEY  (`id`)

 ) ENGINE=MyISAM;

@@ -274,6 +284,43 @@ typedef struct subs_info

 ...

      _________________________________________________________

+2.4. pua_is_dialog(ua_prea_t*)

+

+   This function checks is the parameter coresponds to a stored

+   Subscribe initiated dialog.

+

+   Example 2-2. pua_is_dialog usage example

+...

+        if(pua_is_dialog(dialog)< 0)

+        {

+                LOG(L_ERR, "ERROR while querying dialog\n");

+                goto error;

+        }

+...

+     _________________________________________________________

+

+2.5. register_puacb(int types, pua_cb f, void* param)

+

+   This function registers a callback to be called on receiving

+   the reply message for the sent request( Publish or Subscribe).

+   The type parameter should be set the same as the source_flag

+   for that request. The function registered as callback for pua

+   should be of type pua_cb , which is: typedef void

+   (pua_cb)(ua_pres_t* hentity, struct msg_start * fl); The

+   parameters are the dialog structure for that request and the

+   first line of the reply message.

+

+   Example 2-3. register_puacb usage example

+...

+        if(pua.register_puacb(XMPP_SUBSCRIBE, Sipreply2Xmpp, NULL)< 0)

+        {

+                LOG(L_ERR, "PUA_XMPP:mod_init Could not register

+                callback\n");

+                return -1;

+        }

+...

+     _________________________________________________________

+

 Chapter 3. Frequently Asked Questions

    3.1. Where can I find more about OpenSER?

@@ -5,6 +5,7 @@ CREATE TABLE pua (

   id int(10) unsigned NOT NULL auto_increment,

   pres_uri varchar(128) NOT NULL,

   pres_id varchar(128) NOT NULL,

+  event int(11) NOT NULL,  

   expires int(11) NOT NULL,

   flag int(11) NOT NULL,

   etag varchar(128) NOT NULL,

@@ -14,6 +15,7 @@ CREATE TABLE pua (

   to_tag varchar(128) NOT NULL,

   from_tag varchar(128) NOT NULL,

   cseq int(11) NOT NULL,

+  version int(11) NOT NULL,

   PRIMARY KEY  (`id`)

 ) ENGINE=MyISAM;

@@ -100,6 +100,55 @@ typedef struct subs_info

 </programlisting>

 		</para>

 	</section>

+	<section>

+		<title>

+			<function moreinfo="none">pua_is_dialog(ua_prea_t*)</function>

+		</title>

+		<para>

+			This function checks is the parameter coresponds to a stored

+			Subscribe initiated dialog. 

+		</para>

+		<example>

+		<title><function>pua_is_dialog </function>usage example</title>

+	<programlisting format="linespecific">

+...	

+	if(pua_is_dialog(dialog)< 0)

+	{

+		LOG(L_ERR, "ERROR while querying dialog\n");

+		goto error;

+	}

+...	

+</programlisting>

+		</example>

+		</section>

+		<section>

+		<title>

+			<function moreinfo="none">register_puacb(int types, pua_cb f, void* param)</function>

+		</title>

+		<para>

+			This function registers a callback to be called on receiving the reply message

+			for the sent request( Publish or Subscribe).

+			The type parameter should be set the same as the source_flag for that request.

+			The function registered as callback for pua should be of type pua_cb , which is:

+			typedef void (pua_cb)(ua_pres_t* hentity, struct msg_start * fl);

+			The parameters are the dialog structure for that request and the first line of the

+			reply message.

+		</para>

+		<example>

+		<title><function>register_puacb </function>usage example</title>

+	<programlisting format="linespecific">

+...

+	if(pua.register_puacb(XMPP_SUBSCRIBE, Sipreply2Xmpp, NULL)< 0)

+	{

+		LOG(L_ERR, "PUA_XMPP:mod_init Could not register

+		callback\n");

+		return -1;

+	}

+...	

+	</programlisting>

+		</example>

+

+		</section>

 </chapter>

 <!-- Keep this element at the end of the file

@@ -18,12 +18,16 @@

 		sending Subscribe and Publish messages. 

 	</para>

 	<para>

-		 Now it can be used with the following modules: pua_mi and pua_usrloc.

-		 The pua_mi offer the possiblity to publish any kind of information

+		 Now it can be used with the following modules: pua_mi and pua_usrloc,

+		 pua_bla and pua_xmpp.

+		 The pua_mi offer the possibility to publish any kind of information

 		 or subscribing to a resource through fifo. The pua_usrloc module calls

 		 a function exported by pua modules to publish elementary presence

 		 information, such as basic status "open" or "closed", for clients that

-		 do not implement client-to-server presence.  

+		 do not implement client-to-server presence.

+		 Through pua_bla , BRIDGED LINE APPEARANCE features are added to openser.

+		 The pua_xmpp module represents a gateway between SIP and XMPP, so that 

+		 jabber and SIP clients can exchange presence information. 

 	</para>

 	<para>

 		The module use cache to store presentity list and writes to database

@@ -92,27 +92,31 @@ error:

 }

-ua_pres_t* search_htable(str* pres_uri, str* watcher_uri, str id,

-		int FLAG, int event,unsigned int hash_code)

+

+ua_pres_t* search_htable(str* pres_uri, str* watcher_uri, int FLAG, 

+		str id, unsigned int hash_code)

 {

 	ua_pres_t* p= NULL,* L= NULL;

 	L= HashT->p_records[hash_code].entity;

 	DBG("PUA: search_htable: core_hash= %u\n", hash_code);

+	if(FLAG& BLA_SUBSCRIBE)

+	{

+		DBG("PUA: search_htable: Search BLA_SUBSCRIBE_FLAG\n");

+	}

 	for(p= L->next; p; p=p->next)

 	{

-		if((p->event== event) && (p->flag & FLAG))

+

+		if(p->flag & FLAG)

 		{

 			DBG("PUA: search_htable:pres_uri= %.*s len= %d\n",

 					p->pres_uri->len, p->pres_uri->s, p->pres_uri->len);

 			DBG("PUA: search_htable:searched uri= %.*s len= %d\n",

 					pres_uri->len,pres_uri->s, pres_uri->len);

-

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

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

 			{

-				DBG("PUA: search_htable:found pres_ur\n");

 				if(watcher_uri)

 				{

 					if(p->watcher_uri->len==watcher_uri->len &&

@@ -126,7 +130,6 @@ ua_pres_t* search_htable(str* pres_uri, str* watcher_uri, str id,

 				{

 					if(id.s)

 					{	

-						DBG("PUA: search_htable: compare id\n");

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

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

 							break;

@@ -151,7 +154,7 @@ void update_htable(ua_pres_t* presentity,time_t desired_expires, int expires, un

 	DBG("PUA:hash_update ..\n");

 	p= search_htable(presentity->pres_uri, presentity->watcher_uri,

-				presentity->id, presentity->flag,presentity->event, hash_code);

+				 presentity->flag, presentity->id, hash_code);

 	if(p== NULL)

 	{

 		DBG("PUA:hash_update : no recod found\n");

@@ -167,7 +170,7 @@ void update_htable(ua_pres_t* presentity,time_t desired_expires, int expires, un

 		p->cseq ++;

 }

-

+/* insert in front; so when searching the most recent result is returned*/

 void insert_htable(ua_pres_t* presentity)

 {

 	ua_pres_t* p= NULL;

@@ -175,22 +178,22 @@ void insert_htable(ua_pres_t* presentity)

 	hash_code= core_hash(presentity->pres_uri,presentity->watcher_uri, 

 			HASH_SIZE);

-

+	

 	if(presentity->expires < (int)time(NULL))

 	{

 		LOG(L_ERR, "PUA: insert_htable: expired information- do not insert\n");

 		return;

 	}

-

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

-	p= search_htable(presentity->pres_uri, presentity->watcher_uri,

-				presentity->id, presentity->flag, presentity->event, hash_code);

-	if(p) 

+/*	

+ *	useless since always checking before calling insert

+	if(get_dialog(presentity, hash_code)!= NULL )

 	{

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

+		DBG("PUA: insert_htable: Dialog already found- do not insert\n");

 		return; 

 	}

+*/	

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

 	presentity->db_flag= INSERTDB_FLAG;

@@ -199,19 +202,16 @@ void insert_htable(ua_pres_t* presentity)

 	p->next= presentity;

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

+

 }

-void delete_htable(ua_pres_t* presentity)

+void delete_htable(ua_pres_t* presentity, unsigned int hash_code)

 { 

 	ua_pres_t* p= NULL, *q= NULL;

-	unsigned int hash_code;

 	DBG("PUA:delete_htable...\n");

-	hash_code= core_hash(presentity->pres_uri,presentity->watcher_uri, 

-			HASH_SIZE);

-

 	p= search_htable(presentity->pres_uri, presentity->watcher_uri,

-			presentity->id, presentity->flag, presentity->event, hash_code);

+			 presentity->flag, presentity->id, hash_code);

 	if(p== NULL)

 		return;

@@ -251,3 +251,56 @@ void destroy_htable()

   return;

 }

+/* must lock the record line before calling this function*/

+ua_pres_t* get_dialog(ua_pres_t* dialog, unsigned int hash_code)

+{

+	ua_pres_t* p= NULL, *L;

+	DBG("PUA: get_dialog: core_hash= %u\n", hash_code);

+

+	L= HashT->p_records[hash_code].entity;

+	for(p= L->next; p; p=p->next)

+	{

+

+		if(p->flag& dialog->flag)

+		{

+			DBG("PUA: get_dialog: pres_uri= %.*s\twatcher_uri=%.*s\n\tcallid= %.*s\tto_tag= %.*s\tfrom_tag= %.*s\n",

+					p->pres_uri->len, p->pres_uri->s, p->watcher_uri->len, p->watcher_uri->s,

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

+

+			DBG("PUA: get_dialog: 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((p->pres_uri->len== dialog->pres_uri->len) &&

+				(strncmp(p->pres_uri->s, dialog->pres_uri->s,p->pres_uri->len)==0)&&

+				(p->watcher_uri->len== dialog->watcher_uri->len) &&

+				(strncmp(p->watcher_uri->s, dialog->watcher_uri->s, p->watcher_uri->len )==0)&&

+				(strncmp(p->call_id.s, dialog->call_id.s, p->call_id.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) )

+				{	

+					DBG("PUA: get_dialog: FOUND dialog\n");

+					break;

+				}

+		}	

+	

+	}

+		

+	return p;

+}	

+int is_dialog(ua_pres_t* dialog)

+{

+	int ret_code= 0;

+	unsigned int hash_code;

+	

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

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

+

+	if(get_dialog(dialog, hash_code)== NULL)

+		ret_code= -1;

+	else

+		ret_code= 0;

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

+	

+	return ret_code;

+

+}

+

@@ -32,33 +32,23 @@

 #include "../../str.h"

 #include "../../lock_ops.h"

-#define UL_PUBLISH			1<<0

-#define MI_PUBLISH			1<<1

-#define MI_SUBSCRIBE		1<<2

-#define END2END_PUBLISH		1<<3

-#define END2END_SUBSCRIBE   1<<4

-#define XMPP_PUBLISH		1<<5

-#define XMPP_SUBSCRIBE      1<<6

+#define UL_PUBLISH					1<<0

+#define BLA_PUBLISH					1<<1

+#define BLA_SUBSCRIBE				1<<2

+#define XMPP_PUBLISH				1<<3

+#define XMPP_SUBSCRIBE				1<<4

+#define XMPP_INITIAL_SUBS		    1<<5

+#define MI_PUBLISH					1<<6

+#define MI_SUBSCRIBE				1<<7

 #define PRESENCE_EVENT      1<<0

 #define PWINFO_EVENT        1<<1

-

+#define BLA_EVENT			1<<2

 #define NO_UPDATEDB_FLAG	1<<0

 #define UPDATEDB_FLAG		1<<1

 #define INSERTDB_FLAG		1<<2

-typedef struct hentity

-{

-	str* pres_uri;

-	str* watcher_uri;

-	str id;

-	str tuple_id;

-	int event;

-	int flag;

-	int desired_expires;

-}hentity_t;

-

 typedef struct ua_pres{

     /* common*/

@@ -70,18 +60,20 @@ typedef struct ua_pres{

 	int flag;

 	int db_flag;

 	struct ua_pres* next;

-

+	

 	/* publish */

 	str etag;

 	str tuple_id;

-	

+	str* body;

 	/* subscribe */

 	str* watcher_uri;

 	str call_id;

 	str to_tag;

     str from_tag;

 	int cseq;

-	

+	int version;

+      int watcher_count;

+ /*?? should this be long? */

 }ua_pres_t;

 typedef struct hash_entry

@@ -96,17 +88,19 @@ typedef struct htable{

 htable_t* new_htable();

-ua_pres_t* search_htable(str* pres_uri, str* watcher_uri, str id, 

-		int FLAG, int event, unsigned int hash_code);

+ua_pres_t* search_htable(str* pres_uri, str* watcher_uri, int FLAG,

+		str id, unsigned int hash_code);

 void insert_htable(ua_pres_t* presentity );

 void update_htable(ua_pres_t* presentity,time_t desired_expires,

 		int expires, unsigned int hash_code);

-void delete_htable(ua_pres_t* presentity );

+void delete_htable(ua_pres_t* presentity, unsigned int hash_code);

 void destroy_htable();

+int is_dialog(ua_pres_t* dialog);

+ua_pres_t* get_dialog(ua_pres_t* dialog, unsigned int hash_code);

-

+typedef int  (*query_dialog_t)(ua_pres_t* presentity);

 #endif

@@ -47,8 +47,10 @@

 #include "send_publish.h"

 #include "send_subscribe.h"

 #include "pua_bind.h"

+#include "pua_callback.h"

 MODULE_VERSION

+#define PUA_TABLE_VERSION 2

 struct tm_binds tmb;

 htable_t* HashT= NULL;

@@ -74,7 +76,7 @@ static void destroy(void);

 int send_subscribe(subs_info_t*);

 int send_publish(publ_info_t*);

-int update_pua(ua_pres_t* p);

+int update_pua(ua_pres_t* p, unsigned int hash_code);

 int db_store();

 int db_restore();

@@ -83,10 +85,12 @@ void hashT_clean(unsigned int ticks,void *param);

 static cmd_export_t cmds[]=

 {

-	{"bind_pua",	   (cmd_function)bind_pua,		   1, 0, 0},

-	{"send_publish",   (cmd_function)send_publish,     1, 0, 0},

-	{"send_subscribe", (cmd_function)send_subscribe,   1, 0, 0},

-	{0,							0,					   0, 0, 0} 

+	{"bind_pua",	     (cmd_function)bind_pua,		 1, 0, 0},

+	{"send_publish",     (cmd_function)send_publish,     1, 0, 0},

+	{"send_subscribe",   (cmd_function)send_subscribe,   1, 0, 0},

+	{"pua_is_dialog",    (cmd_function)is_dialog,		 1, 0, 0},

+	{"register_puacb", (cmd_function)register_puacb,     1, 0, 0},

+	{0,							0,					     0, 0, 0} 

 };

 static param_export_t params[]={

@@ -120,6 +124,9 @@ struct module_exports exports= {

  */

 static int mod_init(void)

 {

+	str _s;

+	int ver = 0;

+	

 	load_tm_f  load_tm;

 	DBG("PUA: initializing module ...\n");

@@ -165,6 +172,16 @@ static int mod_init(void)

 		LOG(L_ERR,"PUA:mod_init: Error while connecting database\n");

 		return -1;

 	}

+	// verify table version 

+	_s.s = db_table;

+	_s.len = strlen(db_table);

+	 ver =  table_version(&pua_dbf, pua_db, &_s);

+	if(ver!=PUA_TABLE_VERSION)

+	{

+		LOG(L_ERR,"PRESENCE:mod_init: Wrong version v%d for table <%s>,"

+				" need v%d\n", ver, _s.s, PUA_TABLE_VERSION);

+		return -1;

+	}

 	if(HASH_SIZE<=1)

 		HASH_SIZE= 512;

@@ -188,10 +205,15 @@ static int mod_init(void)

 		DBG("PUA: ERROR: mod_init: wrong clean_period \n");

 		return -1;

 	}

+	if ( init_puacb_list() < 0)

+    {

+		LOG(L_ERR, "PUA:mod_init: ERROR: callbacks initialization failed\n");

+        return -1;

+    }

 	startup_time = (int) time(NULL);

-	register_timer(hashT_clean, 0, update_period);

+	register_timer(hashT_clean, 0, update_period- 5);

 	register_timer(db_update, 0, update_period);

@@ -236,8 +258,11 @@ static int child_init(int rank)

 static void destroy(void)

 {	

 	DBG("PUA: destroying module ...\n");

+	if (puacb_list)

+		destroy_puacb_list();

-	db_update(0,0);

+	if(pua_db && HashT)

+		db_update(0,0);

 	if(HashT)

 		destroy_htable();

@@ -251,7 +276,7 @@ static void destroy(void)

 int db_restore()

 {

 	ua_pres_t* p= NULL;

-	db_key_t result_cols[12]; 

+	db_key_t result_cols[13]; 

 	db_res_t *res= NULL;

 	db_row_t *row = NULL;	

 	db_val_t *row_vals= NULL;

@@ -260,19 +285,23 @@ int db_restore()

 	str watcher_uri, call_id;

 	str to_tag, from_tag;

 	int size= 0, i;

+	int n_result_cols= 0;

+	int puri_col,pid_col,expires_col,flag_col,etag_col,tuple_col;

+	int watcher_col,callid_col,totag_col,fromtag_col,cseq_col,event_col;

+

+	result_cols[puri_col=n_result_cols++]	="pres_uri";		

+	result_cols[pid_col=n_result_cols++]	="pres_id";	

+	result_cols[expires_col=n_result_cols++]="expires";

+	result_cols[flag_col=n_result_cols++]	="flag";

+	result_cols[etag_col=n_result_cols++]	="etag";

+	result_cols[tuple_col=n_result_cols++]	="tuple_id";

+	result_cols[watcher_col=n_result_cols++]="watcher_uri";

+	result_cols[callid_col=n_result_cols++] ="call_id";

+	result_cols[totag_col=n_result_cols++]	="to_tag";

+	result_cols[fromtag_col=n_result_cols++]="from_tag";

+	result_cols[cseq_col= n_result_cols++]	="cseq";

+	result_cols[event_col= n_result_cols++]	="event";

-	result_cols[0] ="pres_uri";		

-	result_cols[1] ="pres_id";	

-	result_cols[2] ="expires";

-	result_cols[3] ="flag";

-	result_cols[4] ="etag";

-	result_cols[5] ="tuple_id";

-	result_cols[6] ="watcher_uri";

-	result_cols[7] ="call_id";

-	result_cols[8] ="to_tag";

-	result_cols[9] ="from_tag";

-	result_cols[10]="cseq";

-

 	if(!pua_db)

 	{

 		LOG(L_ERR,"PUA: db_restore: ERROR null database connection\n");

@@ -285,7 +314,7 @@ int db_restore()

 		return -1;

 	}

-	if(pua_dbf.query(pua_db,0, 0, 0, result_cols,0, 11, 0,&res)< 0)

+	if(pua_dbf.query(pua_db,0, 0, 0, result_cols,0, n_result_cols, 0,&res)< 0)

 	{

 		LOG(L_ERR, "PUA: db_restore:ERROR while querrying table\n");

 		if(res)

@@ -328,25 +357,25 @@ int db_restore()

 		if(row_vals[4].val.str_val.s)

 		{

-			etag.s= row_vals[4].val.str_val.s;

+			etag.s= row_vals[etag_col].val.str_val.s;

 			etag.len = strlen(etag.s);

-			tuple_id.s= row_vals[5].val.str_val.s;

+			tuple_id.s= row_vals[tuple_col].val.str_val.s;

 			tuple_id.len = strlen(tuple_id.s);

 		}

 		if(row_vals[6].val.str_val.s)

 		{	

-			watcher_uri.s= row_vals[6].val.str_val.s;

+			watcher_uri.s= row_vals[watcher_col].val.str_val.s;

 			watcher_uri.len = strlen(watcher_uri.s);

-			call_id.s= row_vals[7].val.str_val.s;

+			call_id.s= row_vals[callid_col].val.str_val.s;

 			call_id.len = strlen(call_id.s);

-			to_tag.s= row_vals[8].val.str_val.s;

+			to_tag.s= row_vals[totag_col].val.str_val.s;

 			to_tag.len = strlen(to_tag.s);

-			from_tag.s= row_vals[9].val.str_val.s;

+			from_tag.s= row_vals[fromtag_col].val.str_val.s;

 			from_tag.len = strlen(from_tag.s);

 		}

@@ -377,8 +406,8 @@ int db_restore()

 		p->id.len= pres_id.len;

 		size+= pres_id.len;

-		p->expires= row_vals[2].val.int_val;

-		p->flag|=	row_vals[3].val.int_val;

+		p->expires= row_vals[expires_col].val.int_val;

+		p->flag|=	row_vals[flag_col].val.int_val;

 		p->db_flag|= INSERTDB_FLAG;

 		if(etag.len)

@@ -418,9 +447,10 @@ int db_restore()

 			p->call_id.len= call_id.len;

 			size+= call_id.len;

-			p->cseq= row_vals[10].val.int_val;

+			p->cseq= row_vals[cseq_col].val.int_val;

 		}

-		

+		p->event= row_vals[event_col].val.int_val;

+

 		insert_htable(p);

 	}

 	if(res)

@@ -449,57 +479,64 @@ error:

 void hashT_clean(unsigned int ticks,void *param)

 {

 	int i;

+	time_t now;

 	ua_pres_t* p= NULL, *q= NULL;

 	DBG("PUA: hashT_clean ..\n");

-

+	now = time(NULL);

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

 	{

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

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

 		while(p)

 		{	

-			if(p->expires< (int)(time)(NULL)+10)

+			if(p->expires- update_period < now )

 			{

-				if(p->desired_expires> p->expires+ 10 || (p->desired_expires && p->watcher_uri))

+				if((p->desired_expires> p->expires + min_expires) || 

+						(p->desired_expires== 0 ))

 				{

-					if(update_pua(p)< 0)

+					if(update_pua(p, i)< 0)

 					{

 						LOG(L_ERR, "PUA: hashT_clean: Error while updating\n");

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

 						return;

-					}	

-				}

-				p= p->next;

-			}

-			else

-				if(p->expires< (int)(time)(NULL))

+					}

+					p= p->next;

+					continue;

+				}	

+			    if(p->expires < now - 2)

 				{

 					q= p->next;

-					delete_htable(p);

+					DBG("PUA: hashT_clean: Found expired: uri= %.*s\n", p->pres_uri->len,

+							p->pres_uri->s);

+					delete_htable(p, i);

 					p= q;

 				}

 				else

 					p= p->next;

+			}	

+			else

+				p= p->next;

 		}

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

 	}

 }

-int update_pua(ua_pres_t* p)

+int update_pua(ua_pres_t* p, unsigned int hash_code)

 {

 	int size= 0;

-	hentity_t* hentity= NULL;

+	ua_pres_t* hentity= NULL;

 	str* str_hdr= NULL;

+	int expires;

-	size= sizeof(hentity_t)+ sizeof(str)+ (p->pres_uri->len+ 1)*sizeof(char);

+	size= sizeof(ua_pres_t)+ sizeof(str)+ (p->pres_uri->len+ 1)*sizeof(char);

 	if(p->watcher_uri)

 		size+= sizeof(str)+ p->watcher_uri->len;

 	else

 		size+=  p->id.len;

-	hentity= (hentity_t*)shm_malloc(size);

+	hentity= (ua_pres_t*)shm_malloc(size);

 	if(hentity== NULL)

 	{

 		LOG(L_ERR, "PUA: update_pua: ERROR no more share memory\n");

@@ -507,7 +544,7 @@ int update_pua(ua_pres_t* p)

 	}

 	memset(hentity, 0, size);

-	size =  sizeof(hentity_t);

+	size =  sizeof(ua_pres_t);

 	hentity->pres_uri = (str*)((char*)hentity + size);

 	size+= sizeof(str);

@@ -534,21 +571,25 @@ int update_pua(ua_pres_t* p)

 		hentity->id.len= p->id.len;

 		size+= p->id.len;

 	}

-

 	hentity->flag|= p->flag;

+	if(p->desired_expires== 0)

+			expires= 3600;

+		else

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

 	if(p->watcher_uri== NULL)

 	{

 		str met= {"PUBLISH", 7};

-		str_hdr = publ_build_hdr(p->desired_expires- (int)time(NULL), &p->etag, 0);

+		str_hdr = publ_build_hdr(expires, p->event, &p->etag, NULL, 0);

 		if(str_hdr == NULL)

 		{

 			LOG(L_ERR, "PUA: update_pua: ERROR while building extra_headers\n");

 			goto error;

 		}

 		DBG("PUA: update_pua: str_hdr:\n%.*s\n ", str_hdr->len, str_hdr->s);

-	

+		

+		

 		tmb.t_request(&met,						/* Type of the message */

 				p->pres_uri,					/* Request-URI */

 				p->pres_uri,					/* To */

@@ -558,10 +599,10 @@ int update_pua(ua_pres_t* p)

 				publ_cback_func,				/* Callback function */

 				(void*)hentity					/* Callback parameter */

 				);

+		

 	}

 	else

 	{

-		int expires;

 		str met= {"SUBSCRIBE", 9};

 		dlg_t* td= NULL;

 		td= pua_build_dlg_t(p);

@@ -570,19 +611,16 @@ int update_pua(ua_pres_t* p)

 			LOG(L_ERR, "PUA:update_pua: Error while building tm dlg_t"

 					"structure");		

 			goto error;

-		}

-		if(p->desired_expires== 0)

-			expires= 3600;

-		else

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

-

+		};

+	

 		str_hdr= subs_build_hdr(p->watcher_uri, expires, p->event);

 		if(str_hdr== NULL || str_hdr->s== NULL)

 		{

 			LOG(L_ERR, "PUA:send_subscribe: Error while building extra headers\n");

+			pkg_free(td);

 			return -1;

 		}

-

+		

 		tmb.t_request_within

 		(&met,

 		str_hdr,                               

@@ -611,7 +649,7 @@ error:

 void db_update(unsigned int ticks,void *param)

 {

 	ua_pres_t* p= NULL;

-	db_key_t q_cols[13];

+	db_key_t q_cols[14];

 	db_res_t *res= NULL;

 	db_key_t db_cols[3];

 	db_val_t q_vals[13], db_vals[3];

@@ -619,52 +657,75 @@ void db_update(unsigned int ticks,void *param)

 	int n_query_cols= 0;

 	int n_update_cols= 0;

 	int i;

+	int puri_col,pid_col,expires_col,flag_col,etag_col,tuple_col;

+	int watcher_col,callid_col,totag_col,fromtag_col,cseq_col,event_col;

+	int no_lock= 0;

-	/* cols and values used for insert */

-	q_cols[0] ="pres_uri";

-	q_vals[0].type = DB_STR;

-	q_vals[0].nul = 0;

+	if(ticks== 0 && param == NULL)

+		no_lock= 1;

-	q_cols[1] ="pres_id";	

-	q_vals[1].type = DB_STR;

-	q_vals[1].nul = 0;

-	q_cols[2] ="flag";

-	q_vals[2].type = DB_INT;

-	q_vals[2].nul = 0;

-

-	q_cols[3] ="watcher_uri";

-	q_vals[3].type = DB_STR;

-	q_vals[3].nul = 0;

-

-	q_cols[4] ="tuple_id";

-	q_vals[4].type = DB_STR;

-	q_vals[4].nul = 0;

-

-	q_cols[5] ="etag";

-	q_vals[5].type = DB_STR;

-	q_vals[5].nul = 0;

-	

-	q_cols[6] ="call_id";

-	q_vals[6].type = DB_STR;

-	q_vals[6].nul = 0;

-

-	q_cols[7] ="to_tag";

-	q_vals[7].type = DB_STR;

-	q_vals[7].nul = 0;

-	

-	q_cols[8] ="from_tag";

-	q_vals[8].type = DB_STR;

-	q_vals[8].nul = 0;

+	DBG("PUA: db_update...\n");

+	/* cols and values used for insert */

+	q_cols[puri_col= n_query_cols] ="pres_uri";

+	q_vals[puri_col= n_query_cols].type = DB_STR;

+	q_vals[puri_col= n_query_cols].nul = 0;

+	n_query_cols++;

-	q_cols[9]="cseq";

-	q_vals[9].type = DB_INT;

-	q_vals[9].nul = 0;

+	q_cols[pid_col= n_query_cols] ="pres_id";	

+	q_vals[pid_col= n_query_cols].type = DB_STR;

+	q_vals[pid_col= n_query_cols].nul = 0;

+	n_query_cols++;