Changeset 126

Timestamp:

24/10/08 11:33:05 (3 months ago)

Author:

smoku

Message:

Revamped session disconnection handling

Files:

• jggtrans/src/sessions.c (modified) (7 diffs)

jggtrans/src/sessions.c

@@ -295 +295 @@
 }
 
-gboolean session_timeout(gpointer data){
-Session *s;
+gboolean session_error(Session *s){
 GgServer *serv;
 
-        g_assert(data!=NULL);
-        s=(Session *)data;
         serv=(GgServer*)s->current_server->data;
-        user_load_locale(s->user);
 
         if(serv->port!=1){
-                g_warning(N_("Timeout for server %u - failure count: %d"),
-                        g_list_position(gg_servers, s->current_server),
-                        serv->error_count);
-
                 /* failure accounting for non-hubs */
                 serv->error_count+=1;
                 serv->error_time=time(NULL);
-        } else {
-                g_warning(N_("Timeout for hub %u"),
-                        g_list_position(gg_servers, s->current_server));
         }
 
@@ -341 +330 @@
         g_warning(N_("Session timeout for %s"),s->jid);
 
+        session_broken(s);
+        return FALSE;
+}
+
+gboolean session_timeout(gpointer data){
+Session *s;
+GgServer *serv;
+
+        g_assert(data!=NULL);
+        s=(Session *)data;
+        serv=(GgServer*)s->current_server->data;
+        user_load_locale(s->user);
+
+        if(serv->port!=1){
+                g_warning(N_("Timeout for server %u - failure count: %d"),
+                        g_list_position(gg_servers, s->current_server),
+                        serv->error_count);
+        } else {
+                g_warning(N_("Timeout for hub %u"),
+                        g_list_position(gg_servers, s->current_server));
+        }
+
+        return session_error(s);
+}
+
+void session_broken(Session *s){
+
         if (s->req_id){
-                jabber_iq_send_error(s->s,s->jid,NULL,s->req_id,504,_("Remote Server Timeout"));
+                jabber_iq_send_error(s->s,s->jid,NULL,s->req_id,502,_("Remote Server Error"));
         }
         else{
-                presence_send(s->s,NULL,s->user->jid,0,NULL,"Connection Timeout",0);
-        }
-
+                GList *it;
+                presence_send(s->s,NULL,s->user->jid,0,NULL,"Connection broken",0);
+                for(it=s->user->contacts;it;it=it->next){
+                        Contact *c=(Contact *)it->data;
+
+                        if (!GG_S_NA(c->status) && c->status!=-1){
+                                char *ujid;
+                                ujid=jid_build_full(c->uin);
+                                presence_send(s->s,ujid,s->user->jid,0,NULL,"Transport disconnected",0);
+                                g_free(ujid);
+                        }
+                }
+        }
+        s->connected=0;
         session_schedule_reconnect(s);
         session_remove(s);
-        return FALSE;
-}
+}
+
 
 gboolean session_ping(gpointer data){
@@ -453 +480 @@
 }
 
-void session_broken(Session *s){
-
-        if (s->req_id){
-                jabber_iq_send_error(s->s,s->jid,NULL,s->req_id,502,_("Remote Server Error"));
-        }
-        else{
-                GList *it;
-                presence_send(s->s,NULL,s->user->jid,0,NULL,"Connection broken",0);
-                for(it=s->user->contacts;it;it=it->next){
-                        Contact *c=(Contact *)it->data;
-
-                        if (!GG_S_NA(c->status) && c->status!=-1){
-                                char *ujid;
-                                ujid=jid_build_full(c->uin);
-                                presence_send(s->s,ujid,s->user->jid,0,NULL,"Transport disconnected",0);
-                                g_free(ujid);
-                        }
-                }
-        }
-        s->connected=0;
-        session_schedule_reconnect(s);
-        session_remove(s);
-}
-
-
 int session_io_handler(Session *s){
 struct gg_event *event;
@@ -491 +493 @@
                 if (condition&G_IO_HUP){
                         g_warning(N_("Hangup on connection for %s, GGid: %i"),s->jid,s->ggs->uin);
-                        s->current_server=g_list_next(s->current_server);
-                        if(!s->connected && s->current_server!=NULL){
-                                session_try_login(s);
-                                return FALSE;
-                        }
+                        return session_error(s);
                 }
                 if (condition&G_IO_NVAL) g_warning(N_("Invalid channel on connection for %s"),s->jid);
@@ -507 +505 @@
         if (!event){
                 g_warning(N_("Connection broken. Session of %s, GGid: %i"),s->jid,s->ggs->uin);
-                session_broken(s);
-                return FALSE;
+                return session_error(s);
         }
 
@@ -514 +511 @@
                 case GG_EVENT_DISCONNECT:
                         g_warning(N_("Server closed connection of %s, GGid: %i"),s->jid,s->ggs->uin);
-                        session_timeout((gpointer) s);
+                        session_error(s);
                         gg_event_free(event);
                         return FALSE;
@@ -534 +531 @@
                                         case GG_FAILURE_WRITING:
                                         case GG_FAILURE_TLS:
-                                                session_timeout((gpointer) s);
+                                                session_error(s);
                                         default:
                                                 break;