X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=99c2ef82a674362f5c1aa34df27d165553c34efa;hb=bf5eb90cfb12c5070db6726af98d1d464bdb4ea3;hp=3767145ca4277463ca60fe172db9b695f57b8320;hpb=877fab7416e9545aeae5b9880246262bc92be650;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 3767145c..99c2ef82 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -651,23 +651,23 @@ sub normal if ($r) { my $ar; if ($call ne $parent->call) { - $ar = $parent->add($r); - push @rout, $ar if $ar; + if ($self->in_filter_route($r)) { + $ar = $parent->add($call, $ver, $flags); + push @rout, $ar if $ar; + } } if ($r->version ne $ver || $r->flags != $flags) { $r->version($ver); - $r->flags(Route::here($here)|Route::conf($conf)); + $r->flags($flags); push @rout, $r unless $ar; } } else { next if $call eq $main::mycall || $call eq $self->{call}; - my $new = $parent->new($call, $ver, Route::here($here)|Route::conf($conf)); + my $new = Route->new($call); # throw away if ($self->in_filter_route($new)) { - $parent->add($new); - push @rout, $new; - } else { - $new->del($parent); + my $r = $parent->add($call, $ver, $flags); + push @rout, $r; } } @@ -1792,7 +1792,7 @@ sub broadcast_route foreach $dxchan (@dxchan) { next if $dxchan == $self; next if $dxchan == $me; - if ($self->{routefilter} || !$self->{isolate}) { + if ($dxchan->{routefilter} || !$self->{isolate}) { $dxchan->send_route($generate, @_) } else { dbg('DXPROT: isolated') if isdbg('chanerr');