@@ -44,14 +44,18 @@ Anca-Maria Vamanu

    2. Developer's Guide

-        2.1. bind_presence(event_api_t* api)

-        2.2. add_event(ev_t* event)

-        2.3. apply_auth_nbody

-        2.4. is_watcher_allowed

-        2.5. agg_nbody

-        2.6. free_body

-        2.7. evs_publ_handl

-        2.8. evs_subs_handl

+        2.1. bind_presence(presence_api_t* api)

+        2.2. add_event

+        2.3. get_rules_doc

+        2.4. get_auth_status

+        2.5. apply_auth_nbody

+        2.6. agg_nbody

+        2.7. free_body

+        2.8. evs_publ_handl

+        2.9. evs_subs_handl

+        2.10. contains_event

+        2.11. get_event_list

+        2.12. update_watchers_status

    3. Frequently Asked Questions

@@ -69,7 +73,7 @@ Anca-Maria Vamanu

    1-11. Set fallback2db parameter

    1-12. handle_publish usage

    1-13. handle_subscribe usage

-   2-1. event_api_t structure

+   2-1. presence_api_t structure

      _________________________________________________________

 Chapter 1. User's Guide

@@ -246,7 +250,7 @@ modparam("presence", "max_expires", 3600)

 1.3.10. server_address (str)

    The presence server address which will become the value of

-   Contact header filed for 200OK replyes to Subscribe and

+   Contact header filed for 200OK replies to Subscribe and

    Publish and in Notify messages.

    Example 1-10. Set server_address parameter

@@ -294,7 +298,7 @@ modparam("presence", "fallback2db", 1)

                 if($hdr(Sender)!= NULL)

                         handle_publish("$hdr(Sender)");

                 else

-                        handle_publish("");

+                        handle_publish();

                 t_release();

         }

 ...

@@ -333,81 +337,116 @@ Chapter 2. Developer's Guide

    in other OpenSER modules.

      _________________________________________________________

-2.1. bind_presence(event_api_t* api)

+2.1. bind_presence(presence_api_t* api)

    This function binds the presence modules and fills the

    structure with one exported function -> add_event, which when

    called adds a new event to be handled by presence.

-   Example 2-1. event_api_t structure

+   Example 2-1. presence_api_t structure

 ...

-typedef struct event_api {

+typedef struct presence_api {

         add_event_t add_event;

-} event_api_t;

+        contains_event_t contains_event;

+        get_event_list_t get_event_list;

+        update_watchers_t update_watchers_status;

+}presence_api_t;

 ...

      _________________________________________________________

-2.2. add_event(ev_t* event)

+2.2. add_event

+

+   Field type:

+...

+typedef int (*add_event_t)(pres_ev_t* event);

+...

    This function receives as a parameter a structure with event

-   specific information and adds it to presence list.

+   specific information and adds it to presence event list.

    The structure received as a parameter:

 ...

-typedef struct ev

+typedef struct pres_ev

 {

         str name;

-        str* param;         // required param

-        str stored_name;

+        event_t* evp;

         str content_type;

-        int default_expires; /* the package default expires*/

+        int default_expires;

         int type;

-/*      it can be: PUBL_TYPE or WINFO_TYPE */

+        int etag_not_new;

+        /*

+         *  0 - the standard mechanism (allocating new etag

+                        for each Publish)

+         *  1 - allocating an etag only

+                        for an initial Publish

+        */

         int req_auth;

-/* flag to mark if the event requires authorization*/

+        get_rules_doc_t* get_rules_doc;

         apply_auth_t*  apply_auth_nbody;

-        is_allowed_t*  is_watcher_allowed;

-

+        is_allowed_t*  get_auth_status;

+

+        /* an agg_body_t function should be registered

+         * if the event permits having multiple published

+         * states and requires an aggregation of the information

+         * otherwise, this field should be NULL and the last

+         * published state is taken when constructing Notify msg

+         */

         agg_nbody_t* agg_nbody;

         publ_handling_t  * evs_publ_handl;

         subs_handling_t  * evs_subs_handl;

-        free_body_t*    free_body;

-

-/* this two should not be filed when the structure is given as a

-        parmeter for add_event function */

-        struct ev* wipeer;

-        struct ev* next;

+        free_body_t* free_body;

+        struct pres_ev* wipeer;

+        struct pres_ev* next;

-}ev_t;

