X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FThingy%2FDx.pm;h=b711a256aefa0cbff5e6fd509b3d89395425b2d6;hb=7d72afb65bc994c04c208095b66abddee41de7e9;hp=9b7a181becf7da0cfceece21e28600f1c0935ee9;hpb=5b3c2c5e342c23fbab96b7573c5963344617878f;p=spider.git diff --git a/perl/Thingy/Dx.pm b/perl/Thingy/Dx.pm index 9b7a181b..b711a256 100644 --- a/perl/Thingy/Dx.pm +++ b/perl/Thingy/Dx.pm @@ -86,7 +86,7 @@ sub gen_DXCommandmode if ($dxchan->{ve7cc}) { $buf = VE7CC::dx_spot($dxchan, $thing->{spotdata}); } else { - $buf = $dxchan->format_dx_spot($thing->{spotdata}); + $buf = Spot::format_dx_spot($dxchan, $thing->{spotdata}); $buf .= "\a\a" if $dxchan->{beep}; $buf =~ s/\%5E/^/g; } @@ -143,10 +143,10 @@ sub out_filter my $dxchan = shift; # global spot filtering on INPUT - if ($dxchan->{inspotsfilter}) { - my ($filter, $hops) = $dxchan->{inspotsfilter}->it($thing->{spotdata}); + if ($dxchan->{spotsfilter}) { + my ($filter, $hops) = $dxchan->{spotsfilter}->it($thing->{spotdata}); unless ($filter) { - dbg("PCPROT: Rejected by input spot filter") if isdbg('chanerr'); + dbg("PCPROT: Rejected by output spot filter") if isdbg('chanerr'); return; } $thing->{hops} = $hops if $hops;