allow - in filters

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index bc27c417c8df7f85b5e5c15e582e0a507fb8f5d7..f429c7ce93196e09ede58025bdb7b8b5b2808d2a 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -1231,7 +1231,7 @@ sub send_wcy_spot
                         ($filter, $hops) = $dxchan->{wcyfilter}->it(@_, $self->{call} );
                         next unless $filter;
                }
-               if ($dxchan->is_clx || $dxchan->is_spider) {
+               if ($dxchan->is_clx || $dxchan->is_spider || $dxchan->is_dxnet) {
                        next if $dxchan == $self;
                        if ($hops) {
                                $routeit = $line;
@@ -1291,13 +1291,13 @@ sub send_announce
 
                if ($dxchan->{annfilter}) {
                        my ($ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
-                       my @dxcc = Prefix::extract($_[1]);
+                       my @dxcc = Prefix::extract($_[0]);
                        if (@dxcc > 0) {
                                $ann_dxcc = $dxcc[1]->dxcc;
                                $ann_itu = $dxcc[1]->itu;
                                $ann_cq = $dxcc[1]->cq;                                         
                        }
-                       @dxcc = Prefix::extract($_[5]);
+                       @dxcc = Prefix::extract($_[4]);
                        if (@dxcc > 0) {
                                $org_dxcc = $dxcc[1]->dxcc;
                                $org_itu = $dxcc[1]->itu;