Changeset 6b580b0

Timestamp:

Feb 18, 2008, 5:38:32 PM (17 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

61abb18

Parents:

18a54ee

Message:

functions.c:
 * removing the redisplay call from owl_function_lastmsg_noredisplay()

select.c:
 * Watch AIM sockets for writing as well. This speeds up AIM connections significantly.

Jabber.pm 
 * keep a copy of the fd around for later.
 * Process() on mainloop for keep-alives

Jabber/ConnectionManager.pm
 * Use the stored fd to drop the dispatch for a connection.

Jabber/Connection.pm
 * Use the GetSock() abstraction since we have it.
 * Call the right do_logout when we have trouble.

Files:

• functions.c (modified) (1 diff)
• perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (2 diffs)
• perl/modules/Jabber/lib/BarnOwl/Module/Jabber/Connection.pm (modified) (2 diffs)
• perl/modules/Jabber/lib/BarnOwl/Module/Jabber/ConnectionManager.pm (modified) (1 diff)
• select.c (modified) (3 diffs)

functions.c

@@ -798 +798 @@
     owl_global_set_curmsg(&g, curmsg+1);
   } 
-  owl_mainwin_redisplay(owl_global_get_mainwin(&g));
+  /* owl_mainwin_redisplay(owl_global_get_mainwin(&g)); */
   owl_global_set_direction_downwards(&g);
 }

perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm

@@ -116 +116 @@
             BarnOwl::error("Connection for $jid undefined -- error in reload?");
         }
+        # We keep this in the mainloop hook for keep-alives
+        my $status = $client->Process(0);
+        if ( !defined($status) ) {
+            BarnOwl::error("Jabber account $jid disconnected!");
+            do_logout($jid);
+        }
         if ($::shutdown) {
             do_logout($jid);
             next;
         }
+
         if ($vars{status_changed}) {
             my $p = new Net::Jabber::Presence;
@@ -383 +390 @@
                 # The remove_dispatch() method is called from the
                 # ConnectionManager's removeConnection() method.
-                BarnOwl::add_dispatch($client->getSocket()->fileno(), sub { $client->OwlProcess() });
+                $client->{fileno} = $client->getSocket()->fileno();
+                #queue_admin_msg("Connected to jabber as $fullJid ($client->{fileno})");
+                BarnOwl::add_dispatch($client->{fileno}, sub { $client->OwlProcess() });
             }
         }

perl/modules/Jabber/lib/BarnOwl/Module/Jabber/Connection.pm

@@ -130 +130 @@
     my $self = shift;
     my $sid = getStreamID($self);
-    return $self->{STREAM}->{SIDS}->{$sid}->{sock} || -1;
+    return $self->{STREAM}->GetSock($sid) || -1;
 }
 
@@ -145 +145 @@
         my $jid = $self->{SESSION}->{FULLJID};
         BarnOwl::error("Jabber account $jid disconnected!");
-        do_logout($jid);
+        BarnOwl::Module::Jabber::do_logout($jid);
     }
 }

perl/modules/Jabber/lib/BarnOwl/Module/Jabber/ConnectionManager.pm

@@ -37 +37 @@
     return 0 unless exists $self->{$jidStr};
 
-    BarnOwl::remove_dispatch($self->{$jidStr}->{Client}->getSocket()->fileno());
+    BarnOwl::remove_dispatch($self->{$jidStr}->{Client}->{fileno}) if $self->{$jidStr}->{Client}->{fileno};
     $self->{$jidStr}->{Client}->Disconnect()
       if $self->{$jidStr}->{Client};

select.c

@@ -105 +105 @@
 }
 
-int owl_select_dispatch_prepare_fd_sets(fd_set *r, fd_set *e)
+int owl_select_dispatch_prepare_fd_sets(fd_set *r, fd_set *w, fd_set *e)
 {
   int i, len, max_fd;
@@ -119 +119 @@
     d = (owl_dispatch*)owl_list_get_element(dl, i);
     FD_SET(d->fd, r);
+    FD_SET(d->fd, w);
     FD_SET(d->fd, e);
     if (max_fd < d->fd) max_fd = d->fd;
@@ -186 +187 @@
   timeout.tv_usec = 0;
 
-  max_fd = owl_select_dispatch_prepare_fd_sets(&r, &e);
+  max_fd = owl_select_dispatch_prepare_fd_sets(&r, &w, &e);
 
   /* AIM HACK: