add more routing code together with associated commands

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 230cd88e6ec7c35006a524f61e311d5f509fe720..fc0a6a04a429c22cbee00fa6598847eb7489065e 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -82,6 +82,9 @@ use BBS;
 use WCY;
 use BadWords;
 use Timer;
+use Route;
+use Route::Node;
+use Route::User;
 
 use Data::Dumper;
 use IO::File;
@@ -95,12 +98,12 @@ package main;
 use strict;
 use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects 
                        $zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr 
-                       $clusterport $mycall $decease $build $is_win
+                       $clusterport $mycall $decease $build $is_win $routeroot 
                   );
 
 @inqueue = ();                                 # the main input queue, an array of hashes
 $systime = 0;                                  # the time now (in seconds)
-$version = "1.47";                             # the version no of the software
+$version = "1.48";                             # the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 #@outstanding_connects = ();     # list of outstanding connects
 @listeners = ();                               # list of listeners
@@ -110,7 +113,8 @@ $starttime = 0;                 # the starting time of the cluster
 sub already_conn
 {
        my ($conn, $call, $mess) = @_;
-       
+
+       $conn->disable_read(1);
        dbg('chan', "-> D $call $mess\n"); 
        $conn->send_now("D$call|$mess");
        sleep(2);
@@ -147,7 +151,7 @@ sub new_channel
                        ;
                } else {
                        if (my $ref = DXCluster->get_exact($call)) {
-                               my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->call);
+                               my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->dxchancall);
                                already_conn($conn, $call, $mess);
                                return;
                        }
@@ -155,7 +159,7 @@ sub new_channel
                $user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
        } else {
                if (my $ref = DXCluster->get_exact($call)) {
-                       my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->call);
+                       my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->dxchancall);
                        already_conn($conn, $call, $mess);
                        return;
                }
@@ -433,6 +437,7 @@ DXProt->init();
 
 # put in a DXCluster node for us here so we can add users and take them away
 DXNode->new($DXProt::me, $mycall, 0, 1, $DXProt::myprot_version); 
+$routeroot = Route::Node->new($mycall, $version, Route::here($DXProt::me->here)|Route::conf($DXProt::me->confmode));
 
 # read in any existing message headers and clean out old crap
 dbg('err', "reading existing message headers ...");