X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=4da018b0bfd25b8d6b2d55e407288a923acffc62;hb=ebfada6519f99c7489d0c0709d37eab4c2354ddf;hp=5d6248efa296ab372364f9ddb684e3de8c3c2149;hpb=502f900651a46b96008028945616a3b610d6cc7a;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 5d6248ef..4da018b0 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -71,7 +71,7 @@ package main;
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$version = "1.41";				# the version no of the software
+$version = "1.42";				# the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 $lockfn = "cluster.lock";       # lock file name
 @outstanding_connects = ();     # list of outstanding connects
@@ -120,7 +120,8 @@ sub rec
 	
 	# set up the basic channel info - this needs a bit more thought - there is duplication here
 	if (!defined $dxchan) {
-		my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
+		my ($sort, $call, $line) = DXChannel::decode_input(0, $msg);
+		return unless defined $sort;
  
 		# is there one already connected to me - locally? 
 		my $user = DXUser->get($call);
@@ -246,17 +247,15 @@ sub process_inqueue
 	
 	my $data = $self->{data};
 	my $dxchan = $self->{dxchan};
-	my ($sort, $call, $line) = $data =~ /^(\w)([^\|]+)\|(.*)$/;
 	my $error;
-	
-	# the above regexp must work
-	return unless ($sort && $call && $line);
+	my ($sort, $call, $line) = DXChannel::decode_input($dxchan, $data);
+	return unless defined $sort;
 	
 	# 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;
 	}
-	
+
 	# 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';