X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=829c6b55585bf0022e6f96c28a17be6d368d5798;hb=23d5848190b73200389fdfc2291e3453b3b91b15;hp=9ef0cec243671b78dafffd5ab306cb7c33cc3d4c;hpb=7b616aeabce92e3cb416a5fe6640a288adfe5410;p=spider.git

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 9ef0cec2..829c6b55 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -113,6 +113,7 @@ $count = 0;
 		  version => '1,Node Version',
 		  build => '1,Node Build',
 		  verified => '9,Verified?,yesno',
+		  newroute => '1,New Style Routing,yesno',
 		 );
 
 use vars qw($VERSION $BRANCH);
@@ -302,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
@@ -426,6 +436,7 @@ sub disconnect
 	my $self = shift;
 	my $user = $self->{user};
 	
+	main::clean_inqueue($self);          # clear out any remaining incoming frames
 	$user->close() if defined $user;
 	$self->{conn}->disconnect;
 	$self->del();
@@ -513,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;
@@ -522,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;
@@ -636,7 +647,7 @@ sub AUTOLOAD
 	# this clever line of code creates a subroutine which takes over from autoload
 	# from OO Perl - Conway
 	*$AUTOLOAD = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}};
-        goto &$AUTOLOAD;
+	goto &$AUTOLOAD;
 }