+}pres_ev_t;

 ...

      _________________________________________________________

-2.3. apply_auth_nbody

-

-   This parameter should be a function to be calledfor an event

-   that requires authorization, when constructing final body. It

-   is called only if the req_auth field is not 0.

+2.3. get_rules_doc

    Filed type:

 ...

-typedef int (apply_auth_t)(str* , struct subscription*, str* );

-..

+typedef int (get_rules_doc_t)(str* user, str* domain, str** rules_doc);

+...

+

+   This function returns the authorization rules document that

+   will be used in obtaining the status of the subscription and

+   processing the notified body. A reference to the document

+   should be put in the auth_rules_doc of the subs_t structure

+   given as a parameter to the functions described bellow.

      _________________________________________________________

-2.4. is_watcher_allowed

+2.4. get_auth_status

    This filed is a function to be called for a subscription

    request to return the state for that subscription according to

-   authorization rules. It is called only if the req_auth field

-   is not 0.

+   authorization rules. In the auth_rules_doc field of the subs_t

+   structure received as a parameter should contain the rules

+   document of the presentity in case, if it exists.

+

+   It is called only if the req_auth field is not 0.

    Filed type:

 ...

 typedef int (is_allowed_t)(struct subscription* subs);

-..

+...

+     _________________________________________________________

+

+2.5. apply_auth_nbody

+

+   This parameter should be a function to be called for an event

+   that requires authorization, when constructing final body. The

+   authorization document is taken from the auth_rules_doc field

+   of the subs_t structure given as a parameter. It is called

+   only if the req_auth field is not 0.

+

+   Filed type:

+...

+typedef int (apply_auth_t)(str* , struct subscription*, str** );

+...

      _________________________________________________________

-2.5. agg_nbody

+2.6. agg_nbody

    If present, this field marks that the events requires

    aggregation of states. This function receives a body array and

@@ -418,14 +457,15 @@ typedef int (is_allowed_t)(struct subscription* subs);

    Filed type:

 ...

-typedef str* (agg_nbody_t)(str** body_array, int n, int off_index);

+typedef str* (agg_nbody_t)(str* pres_user, str* pres_domain,

+str** body_array, int n, int off_index);

 ..

      _________________________________________________________

-2.6. free_body

+2.7. free_body

    This field must be field in if subsequent processing is

-   performed on the info from database before beeing inserted in

+   performed on the info from database before being inserted in

    Notify message body(if agg_nbody or apply_auth_nbody fields

    are filled in). It should match the allocation function used

    when processing the body.

@@ -436,17 +476,17 @@ typedef void(free_body_t)(char* body);

 ..

      _________________________________________________________

-2.7. evs_publ_handl

+2.8. evs_publ_handl

    This function is called when handling Publish requests. Most

-   contain body correctitude check.

+   contain body correctness check.

 ...

 typedef int (publ_handling_t)(struct sip_msg*);

 ..

      _________________________________________________________

-2.8. evs_subs_handl

+2.9. evs_subs_handl

    It is not compulsory. Should contain event specific handling

    for Subscription requests.

@@ -457,6 +497,48 @@ typedef int (subs_handling_t)(struct sip_msg*);

 ..

      _________________________________________________________

+2.10. contains_event

+

+   Field type:

+..

+typedef pres_ev_t* (*contains_event_t)(str* name,

+event_t* parsed_event);

+...

+

+   The function parses the event name received as a parameter and

+   searches the result in the list. It returns the found event or

+   NULL, if not found. If the second argument is an allocated

+   event_t* structure it fills it with the result of the parsing.

+     _________________________________________________________

+

+2.11. get_event_list

+

+   Field type:

+...

+typedef int (*get_event_list_t) (str** ev_list);

+...

+

+   This function returns a string representation of the events

+   registered in presence module.( used for Allowed-Events

+   header).

+     _________________________________________________________

+

+2.12. update_watchers_status

+

+   Field type:

+...

+typedef int (*update_watchers_t)(str pres_uri, pres_ev_t* ev,

+str* rules_doc);

+...

+

+   This function is an external command that can be used to

+   announce a change in authorization rules for a presentity. It

+   updates the stored status and sends a Notify to the watchers

