Changeset 9d2f010 for perl

Timestamp:

Feb 18, 2008, 8:54:45 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:

2f69081, 61abb18

Parents:

b4fcc06 (diff), 6b580b0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging in the select branch, part 2. select.c

Location:

perl

Files:

• modules/IRC/lib/BarnOwl/Module/IRC.pm (modified) (4 diffs)
• modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm (modified) (2 diffs)
• modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (3 diffs)
• modules/Jabber/lib/BarnOwl/Module/Jabber/Connection.pm (modified) (1 diff)
• modules/Jabber/lib/BarnOwl/Module/Jabber/ConnectionManager.pm (modified) (2 diffs)
• lib/BarnOwl/ModuleLoader.pm (modified) (1 diff)

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

@@ -69 +69 @@
 }
 
-sub mainloop_hook {
+#sub mainloop_hook {
+#    return unless defined $irc;
+#    eval {
+#        $irc->do_one_loop();
+#    };
+#    return;
+#}
+
+sub OwlProcess {
     return unless defined $irc;
     eval {
@@ -76 +84 @@
     return;
 }
+
 
 sub register_handlers {
@@ -109 +118 @@
 $BarnOwl::Hooks::startup->add(\&startup);
 $BarnOwl::Hooks::shutdown->add(\&shutdown);
-$BarnOwl::Hooks::mainLoop->add(\&mainloop_hook);
+#$BarnOwl::Hooks::mainLoop->add(\&mainloop_hook);
 
 ################################################################################
@@ -165 +174 @@
         BarnOwl::admin_message("IRC", "Connected to $alias as $nick");
         $ircnets{$alias} = $conn;
+        my $fd = $conn->getSocket()->fileno();
+        BarnOwl::add_dispatch($fd, \&OwlProcess);
+        $conn->{FD} = $fd;
     } else {
         die("IRC::Connection->connect failed: $!");

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

@@ -69 +69 @@
 }
 
+sub getSocket
+{
+    my $self = shift;
+    return $self->conn->socket;
+}
+
 ################################################################################
 ############################### IRC callbacks ##################################
@@ -168 +174 @@
     my $self = shift;
     delete $BarnOwl::Module::IRC::ircnets{$self->alias};
-
+    BarnOwl::remove_dispatch($self->{FD});
     BarnOwl::admin_message('IRC',
                            "[" . $self->alias . "] Disconnected from server");

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) ) {
@@ -124 +124 @@
         if ($::shutdown) {
             do_logout($jid);
-            return;
-        }
+            next;
+        }
+
         if ($vars{status_changed}) {
             my $p = new Net::Jabber::Presence;
@@ -387 +388 @@
                 $conn->renameConnection($jidStr, $fullJid);
                 queue_admin_msg("Connected to jabber as $fullJid");
+                # The remove_dispatch() method is called from the
+                # ConnectionManager's removeConnection() method.
+                $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

@@ -110 +110 @@
 
 
+=head2 getSID
+
+Returns the StreamID for this connection.
+
+=cut
+
+sub getStreamID {
+    my $self = shift;
+    return $self->{SESSION}->{id} || "";
+}
+
+=head2 getSocket
+
+Returns the IO::Socket for this connection.
+
+=cut
+
+sub getSocket {
+    my $self = shift;
+    my $sid = getStreamID($self);
+    return $self->{STREAM}->GetSock($sid) || -1;
+}
+
+=head2 OwlProcess
+
+Non-blocking connection processing. For use in a select loop.
+
+=cut
+
+sub OwlProcess {
+    my $self = shift;
+    my $status = $self->Process(0);
+    if ( !defined($status) ) {
+        my $jid = $self->{SESSION}->{FULLJID};
+        BarnOwl::error("Jabber account $jid disconnected!");
+        BarnOwl::Module::Jabber::do_logout($jid);
+    }
+}
+
 =head1 SEE ALSO
 

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

@@ -37 +37 @@
     return 0 unless exists $self->{$jidStr};
 
+    BarnOwl::remove_dispatch($self->{$jidStr}->{Client}->{fileno}) if $self->{$jidStr}->{Client}->{fileno};
     $self->{$jidStr}->{Client}->Disconnect()
       if $self->{$jidStr}->{Client};
@@ -51 +52 @@
     return 0 if $oldJidStr eq $newJidStr;
 
-    $self->{$newJidStr} = $self->{$oldJidStr}; 
+    $self->{$newJidStr} = $self->{$oldJidStr};
     delete $self->{$oldJidStr};
     return 1;

perl/lib/BarnOwl/ModuleLoader.pm

@@ -24 +24 @@
                 $modules{$1} = 1;
             } elsif(-d "$dir/$f" && -d "$dir/$f/lib") {
-                push @INC, "$dir/$f/lib" unless grep m{^$dir/$f/lib$}, @INC;
+                unshift @INC, "$dir/$f/lib" unless grep m{^$dir/$f/lib$}, @INC;
                 $modules{$f} = 1;
             }