Changeset 409

Timestamp:

05/09/03 14:22:36 (6 years ago)

Author:

jajcus

Message:

- wait before disconnecting after <presence type="unavailable"> is received.

<presence type="invisible"> may come just after that

Files:

• trunk/jggtrans.xml (modified) (1 diff)
• trunk/jggtrans.xml.Pl (modified) (1 diff)
• trunk/src/sessions.c (modified) (9 diffs)
• trunk/src/sessions.h (modified) (2 diffs)

trunk/jggtrans.xml

@@ -121 +121 @@
- <!-- How long to wait before restart, after jabber server connection is broken
-      negative value means, that jggtrans should terminate -->
-
+
+
+
+
+
-
- <!-- list of gg servers to use.

trunk/jggtrans.xml.Pl

@@ -127 +127 @@
- <reconnect>300</reconnect>
-
+ <!-- Opóźnienie pomiędzy otrzymaniem informacji o nieobecności użytkownika,
+      a wylogowaniem z GG. Służy to do poprawnej obsługi <presence type="invisible"/> -->
+ <disconnect_delay>5</disconnect_delay>
+
- <!-- Katalog z danymi użytkowników. -->
- <!-- Proszę uważać na uprawnienie - hasła użytkowników (do GG) będą tam przechowywane -->

trunk/src/sessions.c

@@ -1 @@
-0 2003/05/09 10:32:01
+1 2003/05/09 12:22:36
-
-/*
@@ -39 +39 @@
-static int conn_timeout=30;
-static int pong_timeout=30;
+static int disconnect_delay=2;
-static int ping_interval=10;
-static int reconnect=0;
@@ -46 +47 @@
-static int session_try_login(Session *s);
-static int session_destroy(Session *s);
+static void resource_remove(Resource *r,int kill_session);
-
-static void session_stream_destroyed(gpointer key,gpointer value,gpointer user_data){
@@ -77 +79 @@
-        i=config_load_int("pong_timeout",0);
-        if (i>0) pong_timeout=i;
+        i=config_load_int("disconnect_delay",0);
+        if (i>0) disconnect_delay=i;
-        i=config_load_int("ping_interval",0);
-        if (i>0) ping_interval=i;
@@ -518 +522 @@
-static int session_destroy(Session *s){
-GList *it;
-Resource *r=NULL;
-
-        g_message(L_("Deleting session for '%s'"),s->jid);
@@ -545 +548 @@
-                gg_free_session(s->ggs);
-        }
+        while(s->resources) resource_remove((Resource *)s->resources->data,0);
-        if (s->query) xmlnode_free(s->query);
-        if (s->user) user_remove(s->user);
-        for(it=g_list_first(s->resources);it;){
-                r=(Resource *)it->data;
-                if (r->name) g_free(r->name);
-                if (r->show) g_free(r->show);
-                if (r->status) g_free(r->status);
-                it=it->next;
-                g_free(r);
-        }
-        g_list_free(s->resources);
-        if (s->gg_status_descr) g_free(s->gg_status_descr);
-        s->resources=NULL;
-
-        g_free(s);
-        return 0;
@@ -730 +723 @@
-}
-
+static void resource_remove(Resource *r,int kill_session){
+Session *s=r->session;
+
+        debug(L_("Removing resource %s of %s"),r->name,s->jid);
+        if (r->name) g_free(r->name);
+        if (r->show) g_free(r->show);
+        if (r->status) g_free(r->status);
+        s->resources=g_list_remove(s->resources,r);
+        g_free(r);
+        if (!s->resources && kill_session){
+                session_remove(s);
+                return;
+        }
+        if (r->disconnect_delay_func){
+                r->disconnect_delay_func=0;
+                g_source_remove(r->disconnect_delay_func);
+        }
+}
+
+gboolean delayed_disconnect(gpointer data){
+Resource *r=(Resource *)data;
+
+        g_assert(r!=NULL);
+
+        debug(L_("Delayed removal of resource %s of %s"),r->name,r->session->jid);
+        r->disconnect_delay_func=0;
+        resource_remove(r,1);
+        return FALSE;
+}
+
+
-int session_set_status(Session *s,const char *resource,int available,
-                        const char *show,const char *status,int priority){
@@ -745 +769 @@
-
-        if (!available){
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                        g_warning(N_("Unknown resource %s of %s"),resource?resource:"NULL",s->jid);
-                        return 0;
-                }
+                if (disconnect_delay>0 && r->available){
+                        r->available=0;
+                        debug(L_("Delaying removal of resource %s of %s"),resource?resource:"NULL",s->jid);
+                        r->disconnect_delay_func=g_timeout_add(disconnect_delay*1000,delayed_disconnect,r);
+                }
+                else resource_remove(r,1);
+                return 0;
-        }
-        else{
-
-                if ( r ){
+                        if (r->disconnect_delay_func) g_source_remove(r->disconnect_delay_func);
-                        if (r->show){
-                                g_free(r->show);
@@ -778 +797 @@
-                        r=g_new0(Resource,1);
-                        if (resource) r->name=g_strdup(resource);
+                        r->session=s;
-                        s->resources=g_list_append(s->resources,r);
-                }

trunk/src/sessions.h

@@ -1 @@
-3 2003/05/09 10:32:01
+4 2003/05/09 12:22:36
-
-/*
@@ -29 +29 @@
-        char *show;
-        char *status;
+        struct session_s *session;
+        guint disconnect_delay_func;
-}Resource;
-