+   whose status has changes. (used by presence_xml module when

+   notified through an MI command of a change in an xcap

+   document).

+     _________________________________________________________

+

 Chapter 3. Frequently Asked Questions

    3.1. Where can I find more about OpenSER?

@@ -25,11 +25,15 @@

  * --------

  *  2007-04-17  initial version (anca)

  */

-#include "bind_presence.h"

+

+#include <stdio.h>

+#include <stdlib.h>

 #include "../../dprint.h"

 #include "../../sr_module.h"

+#include "presence.h"

+#include "bind_presence.h"

-int bind_presence(event_api_t* api)

+int bind_presence(presence_api_t* api)

 {

 	if (!api) {

 		LOG(L_ERR, "PRESENCE:bind_notifier: Invalid parameter value\n");

@@ -39,6 +43,7 @@ int bind_presence(event_api_t* api)

 	api->add_event = add_event;

 	api->contains_event= contains_event;

 	api->get_event_list= get_event_list;

+	api->update_watchers_status= update_watchers;

 	return 0;

 }

@@ -31,15 +31,18 @@

 #include "event_list.h"

-typedef struct event_api {

+typedef int (*update_watchers_t)(str pres_uri, pres_ev_t* ev, str* rules_doc);

+

+typedef struct presence_api {

 	add_event_t add_event;

 	contains_event_t contains_event;

 	get_event_list_t get_event_list;

-} event_api_t;

+	update_watchers_t update_watchers_status;

+} presence_api_t;

-int bind_presence(event_api_t* api);

+int bind_presence(presence_api_t* api);

-typedef int (*bind_presence_t)(event_api_t* api);

+typedef int (*bind_presence_t)(presence_api_t* api);

 #endif

@@ -16,7 +16,7 @@

    </para>

  		<section>

 				<title>

-				<function moreinfo="none">bind_presence(event_api_t* api)</function>

+				<function moreinfo="none">bind_presence(presence_api_t* api)</function>

 				</title>

 			<para>

 				This function binds the presence modules and fills the structure 

@@ -24,12 +24,15 @@

 				new event to be handled by presence.

 			</para>

 		<example>

-		<title><function>event_api_t</function> structure</title>

+		<title><function>presence_api_t</function> structure</title>

 	<programlisting format="linespecific">

 ...

-typedef struct event_api {

+typedef struct presence_api {

 	add_event_t add_event;

-} event_api_t;

+	contains_event_t contains_event;

+	get_event_list_t get_event_list;

+	update_watchers_t update_watchers_status;

+}presence_api_t;

 ...

 </programlisting>

 		</example>

@@ -37,99 +40,146 @@ typedef struct event_api {

 		</section>

 	<section>

-			<title>

-			<function moreinfo="none">add_event(ev_t* event)</function>

-			</title>

+		<title>

+		<function moreinfo="none">add_event</function>

+		</title>

+		<para>

+			Field type:

+			<programlisting format="linespecific">

+...

+typedef int (*add_event_t)(pres_ev_t* event);

+...

+		</para>

 		<para>

 			This function receives as a parameter a structure with event specific

-			information and adds it to presence list.

+			information and adds it to presence event list.

 		</para>

 		<para>

 		The structure received as a parameter:

 	<programlisting format="linespecific">

 ...

-typedef struct ev

+typedef struct pres_ev

 {

 	str name;

-	str* param;         // required param 

-	str stored_name;

+	event_t* evp;

 	str content_type;

-	int default_expires; /* the package default expires*/

+	int default_expires;

 	int type;

-/*	it can be: PUBL_TYPE or WINFO_TYPE */

+	int etag_not_new;

+	/*

+	 *  0 - the standard mechanism (allocating new etag

+			for each Publish)

+	 *  1 - allocating an etag only

+			for an initial Publish 

+	*/

 	int req_auth;

-/* flag to mark if the event requires authorization*/	

+	get_rules_doc_t* get_rules_doc;

 	apply_auth_t*  apply_auth_nbody;

-	is_allowed_t*  is_watcher_allowed;

+	is_allowed_t*  get_auth_status;

+	/* an agg_body_t function should be registered

+	 * if the event permits having multiple published

+	 * states and requires an aggregation of the information

+	 * otherwise, this field should be NULL and the last

+	 * published state is taken when constructing Notify msg

+	 */

 	agg_nbody_t* agg_nbody;

 	publ_handling_t  * evs_publ_handl;

 	subs_handling_t  * evs_subs_handl;

-	free_body_t*    free_body;

-

-/* this two should not be filed when the structure is given as a

-	parmeter for add_event function */

-	struct ev* wipeer;			

-	struct ev* next;

+	free_body_t* free_body;

+	struct pres_ev* wipeer;			

+	struct pres_ev* next;

-}ev_t;

+}pres_ev_t;

 ...

 </programlisting>

 		</section>

+<section>

+		<title>

+			<function moreinfo="none">get_rules_doc</function>

+		</title>

+		<para>

+		

+		</para>

+		<para>

+			Filed type:

+			<programlisting format="linespecific">

+...

+typedef int (get_rules_doc_t)(str* user, str* domain, str** rules_doc);

+...

+			</programlisting>

+		</para>

+		<para>

+		This function returns the authorization rules document that will be

+		used in obtaining the status of the subscription and processing the

+		notified body. A reference to the document should be put in the 

+		auth_rules_doc of the subs_t structure given as a parameter to the

+		functions described bellow.

+		</para>

+</section>	

 <section>

 		<title>

-			<function moreinfo="none">apply_auth_nbody</function>

+			<function moreinfo="none">get_auth_status</function>

 		</title>

 		<para>

-			This parameter should be a function to be calledfor an event that requires

-			authorization, when constructing final body. It is called only if the

-			req_auth field is not 0.

+			This filed is a function to be called for a subscription request

+			to return the state for that subscription according to

+			authorization rules. In the auth_rules_doc field of the subs_t

+			structure received as a parameter should contain the rules 

+			document of the presentity in case, if it exists.

+		</para>

+		<para>

+			It is called only if the req_auth field is not 0. 

 		</para>

 		<para>

 			Filed type:

 			<programlisting format="linespecific">

 ...

-typedef int (apply_auth_t)(str* , struct subscription*, str* );

-..

+typedef int (is_allowed_t)(struct subscription* subs);

+...

 			</programlisting>

 			</para>

-</section>			

+</section>	

 <section>

 		<title>

-			<function moreinfo="none">is_watcher_allowed</function>

+			<function moreinfo="none">apply_auth_nbody</function>

 		</title>

 		<para>

-			This filed is a function to be called for a subscription request to

-			return the state for that subscription according to authorization rules.

+			This parameter should be a function to be called for an event 

+			that requires authorization, when constructing final body. 

+			The authorization document is taken from the auth_rules_doc

+			field of the subs_t structure given as a parameter.

 			It is called only if the req_auth field is not 0.

 		</para>

 		<para>

 			Filed type:

 			<programlisting format="linespecific">

 ...

-typedef int (is_allowed_t)(struct subscription* subs);

-..

+typedef int (apply_auth_t)(str* , struct subscription*, str** );

+...

 			</programlisting>

 			</para>

-</section>	

+</section>			

 <section>

 		<title>

 			<function moreinfo="none">agg_nbody</function>

 		</title>

 		<para>

-			If present, this field marks that the events requires aggregation of states.

-			This function receives a body array and should return the final body.

-			If not present, it is considered that the event does not require aggregation and

-			the most recent published information is used when constructing Notifies.

+			If present, this field marks that the events requires aggregation

+			of states. This function receives a body array and should return

+			the final body.	If not present, it is considered that the event

+			does not require aggregation and the most recent published

+			information is used when constructing Notifies.

 		</para>

 		<para>

 		Filed type:

 			<programlisting format="linespecific">

 ...

-typedef str* (agg_nbody_t)(str** body_array, int n, int off_index);

+typedef str* (agg_nbody_t)(str* pres_user, str* pres_domain, 

+str** body_array, int n, int off_index);

 ..

 			</programlisting>

 		</para>

@@ -140,10 +190,11 @@ typedef str* (agg_nbody_t)(str** body_array, int n, int off_index);

 			<function moreinfo="none">free_body</function>

 		</title>

 		<para>

-			This field must be field in if subsequent processing is performed on the info

-			from database before beeing inserted in Notify message body(if agg_nbody

-			or apply_auth_nbody fields are filled in). It should match the allocation 

-			function used when processing the body.  

+			This field must be field in if subsequent processing is performed

+			on the info from database before being inserted in Notify

+			message body(if agg_nbody or apply_auth_nbody fields are

+			filled in). It should match the allocation function used when

+			processing the body.  

 		</para>

 		<para>

 		Filed type:

@@ -161,7 +212,7 @@ typedef void(free_body_t)(char* body);

 		</title>

 		<para>

 		This function is called when handling Publish requests. Most contain 

-		body correctitude check.

+		body correctness check.

 		</para>

 		<para>

 			<programlisting format="linespecific">

@@ -190,6 +241,63 @@ typedef int (subs_handling_t)(struct sip_msg*);

 			</para>

 </section>	

+<section>

+	<title>

+	<function moreinfo="none">contains_event</function>

+	</title>

+	<para>

+		Field type:

+		<programlisting format="linespecific">

+..

+typedef pres_ev_t* (*contains_event_t)(str* name,

+event_t* parsed_event);

+...

+	</para>

+	<para>

+	The function parses the event name received as a parameter and searches

+	the result in the list. It returns the found event or NULL, if not found. 

+	If the second argument is an allocated event_t* structure it fills it

+	with the result of the parsing.

+	</para>

+</section>

+

+<section>

+	<title>

+	<function moreinfo="none">get_event_list</function>

+	</title>

+	<para>

+		Field type:

+		<programlisting format="linespecific">

+...

+typedef int (*get_event_list_t) (str** ev_list);

+...

+	</para>

+	<para>

+	This function returns a string representation of the events registered

+	in presence module.( used for Allowed-Events header).

+	</para>

+</section>

+

+<section>

+	<title>

+	<function moreinfo="none">update_watchers_status</function>

+	</title>

+	<para>

+		Field type:

+		<programlisting format="linespecific">

+...

+typedef int (*update_watchers_t)(str pres_uri, pres_ev_t* ev,

+str* rules_doc);

+...

+	</para>

+	<para>

+	This function is an external command that can be used to announce a change

+	in authorization rules for a presentity. It updates the stored status and

+	sends a Notify to the watchers whose status has changes. (used by

+	presence_xml module when notified through an MI command of a change in

+	an xcap document).

+	</para>

+</section>

 </chapter>

@@ -263,7 +263,7 @@ modparam("presence", "max_expires", 3600)

 		<title><varname>server_address</varname> (str)</title>

 		<para>

 		The presence server address which will become the value of Contact header filed 

-		for 200OK replyes to Subscribe and Publish and in Notify messages.

+		for 200OK replies to Subscribe and Publish and in Notify messages.

 		</para>

 		<example>

 		<title>Set <varname>server_address</varname> parameter</title>

@@ -327,7 +327,7 @@ modparam("presence", "fallback2db", 1)

 		if($hdr(Sender)!= NULL)

 			handle_publish("$hdr(Sender)");

 		else

-			handle_publish("");

+			handle_publish();

 		t_release();

 	} 

 ...

