Changeset 416241f

Timestamp:

Dec 28, 2009, 12:25:00 AM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

85fa6e4

Parents:

3acab0e

git-author:

Nelson Elhage <nelhage@mit.edu> (12/23/09 12:28:51)

git-committer:

Nelson Elhage <nelhage@mit.edu> (12/28/09 00:25:00)

Message:

IRC: irc-disconnect on a pending reconnect should cancel it.

Location:

perl/modules/IRC/lib/BarnOwl/Module

Files:

• IRC.pm (modified) (7 diffs)
• IRC/Connection.pm (modified) (1 diff)

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

@@ -161 +161 @@
 with C<CHANNEL_ARG>.
 
+=item C<ALLOW_DISCONNECTED>
+
+C<IRC-CONNECTION> may be a disconnected connection object that is
+currently pending a reconnect.
+
 =back
 
@@ -167 +172 @@
 use constant CHANNEL_ARG        => 1;
 use constant CHANNEL_OPTIONAL   => 2;
+
+use constant ALLOW_DISCONNECTED => 4;
 
 sub register_commands {
@@ -195 +202 @@
 
     BarnOwl::new_command(
-        'irc-disconnect' => mk_irc_command( \&cmd_disconnect ),
+        'irc-disconnect' => mk_irc_command( \&cmd_disconnect, ALLOW_DISCONNECTED ),
         {
             summary => 'Disconnect from an IRC server',
@@ -421 +428 @@
     my $cmd = shift;
     my $conn = shift;
-    $conn->conn->disconnect;
-    return;
+    if ($conn->conn->connected) {
+        $conn->conn->disconnect;
+    } elsif ($reconnect{$conn->alias}) {
+        BarnOwl::admin_message('IRC',
+                               "[" . $conn->alias . "] Reconnect cancelled");
+        $conn->cancel_reconnect;
+    }
 }
 
@@ -589 +601 @@
 
         if(defined($alias)) {
-            $conn = get_connection_by_alias($alias);
+            $conn = get_connection_by_alias($alias,
+                                            $flags & ALLOW_DISCONNECTED);
         }
         if($flags & CHANNEL_ARG) {
@@ -612 +625 @@
         if(!$conn) {
             if($m && $m->type eq 'IRC') {
-                $conn = get_connection_by_alias($m->network);
+                $conn = get_connection_by_alias($m->network,
+                                               $flags & ALLOW_DISCONNECTED);
             }
         }
@@ -631 +645 @@
 sub get_connection_by_alias {
     my $key = shift;
-    die("No such ircnet: $key\n") unless exists $ircnets{$key};
-    return $ircnets{$key};
+    my $allow_disconnected = shift;
+
+    return $ircnets{$key} if exists $ircnets{$key};
+    return $reconnect{$key} if $allow_disconnected && exists $reconnect{$key};
+    die("No such ircnet: $key\n")
 }
 

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

@@ -328 +328 @@
 }
 
+sub cancel_reconnect {
+    my $self = shift;
+    delete $BarnOwl::Module::IRC::reconnect{$self->alias};
+    delete $self->{reconnect_timer};
+}
+
 sub connected {
     my $self = shift;
     my $msg = shift;
     BarnOwl::admin_message("IRC", $msg);
-    delete $BarnOwl::Module::IRC::reconnect{$self->alias};
-    delete $self->{reconnect_timer};
+    $self->cancel_reconnect;
     $BarnOwl::Module::IRC::ircnets{$self->alias} = $self;
     my $fd = $self->getSocket()->fileno();