@@ -139,6 +139,7 @@ int add_event(ev_t* event)

 	ev->is_watcher_allowed= event->is_watcher_allowed;

 	ev->evs_publ_handl= event->evs_publ_handl;

 	ev->etag_not_new= event->etag_not_new;

+	ev->free_body= event->free_body;

 	ev->next= EvList->events;

 	EvList->events= ev;

 	EvList->ev_count++;

@@ -58,6 +58,9 @@ typedef int (is_allowed_t)(struct subscription* subs);

  *	>0   if change in status

  *	*/

+/* event specific body free function */

+typedef void(free_body_t)(char* body);

+

 struct ev

 {

 	str name;

@@ -89,7 +92,7 @@ struct ev

 	agg_nbody_t* agg_nbody;

 	publ_handling_t  * evs_publ_handl;

 	subs_handling_t  * evs_subs_handl;

-

+	free_body_t* free_body;

 	struct ev* wipeer;			

 	struct ev* next;

@@ -684,7 +684,7 @@ dlg_t* build_dlg_t (str p_uri, subs_t* subs)

 	}

 	memset(td, 0, sizeof(dlg_t));

-	td->loc_seq.value = subs->cseq+ 1;

+	td->loc_seq.value = subs->cseq++;

 	td->loc_seq.is_set = 1;

 	td->id.call_id = subs->callid;

@@ -1108,7 +1108,7 @@ done:

 	if(notify_body!=NULL)

 	{

 		if(notify_body->s)

-			free(notify_body->s);

+			p->event->free_body(notify_body->s);

 		pkg_free(notify_body);

 	}

@@ -1127,7 +1127,7 @@ error:

 	if(notify_body!=NULL)

 	{

 		if(notify_body->s)

-			free(notify_body->s);

+			p->event->free_body(notify_body->s);

 		pkg_free(notify_body);

 	}

 	return -1;

@@ -1191,7 +1191,7 @@ done:

 	if(notify_body!=NULL)

 	{

 		if(notify_body->s)

-			free(notify_body->s);

+			event->free_body(notify_body->s);

 		pkg_free(notify_body);

 	}

@@ -1210,7 +1210,7 @@ error:

 	if(notify_body!=NULL)

 	{

 		if(notify_body->s)

-			free(notify_body->s);

+			event->free_body(notify_body->s);

 		pkg_free(notify_body);

 	}

 	return -1;

@@ -1379,7 +1379,7 @@ jump_over_body:

 	update_keys[n_update_keys] = "local_cseq";

 	update_vals[n_update_keys].type = DB_INT;

 	update_vals[n_update_keys].nul = 0;

-	update_vals[n_update_keys].val.int_val = subs->cseq +1;

+	update_vals[n_update_keys].val.int_val = subs->cseq;

 	n_update_keys++;

 	update_keys[n_update_keys] = "status";

@@ -1388,7 +1388,6 @@ jump_over_body:

 	update_vals[n_update_keys].val.str_val = subs->status;

 	n_update_keys++;

-

 	if(subs->event->type & WINFO_TYPE)

 	{	

 		update_keys[n_update_keys] = "version";

@@ -1425,10 +1424,7 @@ jump_over_body:

 		{

 			if(notify_body->s!=NULL)

 			{

-				if(subs->event->agg_nbody!=NULL)

-					free(notify_body->s);

-				else

-					pkg_free(notify_body->s);

+				subs->event->free_body(notify_body->s);

 			}

 			pkg_free(notify_body);

 		}

@@ -1457,7 +1453,7 @@ error:

 		if(notify_body!=NULL)

 		{

 			if(notify_body->s!=NULL)

-				free(notify_body->s);

+				subs->event->free_body(notify_body->s);

 			pkg_free(notify_body);

 		}

 	}	

@@ -250,7 +250,8 @@ int update_subscription(struct sip_msg* msg, subs_t* subs, str *rtag,

 							" notify for winfo\n");

 						goto error;

 					}

-				}	

