X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=3014e24fd7cf45bb4e6e3af622de45f4f1b50720;hb=ae8b40244a552256fd35720e40b4ef0e14df55f1;hp=e38e697fd17dfedff5a8c3ba274c143d822a1c38;hpb=0a6cbd253403c416abea676d1bc5fa581caeb354;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index e38e697f..3014e24f 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -107,13 +107,14 @@ sub rec
 		my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
 
                 # is there one already connected to me ? 
-		if ($dxchan = DXChannel->get($call)) {
-			disconnect($dxchan);
-			sleep(1);
-	        }
+		my $user = DXUser->get($call);
+		if (DXChannel->get($call)) {
+		        my $mess = DXM::msg($lang, $user->sort eq 'A' ? 'concluster' : 'conother', $call);
+			already_conn($conn, $call, $mess);
+			return;
+		}
 		
 		# is there one already connected elsewhere in the cluster (and not a cluster)
-		my $user = DXUser->get($call);
 		if ($user) {
 			if (($user->sort eq 'A' || $call eq $myalias) && !DXCluster->get_exact($call)) {
 				;
@@ -213,10 +214,20 @@ sub process_inqueue
 	my $data = $self->{data};
 	my $dxchan = $self->{dxchan};
 	my ($sort, $call, $line) = $data =~ /^(\w)(\S+)\|(.*)$/;
+
+	# the above regexp must work
+	return unless ($sort && $call && $line);
+	
+	# translate any crappy characters into hex characters 
+	if ($line =~ /[\x00-\x06\x08\x0a-\x1f\x7f-\xff]/o) {
+		$line =~ s/([\x00-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
+#		dbg('chan', "<- $sort $call **CRAP**: $line");
+#		return;
+	}
 	
 	# do the really sexy console interface bit! (Who is going to do the TK interface then?)
 	dbg('chan', "<- $sort $call $line\n") unless $sort eq 'D';
-	
+
 	# handle A records
 	my $user = $dxchan->user;
 	if ($sort eq 'A' || $sort eq 'O') {