projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make sure nodes only get 1 copy of an announce
[spider.git]
/
perl
/
DXProt.pm
diff --git
a/perl/DXProt.pm
b/perl/DXProt.pm
index c7e2abdbe44ef671be8ae3a80244338c7c045746..741e4b3342ec9415d9d5e08d1c9d4f0f5f8cf78e 100644
(file)
--- a/
perl/DXProt.pm
+++ b/
perl/DXProt.pm
@@
-291,13
+291,11
@@
sub normal
my $wwv = Geomag::update($main::systime, $hour, $sfi, $a, $k, "R=$r, Next K=$next$alarm", $decode_dk0wcy, $field[5], $r);
}
my $wwv = Geomag::update($main::systime, $hour, $sfi, $a, $k, "R=$r, Next K=$next$alarm", $decode_dk0wcy, $field[5], $r);
}
- return if $field[2] eq $main::mycall; # it's routed to me
} else {
route($field[2], $line);
} else {
route($field[2], $line);
- return; # only on a routed one
}
}
-
last SWITCH
;
+
return
;
}
if ($pcno == 13) {
}
if ($pcno == 13) {
@@
-911,9
+909,9
@@
sub send_announce
if ($dxchan->{annfilter}) {
($filter, $hops) = Filter::it($dxchan->{annfilter}, @_, $self->{call} );
if ($dxchan->{annfilter}) {
($filter, $hops) = Filter::it($dxchan->{annfilter}, @_, $self->{call} );
-
return
unless $filter;
+
next
unless $filter;
}
}
- if ($dxchan->is_ak1a
) {
+ if ($dxchan->is_ak1a
&& $field[1] ne $main::mycall) { # i.e not specifically routed to me
next if $dxchan == $self;
if ($hops) {
$routeit = $line;
next if $dxchan == $self;
if ($hops) {
$routeit = $line;