# This is the base class for all channel operations, which is everything to do
# with input and output really.
#
-# The instance variable in the outside world will be generally be called $dxchann
+# The instance variable in the outside world will be generally be called $dxchan
#
# This class is 'inherited' (if that is the goobledegook for what I am doing)
# by various other modules. The point to understand is that the 'instance variable'
use Msg;
use DXM;
use DXUtil;
+use DXVars;
use DXDebug;
use Filter;
use strict;
-use vars qw(%channels %valid);
+use vars qw(%channels %valid @ISA);
%channels = ();
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',
logininfo => '9,Login info req,yesno',
talklist => '0,Talk List,parray',
cluster => '5,Cluster data',
+ isbasic => '9,Internal Connection',
);
# object destruction
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};
}
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");
+ unless (defined $sort && defined $call && defined $line) {
+# $data =~ s/([\x00-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
+ 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);
}