many changes (see Changes)

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index d471b71b8aba42fcdd77ae67a2e7493f9836010e..b6c38166b6dba898a1a513f730b015b4850f9673 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -176,8 +176,6 @@ use Fcntl ':flock';
 use POSIX ":sys_wait_h";
 use Web;
 
-use vars qw($version $build $gitversion $gitbranch);
-
 use strict;
 
 use Local;
@@ -189,9 +187,6 @@ $yes //= 'Yes';                                     # visual representation of yes
 $no //= 'No';                              # ditto for no
 $user_interval //= 11*60;              # the interval between unsolicited prompts if no traffic
 
-
-$clusteraddr //= '127.0.0.1';     # cluster tcp host address - used for things like console.pl
-$clusterport //= 27754;           # cluster tcp port
 @inqueue = ();                                 # the main input queue, an array of hashes
 $systime = 0;                                  # the time now (in seconds)
 $starttime = 0;                 # the starting time of the cluster
@@ -223,6 +218,14 @@ our $clssecs;                                      # the amount of cpu time the DXSpider process have consumed
 our $cldsecs;                                  # the amount of cpu time any child processes have consumed
 our $allowslashcall;                   # Allow / in connecting callsigns (ie PA0/G1TLH, or even PA0/G1TLH/2) 
 
+our @localhost_names = qw(127.0.0.1 ::1); # all ip addresses that will need to be aliased below (ipv4 or ipv6)
+
+our $localhost_alias_ipv4;             # these are the IPV4 & 6 aliases for localhost connected clients
+our $localhost_alias_ipv6;             # for things (PC92, PC61 etc) that expose IP addresses. These *may*
+                                # be set by Msg.pm stuff if they are left undefined but, if you need
+                                # certanty then set/var them in the startup file.
+
+our $save_route_cache;                 # save and restore route cache on restart. Probably only useful for G1TLH testing
 
 use vars qw($version $subversion $build $gitversion $gitbranch);
 
@@ -306,13 +309,20 @@ sub new_channel
                }
 
                # now deal with the lock
+               my $host = $conn->peerhost;
                if ($lock) {
-                       my $host = $conn->peerhost;
                        LogDbg('', "$call on $host is locked out, disconnected");
                        $conn->disconnect;
                        return;
                }
 
+               # Is he from a badip?
+               if (DXCIDR::find($host)) {
+                       LogDbg('', "$call on $host is from a badip $host, disconnected");
+                       $conn->disconnect;
+                       return;
+               }
+
                # set up the basic channel info for "Normal" Users
                # is there one already connected to me - locally?
 
@@ -420,7 +430,7 @@ sub login
        return \&new_channel;
 }
 
-our $ceasing;
+my $ceasing;
 
 # cease running this program, close down all the connections nicely
 sub cease
@@ -430,6 +440,8 @@ sub cease
        cluck("ceasing") if $ceasing; 
        
        return if $ceasing++;
+
+       dbg("DXSpider Ceasing");
        
        unless ($is_win) {
                $SIG{'TERM'} = 'IGNORE';
@@ -453,18 +465,23 @@ sub cease
        UDPMsg::finish();
 
        # end everything else
+       QSL::finish();
        RBN::finish();
-       DXUser::finish();
        DXDupe::finish();
 
        # close all databases
        DXDb::closeall;
 
+       # Write route cache
+       Route::write_cache() if $save_route_cache;
+       
        # close all listeners
        foreach my $l (@listeners) {
                $l->close_server;
        }
 
+       DXUser::finish();
+
        LogDbg('cluster', "DXSpider v$version build $build (git: $gitbranch/$gitversion) using perl $^V on $^O ended");
        dbg("bye bye everyone - bye bye");
        dbgclose();
@@ -506,7 +523,6 @@ sub AGWrestart
        AGWMsg::init(\&new_channel);
 }
 
-
 sub setup_start
 {
        #############################################################
@@ -598,7 +614,8 @@ sub setup_start
        my ($year) = (gmtime)[5];
        $year += 1900;
        LogDbg('cluster', "DXSpider v$version build $build (git: $gitbranch/$gitversion) using perl $^V on $^O started");
-       dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
+       LogDbg('cluster', "Copyright (c) 1998-$year Dirk Koopman G1TLH");
+       LogDbg('cluster', "Capabilities: ve7cc rbn");
 
        # load Prefixes
        dbg("loading prefixes ...");
@@ -639,7 +656,9 @@ sub setup_start
                }
        }
 
-
+       # read any route cache there might be
+       Route::read_cache() if $save_route_cache;
+       
        # start listening for incoming messages/connects
        dbg("starting listeners ...");
        my $conn = IntMsg->new_server($clusteraddr, $clusterport, \&login);
@@ -668,7 +687,7 @@ sub setup_start
        UDPMsg::init(\&new_channel);
 
        # load bad words
-       dbg("load badwords: " . (BadWords::load or "Ok"));
+       BadWords::load();
 
        # prime some signals
        unless ($DB::VERSION) {
@@ -853,6 +872,7 @@ sub per_minute
 sub per_10_minute
 {
        RBN::per_10_minute();
+       Route::write_cache() if $save_route_cache;
 }
 
 sub per_hour
@@ -893,3 +913,10 @@ cease(0);
 
 exit(0);
 
+sub END
+{
+       unless ($ceasing) {
+               print "DXSpider Ending\n";
+               cease();
+       }
+}