projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tidy the isolate code up a bit
[spider.git]
/
perl
/
DXProt.pm
diff --git
a/perl/DXProt.pm
b/perl/DXProt.pm
index 88433b5726985a04dc17ed47163c270d272a125c..2e43068a6951c7f42517c98a5170b57bd76fba68 100644
(file)
--- a/
perl/DXProt.pm
+++ b/
perl/DXProt.pm
@@
-1145,7
+1145,7
@@
sub dx_spot
($filter, $hops) = $self->{spotsfilter}->it(@_);
return unless $filter;
}
($filter, $hops) = $self->{spotsfilter}->it(@_);
return unless $filter;
}
- send_prot_line($self, $filter, $hops, $isolate, $line)
+ send_prot_line($self, $filter, $hops, $isolate, $line)
;
}
sub send_prot_line
}
sub send_prot_line
@@
-1161,7
+1161,7
@@
sub send_prot_line
return unless $routeit;
}
if ($filter) {
return unless $routeit;
}
if ($filter) {
- $self->send($routeit)
if $routeit
;
+ $self->send($routeit);
} else {
$self->send($routeit) unless $self->{isolate} || $isolate;
}
} else {
$self->send($routeit) unless $self->{isolate} || $isolate;
}
@@
-1754,7
+1754,7
@@
sub send_route
$routeit = adjust_hops($self, $line); # adjust its hop count by node name
next unless $routeit;
}
$routeit = adjust_hops($self, $line); # adjust its hop count by node name
next unless $routeit;
}
- $self->send($routeit)
if $self->{routefilter} || !$self->{isolate}
;
+ $self->send($routeit);
}
}
}
}
}
}
@@
-1770,10
+1770,10
@@
sub broadcast_route
foreach $dxchan (@dxchan) {
next if $dxchan == $self;
next if $dxchan == $me;
foreach $dxchan (@dxchan) {
next if $dxchan == $self;
next if $dxchan == $me;
- if ($dxchan->{routefilter}
|| !$self->{isolate}
) {
- $dxchan->send_route($generate, @_)
+ if ($dxchan->{routefilter}) {
+ $dxchan->send_route($generate, @_)
;
} else {
} else {
-
dbg('DXPROT: isolated') if isdbg('chanerr')
;
+
$dxchan->send_route($generate, @_) unless $self->{isolate} || $dxchan->{isolate}
;
}
}
}
}
}
}