X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=5c3f0fb90a19c83fd59a4ffe5da2838fd90a9697;hb=84fb1f6e7089c24454eeb92bf093e31682db4489;hp=1fca891754bed6bf9b5bcf49b072afb7a5610279;hpb=b863ad60651637704882305af0f1ff84a1e45a56;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 1fca8917..5c3f0fb9 100755
--- 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) $!";
@@ -130,7 +133,7 @@ $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 = 8;			# Ditto but for nodes. In either case if a new incoming connection
+$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.
 
@@ -175,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;
@@ -187,7 +190,7 @@ 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} =~ /^I/ && $r && $user) {
+	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;
@@ -208,7 +211,7 @@ sub new_channel
 	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;
@@ -297,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();
 
@@ -386,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
@@ -405,6 +408,7 @@ DXUser->init($userfn, 1);
 
 # look for the sysop and the alias user and complain if they aren't there
 {
+	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);