@@ -48,14 +48,14 @@ event_t* shm_copy_event(event_t* e)

 	ev= (event_t*)shm_malloc(sizeof(event_t));

 	if(ev== NULL)

 	{

-		ERR_MEM("shm_copy_event");

+		ERR_MEM("PRESENCE","shm_copy_event");

 	}

 	memset(ev, 0, sizeof(event_t));

 	ev->text.s= (char*)shm_malloc(e->text.len* sizeof(char));

 	if(ev->text.s== NULL)

 	{

-		ERR_MEM("shm_copy_event");

+		ERR_MEM("PRESENCE","shm_copy_event");

 	}

 	memcpy(ev->text.s, e->text.s, e->text.len);

 	ev->text.len= e->text.len;

@@ -67,7 +67,7 @@ event_t* shm_copy_event(event_t* e)

 		p2= (param_t*)shm_malloc(size);

 		if(p2== NULL)

 		{

-			ERR_MEM("shm_copy_event");

+			ERR_MEM("PRESENCE","shm_copy_event");

 		}

 		memset(p2, 0, size);

@@ -138,13 +138,13 @@ int add_event(pres_ev_t* event)

 		ev= (pres_ev_t*)shm_malloc(sizeof(pres_ev_t));

 		if(ev== NULL)

 		{

-			ERR_MEM("add_event");

+			ERR_MEM("PRESENCE","add_event");

 		}

 		memset(ev, 0, sizeof(pres_ev_t));

 		ev->name.s= (char*)shm_malloc(event->name.len* sizeof(char));

 		if(ev->name.s== NULL)

 		{

-			ERR_MEM("add_events");

+			ERR_MEM("PRESENCE","add_events");

 		}

 		memcpy(ev->name.s, event->name.s, event->name.len);

 		ev->name.len= event->name.len;

