X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=5ce5203ddf43c90edeedcaf9538446f3490d0bdf;hb=918827ec5a9023edeb2ce0140692566591af0af8;hp=51e8aed7b386cd9ced159f7ac8d1408e9bb6c019;hpb=30788e921ae7fb6ca54f043d21f154bfd884dcc6;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 51e8aed7..5ce5203d 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -89,6 +89,8 @@ sub already_conn
 	sleep(1);
 	dbg('chan', "-> Z $call bye\n");
 	$conn->send_now("Z$call|bye"); # this will cause 'client' to disconnect
+	sleep(1);
+	$conn->disconnect;
 }
 
 # handle incoming messages
@@ -109,7 +111,7 @@ sub rec
                 # is there one already connected to me ? 
 		my $user = DXUser->get($call);
 		if (DXChannel->get($call)) {
-		        my $mess = DXM::msg($lang, $user->sort eq 'A' ? 'concluster' : 'conother', $call);
+			my $mess = DXM::msg($lang, $user->sort eq 'A' ? 'concluster' : 'conother', $call);
 			already_conn($conn, $call, $mess);
 			return;
 		}
@@ -231,13 +233,15 @@ sub process_inqueue
 	my $data = $self->{data};
 	my $dxchan = $self->{dxchan};
 	my ($sort, $call, $line) = $data =~ /^(\w)([A-Z0-9\-]+)\|(.*)$/;
-
+	my $error;
+	
 	# 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;
+		++$error;
 #		dbg('chan', "<- $sort $call **CRAP**: $line");
 #		return;
 	}
@@ -251,10 +255,13 @@ sub process_inqueue
 		$dxchan->start($line, $sort);  
 	} elsif ($sort eq 'I') {
 		die "\$user not defined for $call" if !defined $user;
-		
-		# normal input
-		$dxchan->normal($line);
-		
+
+		if ($error) {
+			dbg('chan', "DROPPED with $error duff characters");
+		} else {
+			# normal input
+			$dxchan->normal($line);
+		}
 		disconnect($dxchan) if ($dxchan->{state} eq 'bye');
 	} elsif ($sort eq 'Z') {
 		disconnect($dxchan);