X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=779139fc3a5c5b20b8869103e0271d2c82f18b18;hb=dc016a0633cdb15d29b9a71fdec2c230fbad201b;hp=17f34919e7eb970f4eef85a2cc893e3dd95469d2;hpb=29ec5bb85c591182dd868e7a3d87f510d7b47e9b;p=spider.git

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 17f34919..779139fc 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -17,9 +17,9 @@
 #
 # PLEASE NOTE - I am a C programmer using this as a method of learning perl
 # firstly and OO about ninthly (if you don't like the design and you can't 
-# improve it with better OO by make it smaller and more efficient, then tough). 
+# improve it with better OO and thus make it smaller and more efficient, then tough). 
 #
-# Copyright (c) 1998 - Dirk Koopman G1TLH
+# Copyright (c) 1998-2000 - Dirk Koopman G1TLH
 #
 # $Id$
 #
@@ -28,6 +28,7 @@ package DXChannel;
 use Msg;
 use DXM;
 use DXUtil;
+use DXVars;
 use DXDebug;
 use Filter;
 
@@ -74,11 +75,11 @@ use vars qw(%channels %valid);
 		  annfilter => '5,Announce Filter',
 		  wwvfilter => '5,WWV Filter',
 		  wcyfilter => '5,WCY Filter',
-		  spotfilter => '5,Spot Filter',
+		  spotsfilter => '5,Spot Filter',
 		  inannfilter => '5,Input Ann Filter',
 		  inwwvfilter => '5,Input WWV Filter',
 		  inwcyfilter => '5,Input WCY Filter',
-		  inspotfilter => '5,Input Spot Filter',
+		  inspotsfilter => '5,Input Spot Filter',
 		  passwd => '9,Passwd List,parray',
 		  pingint => '5,Ping Interval ',
 		  nopings => '5,Ping Obs Count',
@@ -87,7 +88,8 @@ use vars qw(%channels %valid);
 		  pingave => '0,Ping ave time',
 		  logininfo => '9,Login info req,yesno',
 		  talklist => '0,Talk List,parray',
-		  node => '5,Node data',
+		  cluster => '5,Cluster data',
+		  isbasic => '9,Internal Connection', 
 		 );
 
 # object destruction
@@ -102,10 +104,10 @@ sub DESTROY
 	undef $self->{delayed};
 	undef $self->{annfilter};
 	undef $self->{wwvfilter};
-	undef $self->{spotfilter};
+	undef $self->{spotsfilter};
 	undef $self->{inannfilter};
 	undef $self->{inwwvfilter};
-	undef $self->{inspotfilter};
+	undef $self->{inspotsfilter};
 	undef $self->{passwd};
 	undef $self->{node};
 }
@@ -133,12 +135,6 @@ sub alloc
 	$self->{lang} = $main::lang if !$self->{lang};
 	$self->{func} = "";
 
-	# get the filters
-	$self->{spotfilter} = Filter::read_in('spots', $call, 0);
-	$self->{wwvfilter} = Filter::read_in('wwv', $call, 0);
-	$self->{wcyfilter} = Filter::read_in('wcy', $call, 0);
-	$self->{annfilter} = Filter::read_in('ann', $call, 0);
-
 	bless $self, $pkg; 
 	return $channels{$call} = $self;
 }
@@ -446,12 +442,16 @@ sub decode_input
 	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)) {
+	unless (defined $sort && defined $call && defined $line) {
 		$data =~ s/([\x00-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
-		dbg('chan', "DUFF Line from $chcall: $data");
+		dbg('err', "DUFF Line on $chcall: $data");
 		return ();
 	}
+
+	if(ref($dxchan) && $call ne $chcall) {
+		dbg('err', "DUFF Line come in for $call on wrong channel $chcall" );
+		return();
+	}
 	
 	return ($sort, $call, $line);
 }