@@ -168,7 +168,7 @@ int add_event(pres_ev_t* event)

 	ev->content_type.s=(char*)shm_malloc(event->content_type.len* sizeof(char)) ;

 	if(ev->content_type.s== NULL)

 	{

-		ERR_MEM("add_event");

+		ERR_MEM("PRESENCE","add_event");

 	}	

 	ev->content_type.len= event->content_type.len;

 	memcpy(ev->content_type.s, event->content_type.s, event->content_type.len);

@@ -198,7 +198,8 @@ int add_event(pres_ev_t* event)

 	ev->req_auth= event->req_auth;

 	ev->agg_nbody= event->agg_nbody;

 	ev->apply_auth_nbody= event->apply_auth_nbody;

-	ev->is_watcher_allowed= event->is_watcher_allowed;

+	ev->get_auth_status= event->get_auth_status;

+	ev->get_rules_doc= event->get_rules_doc;

 	ev->evs_publ_handl= event->evs_publ_handl;

 	ev->etag_not_new= event->etag_not_new;

 	ev->free_body= event->free_body;

@@ -53,6 +53,7 @@ typedef str* (agg_nbody_t)(str* pres_user, str* pres_domain, str** body_array, i

  *				with Expires: 0 has just been received

  *	*/

 typedef int (is_allowed_t)(struct subscription* subs);

+typedef int (get_rules_doc_t)(str* user, str* domain, str** rules_doc);

 /* return code rules for is_allowed_t

  *	< 0  if error occured

  *	=0	 if no change in status(if no xcap document exists)

@@ -81,8 +82,9 @@ struct pres_ev

 	 *  apply_auth_nbody    - alter the body according to authorization rules

 	 */

 	int req_auth;

+	get_rules_doc_t* get_rules_doc;

 	apply_auth_t*  apply_auth_nbody;

-	is_allowed_t*  is_watcher_allowed;

+	is_allowed_t*  get_auth_status;

 	/* an agg_body_t function should be registered if the event permits having

 	 * multiple published states and requires an aggregation of the information

@@ -44,7 +44,7 @@ shtable_t new_shtable()

 	htable= (subs_entry_t*)shm_malloc(shtable_size* sizeof(subs_entry_t));

 	if(htable== NULL)

 	{

-		ERR_MEM("new_shtable");

+		ERR_MEM("PRESENCE","new_shtable");

 	}

 	memset(htable, 0, shtable_size* sizeof(subs_entry_t));

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

@@ -58,7 +58,7 @@ shtable_t new_shtable()

 		htable[i].entries= (subs_t*)shm_malloc(sizeof(subs_t));

 		if(htable[i].entries== NULL)

 		{

-			ERR_MEM("new_shtable");

+			ERR_MEM("PRESENCE","new_shtable");

 		}

 		memset(htable[i].entries, 0, sizeof(subs_t));

 		htable[i].entries->next= NULL;

@@ -137,7 +137,7 @@ subs_t* mem_copy_subs(subs_t* s, int mem_type)

 	memset(dest, 0, size);

 	if(dest== NULL)

 	{

-		ERR_MEM("mem_copy_subs");

+		ERR_MEM("PRESENCE","mem_copy_subs");

 	}

 	size= sizeof(subs_t);

@@ -303,7 +303,7 @@ phtable_t* new_phtable()

 	htable= (phtable_t*)shm_malloc(phtable_size* sizeof(phtable_t));

 	if(htable== NULL)

 	{

-		ERR_MEM("new_phtable");

+		ERR_MEM("PRESENCE","new_phtable");

 	}

 	memset(htable, 0, phtable_size* sizeof(phtable_t));

@@ -318,7 +318,7 @@ phtable_t* new_phtable()

 		htable[i].entries= (pres_entry_t*)shm_malloc(sizeof(pres_entry_t));

 		if(htable[i].entries== NULL)

 		{

-			ERR_MEM("new_phtable");

+			ERR_MEM("PRESENCE","new_phtable");

 		}

 		memset(htable[i].entries, 0, sizeof(pres_entry_t));

 		htable[i].entries->next= NULL;

@@ -403,7 +403,7 @@ int insert_phtable(str* pres_uri, int event)

 	if(p== NULL)

 	{

 		lock_release(&pres_htable[hash_code].lock);

-		ERR_MEM("insert_phtable");

+		ERR_MEM("PRESENCE","insert_phtable");

 	}

 	memset(p, 0, size);

@@ -35,7 +35,7 @@

 #define REMOTE_TYPE   1<<1

 #define LOCAL_TYPE    1<<2

-#define ERR_MEM(func)  LOG(L_ERR, "PRESENCE: %s: ERROR No more memory\n", func);\

+#define ERR_MEM(module, func)  LOG(L_ERR, "%s:%s:ERROR No more memory\n", module,func);\

 						goto error

 #define CONT_COPY(buf, dest, source)\

@@ -306,7 +306,7 @@ int get_wi_subs_db(subs_t* subs, watcher_t** watchers)

 		w= (watcher_t*)pkg_malloc(sizeof(watcher_t));

 		if(w== NULL)

 		{

-			ERR_MEM("get_wi_subs_db");

+			ERR_MEM("PRESENCE","get_wi_subs_db");

 		}

 		w->status= row_vals[status_col].val.int_val;

 		if(uandd_to_uri(from_user, from_domain, &w->uri)<0)

@@ -364,7 +364,7 @@ str* get_wi_notify_body(subs_t* subs, subs_t* watcher_subs)

 	watchers= (watcher_t*)pkg_malloc(sizeof(watcher_t));

 	if(watchers== NULL)

 	{

-		ERR_MEM("get_wi_notify_body");

+		ERR_MEM("PRESENCE","get_wi_notify_body");

 	}

 	memset(watchers, 0, sizeof(watcher_t));

@@ -373,7 +373,7 @@ str* get_wi_notify_body(subs_t* subs, subs_t* watcher_subs)

 		w= (watcher_t *)pkg_malloc(sizeof(watcher_t));

 		if(w== NULL)

 		{

-			ERR_MEM("get_wi_notify_body");

+			ERR_MEM("PRESENCE","get_wi_notify_body");

 		}

 		memset(w, 0, sizeof(watcher_t));

@@ -391,7 +391,7 @@ str* get_wi_notify_body(subs_t* subs, subs_t* watcher_subs)

 		{

 			pkg_free(w->uri.s);

 			pkg_free(w);

-			ERR_MEM("get_wi_notify_body");

+			ERR_MEM("PRESENCE","get_wi_notify_body");

 		}

 		to64frombits((unsigned char *)w->id.s,

 				(const unsigned char*)w->uri.s, w->uri.len );

@@ -447,7 +447,7 @@ str* get_wi_notify_body(subs_t* subs, subs_t* watcher_subs)

 			if(w== NULL)

 			{

 				lock_release(&subs_htable[hash_code].lock);

-				ERR_MEM("get_wi_notify_body");

+				ERR_MEM("PRESENCE","get_wi_notify_body");

 			}

 			w->status= s->status;

 			if(uandd_to_uri(s->from_user, s->from_domain, &w->uri)<0)

@@ -931,6 +931,13 @@ int get_subs_db(str* pres_uri, pres_ev_t* event, str* sender,

 	query_vals[n_query_cols].val.str_val = event->name;

 	n_query_cols++;

+	query_cols[n_query_cols] = "status";

+	query_ops[n_query_cols] = OP_EQ;

+	query_vals[n_query_cols].type = DB_INT;

+	query_vals[n_query_cols].nul = 0;

+	query_vals[n_query_cols].val.int_val = ACTIVE_STATUS;

+	n_query_cols++;

+

 	if(sender)

 	{	

 		DBG("PRESENCE:get_subs_db: Should not send Notify to: [uri]= %.*s\n",

@@ -1069,9 +1076,14 @@ int update_in_list(subs_t* s, subs_t* s_array, int n)

 	subs_t* ls;

 	ls= s_array->next;

-

+	DBG("PRESENCE:update_in_list....n= %d\n", n);

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

 	{

+		if(ls== NULL)

+		{