Changeset 661

Timestamp:

12/29/05 22:40:16 (3 years ago)

Author:

jajcus

Message:

- keep track of user subscription to transport, so <presence type='subscribe'/> may be issued without a risk of any loop
- more XMPP-like of contact subscription (do not send <presence type='subscribe'/> if contact has already subscribed user
- fixed parsing of <version file_format='xxxx'/> in config file
- file_format: 02020101

Files:

• trunk/src/presence.c (modified) (6 diffs)
• trunk/src/users.c (modified) (8 diffs)
• trunk/src/users.h (modified) (2 diffs)

trunk/src/presence.c

@@ -235 +235 @@
-        if (jid_is_me(to)){
-                debug(L_("Presence subscribe request sent to me"));
-
-
+
+
+
+
+
+
+
+
+
+
+
-                return 0;
-        }
@@ -264 +273 @@
-        presence_send_subscribed(stream,to,from);
-        bare=jid_normalized(from,FALSE);
-
+
+
+
-        g_free(bare);
-        return 0;
@@ -282 +293 @@
-        }
-        if (jid_is_me(to)){
+                if (u->subscribe==SUB_NONE) u->subscribe=SUB_FROM;
+                else if (u->subscribe==SUB_UNDEFINED || u->subscribe==SUB_TO) u->subscribe=SUB_BOTH;
+                user_save(u);
-                debug(L_("Presence 'subscribed' sent to me"));
-                return 0;
@@ -317 +331 @@
-        }
-        if (jid_is_me(to)){
+                if (u->subscribe==SUB_FROM) u->subscribe=SUB_NONE;
+                else if (u->subscribe==SUB_BOTH || c->subscribe==SUB_UNDEFINED) u->subscribe=SUB_TO;
+                user_save(u);
-                debug(L_("Presence 'unsubscribed' sent to me"));
-                return 0;
@@ -347 +364 @@
-        if (jid_is_me(to)){
-                debug(L_("Presence unsubscribe request sent to me"));
+                if (u->subscribe==SUB_TO || c->subscribe==SUB_UNDEFINED) u->subscribe=SUB_NONE;
+                else if (u->subscribe==SUB_BOTH) u->subscribe=SUB_FROM;
+                user_save(u);
-                presence_send_unsubscribed(stream,to,from);
-                return 0;
@@ -373 +393 @@
-
-        if (s) session_update_contact(s,c);
-        
-        
-        debug(L_("Unsubscribed."));

trunk/src/users.c

@@ -30 +30 @@
-#include "presence.h"
-#include "conf.h"
+#include "encoding.h"
-#include "debug.h"
-
@@ -126 +127 @@
-}
-
+static void set_subscribe(xmlnode node, SubscriptionType subscription) { 
+        
+        switch (subscription){
+        case SUB_NONE:
+                xmlnode_put_attrib(node,"subscribe","none");
+                break;
+        case SUB_FROM:
+                xmlnode_put_attrib(node,"subscribe","from");
+                break;
+        case SUB_TO:
+                xmlnode_put_attrib(node,"subscribe","to");
+                break;
+        case SUB_BOTH:
+                xmlnode_put_attrib(node,"subscribe","both");
+                break;
+        default:
+                break;
+        }
+}
-
-int user_save(User *u){
@@ -162 +182 @@
-        tag=xmlnode_insert_tag(xml,"jid");
-        xmlnode_insert_cdata(tag,u->jid,-1);
+        set_subscribe(tag, u->subscribe);
-        tag=xmlnode_insert_tag(xml,"uin");
-        str=g_strdup_printf("%lu",(unsigned long)u->uin);
@@ -200 +221 @@
-                        if (c->ignored) xmlnode_put_attrib(ctag,"ignored","ignored");
-                        if (c->blocked) xmlnode_put_attrib(ctag,"blocked","blocked");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                        g_free(str);
-                }
@@ -256 +262 @@
-}
-
+static SubscriptionType get_subscribe(xmlnode node, unsigned int file_format_version){
+char *tmp;
+
+        tmp=xmlnode_get_attrib(node,"subscribe");
+        if (tmp) {
+                switch (tmp[0]) {
+                        case 'f':
+                                return SUB_FROM;
+                                break;
+                        case 't':
+                                /* version 2.2.0 has a bug which causes
+                                 * SUB_BOTH to be changed to SUB_TO
+                                 * this will force resynchronisation with
+                                 * user's roster. User will be asked for 
+                                 * subscription authorisation if the
+                                 * subscription was really "to"
+                                 */
+                                if (file_format_version<=0x02020000) return SUB_UNDEFINED;
+                                else return SUB_TO;
+                                break;
+                        case 'b':
+                                return SUB_BOTH;
+                                break;
+                        default:
+                                return SUB_NONE;
+                                break;
+                }
+        }
+        return SUB_UNDEFINED;
+}
+
-User *user_load(const char *jid){
-char *fn,*njid;
@@ -263 +300 @@
-int last_sys_msg=0,invisible=0,friends_only=0,ignore_unknown=0;
-unsigned int file_format_version=0;
+SubscriptionType subscribe;
-User *u;
-GList *contacts;
@@ -283 +321 @@
-        }
-        g_free(fn);
+        tag=xmlnode_get_tag(xml,"version");
+        if (tag!=NULL) {
+                p=xmlnode_get_attrib(tag,"file_format");
+                if (p!=NULL) file_format_version=(unsigned int)strtol(p,NULL,16);
+        }
-        tag=xmlnode_get_tag(xml,"jid");
-        if (tag!=NULL) {
-
-
-
-
-
+
+
+
-        if (ujid==NULL){
-                g_warning(L_("Couldn't find JID in %s's file"),jid);
@@ -375 +416 @@
-                                if (d!=NULL && d[0]!='\000') c->blocked=1;
-                                else c->blocked=0;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                                contacts=g_list_append(contacts,c);
-                        }

trunk/src/users.h

@@ -23 +23 @@
-#include <libgadu.h>
-
-001U   /* first change after 2.2.0
+101U   /* first change after 2.2.1
-
-typedef enum subscription_type_e {
@@ -62 +62 @@
-        char *locale;
-        char * status;
+        SubscriptionType subscribe;
-
-        int confirmed;