+				}

+

 			}	

 			else /* if unsubscribe for winfo */

 			{

@@ -261,6 +262,14 @@ int update_subscription(struct sip_msg* msg, subs_t* subs, str *rtag,

 					goto error;

 				}

 			}

+

+			if(notify(subs, NULL, NULL, 0)< 0)

+			{

+				LOG(L_ERR, "PRESENCE:update_subscription: Could not send"

+				" notify \n");

+				goto error;

+			}

+

 			return 1;

 		}

@@ -1257,9 +1266,10 @@ int handle_subscribe(struct sip_msg* msg, char* str1, char* str2)

 					" from database\n");

 			goto error;

 		}

+			

 		DBG("PRESENCE: handle_subscribe: pres_user= %.*s\t pres_domain= %.*s\n", 

-				subs.pres_user.len, subs.pres_user.s,

-				subs.pres_domain.len, subs.pres_domain.s);

+			subs.pres_user.len, subs.pres_user.s,

+			subs.pres_domain.len, subs.pres_domain.s);

 	}	

 	DBG("PRESENCE: handle_subscribe: local_contact: %.*s --- len= %d\n", 

@@ -1688,10 +1698,8 @@ int get_database_info(struct sip_msg* msg, subs_t* subs,

 		*error_ret= 0;

 		return -1;

 	}

-	else

-	   remote_cseq= subs->cseq;

-	*rem_cseq= remote_cseq;

+	*rem_cseq= subs->cseq;

 	pres_user.s= (char*)row_vals[pres_user_col].val.string_val;

 	pres_user.len= strlen(pres_user.s);

@@ -105,6 +105,13 @@ err:

     return -1;

 }

+void free_mwi_body(char* body)

+{

+	if(body== NULL)

+		return;

+	pkg_free(body);

+	body= NULL;

+}

 int mwi_add_events()

 {

@@ -124,6 +131,7 @@ int mwi_add_events()

     event.is_watcher_allowed = mwi_watcher_allowed;

     event.agg_nbody = 0;

     event.evs_publ_handl = mwi_publ_handl;

+	event.free_body= free_mwi_body;

     if (pres_add_event(&event) < 0) {

 	LOG(L_ERR, "presence_mwi: ERROR while adding event "

@@ -62,6 +62,7 @@ int xml_add_events()

 	event.is_watcher_allowed= pres_watcher_allowed;

 	event.agg_nbody= pres_agg_nbody;

 	event.evs_publ_handl= xml_publ_handl;

+	event.free_body= free_xml_body;

 	if(pres_add_event(&event)< 0)

 	{

@@ -77,6 +78,7 @@ int xml_add_events()

 	event.content_type.s= "application/watcherinfo+xml";

 	event.content_type.len= 27;

 	event.type= WINFO_TYPE;

+	event.free_body= free_xml_body;

 	if(pres_add_event(&event)< 0)

 	{

@@ -97,6 +99,7 @@ int xml_add_events()

 	event.content_type.s= "application/dialog-info+xml";

 	event.content_type.len= 27;

 	event.type= PUBL_TYPE;

+	event.free_body= free_xml_body;

 	if(pres_add_event(&event)< 0)

 	{

@@ -41,6 +41,16 @@ str* get_final_notify_body( subs_t *subs, str* notify_body, xmlNodePtr rule_node

 extern int force_active;

 extern int pidf_manipulation;

+void free_xml_body(char* body)

+{

+	if(body== NULL)

+		return;

+

+	xmlFree(body);

+	body= NULL;

+}

+

+

 str* pres_agg_nbody(str* pres_user, str* pres_domain, str** body_array, int n, int off_index)

 {

 	str* n_body= NULL;

@@ -32,5 +32,6 @@

 str* pres_agg_nbody(str* pres_user, str* pres_domain, str** body_array,

 		int n, int off_index);

 int pres_apply_auth(str* notify_body, subs_t* subs, str** final_nbody);

+void free_xml_body(char* body);

 #endif