remove leading 0 from ssids on login

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 919c59db4278b0fc586db283202dc14c5aa65c41..bfd637c55f7aaa692ff4ca18e22b7d70b6bc7b23 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -12,7 +12,7 @@
 
 package main;
 
-require 5.10.1;
+require 5.16.1;
 
 use warnings;
 
@@ -21,15 +21,15 @@ use vars qw($root $is_win $systime $lockfn @inqueue $starttime $lockfn @outstand
                        $clusterport $mycall $decease $routeroot $me $reqreg $bumpexisting
                        $allowdxby $dbh $dsn $dbuser $dbpass $do_xml $systime_days $systime_daystart
                        $can_encode $maxconnect_user $maxconnect_node $idle_interval $log_flush_interval
-                       $broadcast_debug 
+                       $broadcast_debug $yes $no $user_interval
                   );
 
-$lang = 'en';                                  # default language
-$clusteraddr = '127.0.0.1';            # cluster tcp host address - used for things like console.pl
-$clusterport = 27754;                  # cluster tcp port
-$yes = 'Yes';                                  # visual representation of yes
-$no = 'No';                                            # ditto for no
-$user_interval = 11*60;                        # the interval between unsolicited prompts if no traffic
+#$lang = 'en';                                 # default language
+#$clusteraddr = '127.0.0.1';           # cluster tcp host address - used for things like console.pl
+#$clusterport = 27754;                 # cluster tcp port
+#$yes = 'Yes';                                 # visual representation of yes
+#$no = 'No';                                           # ditto for no
+#$user_interval = 11*60;                       # the interval between unsolicited prompts if no traffic
 
 # make sure that modules are searched in the order local then perl
 BEGIN {
@@ -138,7 +138,7 @@ use AnnTalk;
 use BBS;
 use WCY;
 use BadWords;
-use Timer;
+use DXTimer;
 use Route;
 use Route::Node;
 use Route::User;
@@ -166,6 +166,13 @@ use strict;
 
 use Local;
 
+$lang //= 'en';                                        # default language
+$clusteraddr //= '127.0.0.1';   # cluster tcp host address - used for things like console.pl
+$clusterport //= 27754;                        # cluster tcp port
+$yes //= 'Yes';                                        # visual representation of yes
+$no //= 'No';                              # ditto for no
+$user_interval //= 11*60;              # the interval between unsolicited prompts if no traffic
+
 
 @inqueue = ();                                 # the main input queue, an array of hashes
 $systime = 0;                                  # the time now (in seconds)
@@ -226,7 +233,8 @@ sub new_channel
                        already_conn($conn, $call, "Maximum no of web connected connects ($Web::maxssid) exceeded");
                        return;
                }
-               $call = $newcall;
+               $call = normalise_call($newcall);
+               
                $user = DXUser::get_current($call);
                unless ($user) {
                        $user = DXUser->new($call);
@@ -248,6 +256,15 @@ sub new_channel
                $conn->send_now("C$call");
        } else {
                # "Normal" connections
+
+               # normalise calls like G1TST-0/G1TST-00/G1TST-01 to G1TST and G1TST-1 respectively
+               my $ncall = normalise_call($call);
+               if ($call ne $ncall) {
+                       LogDbg('err', "new_channel login invalid $call converted to $ncall");
+                       $msg =~ s/$call/$ncall/;
+                       $call = $ncall;
+               }
+               # is it a valid callsign (in format)?
                unless (is_callsign($call)) {
                        already_conn($conn, $call, DXM::msg($lang, "illcall", $call));
                        return;
@@ -255,8 +272,8 @@ sub new_channel
 
                # is he locked out ?
                my $lock;
-               $user = DXUser::get_current($call);
                $conn->conns($call);
+               $user = DXUser::get_current($call);
                my $basecall = $call;
                $basecall =~ s/-\d+$//; # remember this for later multiple user processing, it's used for other stuff than checking lockout status
                if ($user) {
@@ -578,6 +595,9 @@ sub setup_start
        DXUser::init(4);                        # version 4 == json format
 
        Filter::init();                         # doesn't do much, but has to be done
+
+       AnnTalk::init();                        # initialise announce cache
+       
        
 
        # look for the sysop and the alias user and complain if they aren't there
@@ -791,7 +811,7 @@ sub per_sec
        DXCron::process();                      # do cron jobs
        RBN::process();
 
-       Timer::handler();
+       DXTimer::handler();
        DXLog::flushall();
 }