X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=059a24a929997f5ca5c8cb150490803d823b605d;hb=e1d5c2a325cb6b8674eab55c23f12445aae01f52;hp=46f4818325af00ef5945e48ac2027e58dbef3877;hpb=8081646e932b160975ad061a7a2741418b099761;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 46f48183..059a24a9 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -130,7 +130,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 +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,12 +187,15 @@ sub new_channel
 
 	# (fairly) politely disconnect people that are connected to too many other places at once
 	my $r = Route::get($call);
-	if ($r) {
+	if ($conn->{sort} && $conn->{sort} =~ /^I/ && $r && $user) {
 		my @n = $r->parents;
-		my $v = $r->isa('Route::Node') ? $maxconnect_node : $maxconnect_user;
+		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");
+			LogDbg('DXCommand', "$call has too many connections ($v) at $nodes - disconnected");
 			already_conn($conn, $call, DXM::msg($lang, 'contomany', $call, $v, $nodes));
 			return;
 		}
@@ -205,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;
@@ -402,6 +405,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);