use Msg;
use DXM;
use DXUtil;
+use DXVars;
use DXDebug;
use Filter;
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',
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};
}
$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;
}
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);
}