fix barf on encountering an empty lockfile

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 620c7e77c90a7500a5a8ee5b6d7904cd6ab090ef..5c3f0fb90a19c83fd59a4ffe5da2838fd90a9697 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -34,11 +34,14 @@ BEGIN {
        # try to create and lock a lockfile (this isn't atomic but
        # should do for now
        $lockfn = "$root/local/cluster.lck";       # lock file name
-       if (-e $lockfn) {
+       if (-w $lockfn) {
                open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
                my $pid = <CLLOCK>;
-               chomp $pid;
-               die "Lockfile ($lockfn) and process $pid exist, another cluster running?" if kill 0, $pid;
+               if ($pid) {
+                       chomp $pid;
+                       die "Lockfile ($lockfn) and process $pid exist, another cluster running?" if kill 0, $pid;
+               }
+               unlink $lockfn;
                close CLLOCK;
        }
        open(CLLOCK, ">$lockfn") or die "Can't open Lockfile ($lockfn) $!";
@@ -98,10 +101,10 @@ use Mrtg;
 use USDB;
 use UDPMsg;
 use QSL;
-use RouteDB;
 use DXXml;
 use DXSql;
 use IsoTime;
+use BPQMsg;
 
 use Data::Dumper;
 use IO::File;
@@ -118,7 +121,7 @@ use vars qw(@inqueue $systime $starttime $lockfn @outstanding_connects
                        $zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr
                        $clusterport $mycall $decease $is_win $routeroot $me $reqreg $bumpexisting
                        $allowdxby $dbh $dsn $dbuser $dbpass $do_xml $systime_days $systime_daystart
-                       $can_encode
+                       $can_encode $maxconnect_user $maxconnect_node
                   );
 
 @inqueue = ();                                 # the main input queue, an array of hashes
@@ -129,7 +132,10 @@ $starttime = 0;                 # the starting time of the cluster
 $reqreg = 0;                                   # 1 = registration required, 2 = deregister people
 $bumpexisting = 1;                             # 1 = allow new connection to disconnect old, 0 - don't allow it
 $allowdxby = 0;                                        # 1 = allow "dx by <othercall>", 0 - don't allow it
-
+$maxconnect_user = 3;                  # the maximum no of concurrent connections a user can have at a time
+$maxconnect_node = 0;                  # Ditto but for nodes. In either case if a new incoming connection
+                                                               # takes the no of references in the routing table above these numbers
+                                                               # then the connection is refused. This only affects INCOMING connections.
 
 # send a message to call on conn and disconnect
 sub already_conn
@@ -164,7 +170,7 @@ sub new_channel
 
        # set up the basic channel info
        # is there one already connected to me - locally?
-       my $user = DXUser->get_current($call);
+       my $user = DXUser::get_current($call);
        my $dxchan = DXChannel::get($call);
        if ($dxchan) {
                if ($user && $user->is_node) {
@@ -172,7 +178,7 @@ sub new_channel
                        return;
                }
                if ($bumpexisting) {
-                       my $ip = $conn->{peerhost} || 'unknown';
+                       my $ip = $conn->peerhost || 'unknown';
                        $dxchan->send_now('D', DXM::msg($lang, 'conbump', $call, $ip));
                        LogDbg('DXCommand', "$call bumped off by $ip, disconnected");
                        $dxchan->disconnect;
@@ -182,14 +188,30 @@ sub new_channel
                }
        }
 
+       # (fairly) politely disconnect people that are connected to too many other places at once
+       my $r = Route::get($call);
+       if ($conn->{sort} && $conn->{sort} =~ /^I/ && $r && $user) {
+               my @n = $r->parents;
+               my $m = $r->isa('Route::Node') ? $maxconnect_node : $maxconnect_user;
+               my $c = $user->maxconnect;
+               my $v;
+               $v = defined $c ? $c : $m;
+               if ($v && @n >= $v) {
+                       my $nodes = join ',', @n;
+                       LogDbg('DXCommand', "$call has too many connections ($v) at $nodes - disconnected");
+                       already_conn($conn, $call, DXM::msg($lang, 'contomany', $call, $v, $nodes));
+                       return;
+               }
+       }
+
        # is he locked out ?
        my $basecall = $call;
        $basecall =~ s/-\d+$//;
-       my $baseuser = DXUser->get_current($basecall);
+       my $baseuser = DXUser::get_current($basecall);
        my $lock = $user->lockout if $user;
        if ($baseuser && $baseuser->lockout || $lock) {
                if (!$user || !defined $lock || $lock) {
-                       my $host = $conn->{peerhost} || "unknown";
+                       my $host = $conn->peerhost || "unknown";
                        LogDbg('DXCommand', "$call on $host is locked out, disconnected");
                        $conn->disconnect;
                        return;
@@ -207,8 +229,8 @@ sub new_channel
                $dxchan = DXProt->new($call, $conn, $user);
        } elsif ($user->is_user) {
                $dxchan = DXCommandmode->new($call, $conn, $user);
-       } elsif ($user->is_bbs) {
-               $dxchan = BBS->new($call, $conn, $user);
+#      } elsif ($user->is_bbs) {                                  # there is no support so
+#              $dxchan = BBS->new($call, $conn, $user);               # don't allow it!!!
        } else {
                die "Invalid sort of user on $call = $sort";
        }
@@ -260,6 +282,7 @@ sub cease
 
        # disconnect AGW
        AGWMsg::finish();
+       BPQMsg::finish();
 
        # disconnect UDP customers
        UDPMsg::finish();
@@ -277,7 +300,7 @@ sub cease
                $l->close_server;
        }
 
-       LogDbg('cluster', "DXSpider V$version, build $subversion.$build ended");
+       LogDbg('cluster', "DXSpider V$version, build $subversion.$build (git: $gitversion) ended");
        dbgclose();
        Logclose();
 
@@ -366,7 +389,7 @@ DXXml::init();
 # banner
 my ($year) = (gmtime)[5];
 $year += 1900;
-LogDbg('cluster', "DXSpider V$version, build $subversion.$build started");
+LogDbg('cluster', "DXSpider V$version, build $subversion.$build (git: $gitversion) started");
 dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
 
 # load Prefixes
@@ -385,9 +408,10 @@ DXUser->init($userfn, 1);
 
 # look for the sysop and the alias user and complain if they aren't there
 {
-       my $ref = DXUser->get($mycall);
+       die "\$myalias \& \$mycall are the same ($mycall)!, they must be different (hint: make \$mycall = '${mycall}-2';). Oh and don't forget to rerun create_sysop.pl!" if $mycall eq $myalias;
+       my $ref = DXUser::get($mycall);
        die "$mycall missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
-       $ref = DXUser->get($myalias);
+       $ref = DXUser::get($myalias);
        die "$myalias missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
 }
 
@@ -411,6 +435,9 @@ foreach my $l (@main::listen) {
 dbg("AGW Listener") if $AGWMsg::enable;
 AGWrestart();
 
+dbg("BPQ Listener") if $BPQMsg::enable;
+BPQMsg::init(\&new_channel);
+
 dbg("UDP Listener") if $UDPMsg::enable;
 UDPMsg::init(\&new_channel);
 
@@ -538,6 +565,7 @@ for (;;) {
                DXUser::process();
                DXDupe::process();
                AGWMsg::process();
+               BPQMsg::process();
 
                if (defined &Local::process) {
                        eval {