X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=a33e6da5f1a8e76b2907cf8547791702a146cdd9;hb=a8cf5442a1a63464ca965b158f184dcd352a932f;hp=7b889fc4c63781d4e9ace3641932a7d594e8695e;hpb=02f97e2b119bcd216e4ce68850d48d21029fa2f5;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 7b889fc4..a33e6da5 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -175,7 +175,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 +187,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 +208,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 +297,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 +386,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