X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=8b71dbff499d7946a83378b2938f6c54f6ea41c4;hb=e90334372dd94c9deca9855be9ac7527a0da7870;hp=3637b7626885a6ec63e20720c8b3008ba03ba270;hpb=502f900651a46b96008028945616a3b610d6cc7a;p=spider.git

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 3637b762..8b71dbff 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -86,6 +86,7 @@ use vars qw(%channels %valid);
 		  pingtime => '5,Ping totaltime,parray',
 		  pingave => '0,Ping ave time',
 		  logininfo => '9,Login info req,yesno',
+		  talklist => '0,Talk List,parray',
 		 );
 
 # object destruction
@@ -361,7 +362,7 @@ sub state
 		dbg('state', "$self->{call} channel func $self->{func} state $self->{oldstate} -> $self->{state}\n");
 
 		# if there is any queued up broadcasts then splurge them out here
-		if ($self->{delayed} && ($self->{state} eq 'prompt' || $self->{state} eq 'convers')) {
+		if ($self->{delayed} && ($self->{state} eq 'prompt' || $self->{state} eq 'talk')) {
 			$self->send (@{$self->{delayed}});
 			delete $self->{delayed};
 		}
@@ -436,6 +437,26 @@ sub field_prompt
 	return $valid{$ele};
 }
 
+# take a standard input message and decode it into its standard parts
+sub decode_input
+{
+	my $dxchan = shift;
+	my $data = shift;
+	my ($sort, $call, $line) = $data =~ /^([A-Z])([A-Z0-9\-]{3,9})\|(.*)$/;
+
+	my $chcall = (ref $dxchan) ? $dxchan->call : "UN.KNOWN";
+	
+	# the above regexp must work
+	if (!defined $sort || !defined $call || !defined  $line ||
+		   (ref $dxchan && $call ne $chcall)) {
+		$data =~ s/([\x00-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
+		dbg('chan', "DUFF Line from $chcall: $data");
+		return ();
+	}
+	
+	return ($sort, $call, $line);
+}
+
 no strict;
 sub AUTOLOAD
 {