Changeset 0dbb7d2

Timestamp:

Dec 22, 2009, 6:37:38 PM (15 years ago)

Author:

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

Branches:

master, release-1.10, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

a2a5236

Parents:

6396c1e

git-author:

Alejandro R. Sedeño <asedeno@mit.edu> (12/22/09 01:15:39)

git-committer:

Alejandro R. Sedeño <asedeno@mit.edu> (12/22/09 18:37:38)

Message:

Factor out some common jabber connect-time code

Call it upon successful connection and reconnection.

Location:

perl/modules/Jabber/lib/BarnOwl/Module

Files:

• Jabber.pm (modified) (1 diff)
• Jabber/Connection.pm (modified) (1 diff)
• Jabber/ConnectionManager.pm (modified) (2 diffs)

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

@@ -465 +465 @@
                     }
                 );
-                my $roster = $conn->getRosterFromJID($jidStr);
-                $roster->fetch();
-                $client->PresenceSend( priority => 1 );
-                my $fullJid = $client->{SESSION}->{FULLJID} || $jidStr;
-                $conn->renameConnection($jidStr, $fullJid);
-                queue_admin_msg("Connected to jabber as $fullJid");
-                # The remove_io_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_io_dispatch($client->{fileno}, 'r', sub { $client->OwlProcess($fullJid) });
-
-                # populate completion from roster.
-                for my $buddy ( $roster->jids('all') ) {
-                    my %jq  = $roster->query($buddy);
-                    my $name = $jq{name} || $buddy->GetUserID();
-                    $completion_jids{$name} = 1;
-                    $completion_jids{$buddy->GetJID()} = 1;
-                }
-                $vars{idletime} |= BarnOwl::getidletime();
-                unless (exists $vars{keepAliveTimer}) {
-                    $vars{keepAliveTimer} = BarnOwl::Timer->new({
-                        'after' => 5,
-                        'interval' => 5,
-                        'cb' => sub { BarnOwl::Module::Jabber::do_keep_alive_and_auto_away(@_) }
-                                                                });
-                }
+                $client->onConnect($conn, $jidStr);
             }
         }

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

@@ -163 +163 @@
 }
 
+=head2 OnConnect
+
+Actions to perform on connecting and reconnecting.
+
+=cut
+
+sub onConnect {
+    my $self = shift;
+    my $conn = shift;
+    my $jidStr = shift;
+
+    my $fullJid = $self->{SESSION}->{FULLJID} || $jidStr;
+    my $roster = $conn->getRosterFromJID($jidStr);
+
+    $roster->fetch();
+    $self->PresenceSend( priority => 1 );
+
+    $conn->renameConnection($jidStr, $fullJid);
+    BarnOwl::admin_message('Jabber', "Connected to jabber as $fullJid");
+    # The remove_io_dispatch() method is called from the
+    # ConnectionManager's removeConnection() method.
+    $self->{fileno} = $self->getSocket()->fileno();
+    BarnOwl::add_io_dispatch($self->{fileno}, 'r', sub { $self->OwlProcess($fullJid) });
+
+    # populate completion from roster.
+    for my $buddy ( $roster->jids('all') ) {
+        my %jq  = $roster->query($buddy);
+        my $name = $jq{name} || $buddy->GetUserID();
+        $BarnOwl::Module::Jabber::completion_jids{$name} = 1;
+        $BarnOwl::Module::Jabber::completion_jids{$buddy->GetJID()} = 1;
+    }
+    $BarnOwl::Module::Jabber::vars{idletime} |= BarnOwl::getidletime();
+    unless (exists $BarnOwl::Module::Jabber::vars{keepAliveTimer}) {
+        $BarnOwl::Module::Jabber::vars{keepAliveTimer} =
+            BarnOwl::Timer->new({
+                'after' => 5,
+                'interval' => 5,
+                'cb' => sub { BarnOwl::Module::Jabber::do_keep_alive_and_auto_away(@_) }
+                                });
+    }
+}
+
 =head1 SEE ALSO
 

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

@@ -85 +85 @@
     $self->{$jidStr}->{ReconnectAt} = time + $self->{$jidStr}->{ReconnectBackoff};
 
-    my $status = $self->{$jidStr}->{Client}->Connect;
+    my $client = $self->{$jidStr}->{Client};
+    my $status = $client->Connect;
     return 0 unless $status;
 
-    my @result = $self->{$jidStr}->{Client}->AuthSend( %{ $self->{$jidStr}->{Auth} } );
+    my @result = $client->AuthSend( %{ $self->{$jidStr}->{Auth} } );
     if ( !@result || $result[0] ne 'ok' ) {
         $self->removeConnection($jidStr);
@@ -94 +95 @@
         return 0;
     }
-
-    BarnOwl::admin_message(Jabber => "Reconnected to jabber as $jidStr");
-    $self->{$jidStr}{Status} = "available";
-
-    foreach my $muc ($self->{$jidStr}->{Client}->MUCs()) {
+    $self->{$jidStr}->{Status} = "available";
+    $client->onConnect($self, $jidStr);
+    foreach my $muc ($client->MUCs()) {
         $muc->Join($muc->{ARGS});
     }