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

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 7b889fc4..059a24a9 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;