6.97: fixed broken CONNECT command.

            added ->do_mode_string_local() which is the same as ->do_mode_string() except it doesn't tell other servers about the change.

Author: cooper

INDEV

@@ -1917,4 +1917,8 @@ CHANGES:
         95. handle modes from the local server rather than the user in Access module.
 
         96. solved an issue where some users may not be ->quit()ted during netsplit due to modification of the {users} array during iteration.
+        
+        97. fixed broken CONNECT command.
+            added ->do_mode_string_local() which is the same as ->do_mode_string() except it doesn't tell other servers about the change.
+
 

VERSION

@@ -1 +1 @@
-6.96
+6.97

lib/channel/mine.pm

@@ -131,9 +131,15 @@ sub prefix {
     return q..
 }
 
+# same as do_mode_string() except it never sends to other servers.
+sub do_mode_string_local {
+    $_[6] = 1;
+    do_mode_string(@_);
+}
+
 # handle a mode string, tell our local users, and tell other servers.
 sub do_mode_string {
-    my ($channel, $perspective, $source, $modestr, $force, $protocol) = @_;
+    my ($channel, $perspective, $source, $modestr, $force, $protocol, $local_only) = @_;
 
     # handle the mode.
     my ($user_result, $server_result) = $channel->handle_mode_string(
@@ -155,7 +161,7 @@ sub do_mode_string {
     $main::pool->fire_command_all(cmode =>
         $source, $channel, $channel->{time},
         $perspective->{sid}, $server_result
-    );
+    ) unless $local_only;
 
 }
 

lib/connection.pm

@@ -116,7 +116,7 @@ sub handle {
             if (defined ( my $addr = conn($connection->{name}, 'address') )) {
 
                 # check for matching IPs
-                if (lc $connection->{ip} ne $addr) {
+                if ($connection->{ip} ne $addr) {
                     $connection->done('Invalid credentials');
                     return;
                 }

modules/Core.module/submodules/ServerCommands.pm

@@ -497,7 +497,7 @@ sub cum {
 
         # set modes. tell our local users.
         my $final_modestr = $modes.' '.(($uid.' ') x length $modes);
-        $channel->do_mode_string($serv, $serv, $final_modestr, 1, 1);
+        $channel->do_mode_string_local($serv, $serv, $final_modestr, 1, 1);
 
     }
     return 1

modules/Core.module/submodules/UserCommands.pm

@@ -784,23 +784,22 @@ sub part {
 }
 
 sub sconnect {
-    my ($user, $data, @args) = @_;
-    my $server = $args[1];
+    my ($user, $data, $sname) = @_;
 
     # make sure the server exists
-    if (!$ircd::conf->has_block($server)) {
-        $user->server_notice('CONNECT', 'no such server '.$server);
+    if (!$ircd::conf->has_block($sname)) {
+        $user->server_notice('CONNECT', 'no such server '.$sname);
         return
     }
 
     # make sure it's not already connected
-    if ($main::pool->lookup_server_name($server)) {
-        $user->server_notice('CONNECT', "$server is already connected.");
+    if ($main::pool->lookup_server_name($sname)) {
+        $user->server_notice('CONNECT', "$sname is already connected.");
         return
     }
 
-    if (!server::linkage::connect_server($server)) {
-        $user->server_notice('CONNECT', 'couldn\'t connect to '.$server);
+    if (!server::linkage::connect_server($sname)) {
+        $user->server_notice('CONNECT', 'couldn\'t connect to '.$sname);
     }
 }