[sr-dev] git:master: modules_k/presence: Some important stuff was removed when the latest set of presence fixes were merged in

[Anca Vamanu]

Hi Peter,

I am really sorry for this. I searched only inside presence module, saw 
that filed was not used and considered it is something left there. Sorry 
I did not check more carefully.

Please let me know if you see any problem with the behavior with the 
latest sources. The case with DB_ONLY is a bit improved now, as only one 
write in DB is performed when a Subscribe is received.

Regards,
Anca

On 03/06/2012 08:36 PM, Peter Dunkley wrote:
> Module: sip-router
> Branch: master
> Commit: 54b44414fff9eb94cad752f93d54005eea8c0c85
> URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=54b44414fff9eb94cad752f93d54005eea8c0c85
>
> Author: Peter Dunkley<peter.dunkley at crocodile-rcs.com>
> Committer: Peter Dunkley<peter.dunkley at crocodile-rcs.com>
> Date:   Tue Mar  6 18:04:20 2012 +0000
>
> modules_k/presence: Some important stuff was removed when the latest set of presence fixes were merged in
>
> - The result was that PUA and RLS in master would not longer compile
> - I have restored the stuff needed to build PUA and RLS, but there
>    could well be other stuff that has been lost
>
> ---
>
>   modules_k/presence/subscribe.h |    4 ++++
>   1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/modules_k/presence/subscribe.h b/modules_k/presence/subscribe.h
> index 05a8fa5..bf7d189 100644
> --- a/modules_k/presence/subscribe.h
> +++ b/modules_k/presence/subscribe.h
> @@ -52,6 +52,9 @@ struct pres_ev;
>
>   #define PRES_SUBSCRIBE_RECV		1
>
> +#define INTERNAL_UPDATE_FALSE	0
> +#define INTERNAL_UPDATE_TRUE	1
> +
>   struct subscription
>   {
>   	str pres_uri;
> @@ -78,6 +81,7 @@ struct subscription
>   	int db_flag;
>   	str* auth_rules_doc;
>   	int recv_event;
> +	int internal_update_flag;
>   	struct subscription* next;
>
>   };
>
>
> _______________________________________________
> sr-dev mailing list
> sr-dev at lists.sip-router.org
> http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
>