X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=829c6b55585bf0022e6f96c28a17be6d368d5798;hb=07f2e6cff3523ababee9c42008568cb469befe9d;hp=3ae6afd601dd54bc8a1930223affabf4b31bf391;hpb=598233c22daef138cd7b0a653d3165b4a16905e2;p=spider.git diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm index 3ae6afd6..829c6b55 100644 --- a/perl/DXChannel.pm +++ b/perl/DXChannel.pm @@ -303,6 +303,15 @@ sub sort return @_ ? $self->{'sort'} = shift : $self->{'sort'} ; } +# find out whether we are prepared to believe this callsign on this interface +sub is_believed +{ + my $self = shift; + my $call = shift; + + return grep $call eq $_, $self->user->believe; +} + # handle out going messages, immediately without waiting for the select to drop # this could, in theory, block sub send_now @@ -515,7 +524,7 @@ sub rspfcheck { my ($self, $flag, $node, $user) = @_; my $nref = Route::Node::get($node); - my $dxchan = $nref->dxchan if $nref; + my $dxchan = $nref->bestdxchan if $nref; if ($nref && $dxchan) { if ($dxchan == $self) { return 1 unless $user; @@ -524,7 +533,7 @@ sub rspfcheck return 1 if @users == 0 || grep $user eq $_, @users; dbg("RSPF: $user not on $node") if isdbg('chanerr'); } else { - dbg("RSPF: Shortest path for $node is " . $nref->dxchan->{call}) if isdbg('chanerr'); + dbg("RSPF: Shortest path for $node is " . $nref->bestdxchan->{call}) if isdbg('chanerr'); } } else { return 1 if $flag;