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

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 01d2135e..829c6b55 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -85,7 +85,7 @@ $count = 0;
 		  inwcyfilter => '5,WCY Filt-inp',
 		  inspotsfilter => '5,Spot Filt-inp',
 		  inroutefilter => '5,Route Filt-inp',
-		  passwd => '9,Passwd List,parray',
+		  passwd => '9,Passwd List,yesno',
 		  pingint => '5,Ping Interval ',
 		  nopings => '5,Ping Obs Count',
 		  lastping => '5,Ping last sent,atime',
@@ -106,11 +106,19 @@ $count = 0;
 		  disconnecting => '9,Disconnecting,yesno',
 		  ann_talk => '0,Suppress Talk Anns,yesno',
 		  metric => '1,Route metric',
+		  badcount => '1,Bad Word Count',
+		  edit => '7,Edit Function',
+		  registered => '9,Registered?,yesno',
+		  prompt => '0,Required Prompt',
+		  version => '1,Node Version',
+		  build => '1,Node Build',
+		  verified => '9,Verified?,yesno',
+		  newroute => '1,New Style Routing,yesno',
 		 );
 
 use vars qw($VERSION $BRANCH);
 $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -295,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
@@ -419,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();
@@ -490,12 +508,12 @@ sub decode_input
 	# the above regexp must work
 	unless (defined $sort && defined $call && defined $line) {
 #		$data =~ s/([\x00-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
-		dbg("DUFF Line on $chcall: $data") if isdbg('err');
+		dbg("DUFF Line on $chcall: $data");
 		return ();
 	}
 
 	if(ref($dxchan) && $call ne $chcall) {
-		dbg("DUFF Line come in for $call on wrong channel $chcall") if isdbg('err');
+		dbg("DUFF Line come in for $call on wrong channel $chcall");
 		return();
 	}
 	
@@ -506,18 +524,20 @@ sub rspfcheck
 {
 	my ($self, $flag, $node, $user) = @_;
 	my $nref = Route::Node::get($node);
-	if ($nref) {
-	    if ($nref->dxchan == $self) {
+	my $dxchan = $nref->bestdxchan if $nref;
+	if ($nref && $dxchan) {
+	    if ($dxchan == $self) {
 			return 1 unless $user;
+			return 1 if $user eq $node;
 			my @users = $nref->users;
 			return 1 if @users == 0 || grep $user eq $_, @users;
-			dbg("RSPF: $user not on $node") if isdbg('rspf');
+			dbg("RSPF: $user not on $node") if isdbg('chanerr');
 		} else {
-			dbg("RSPF: Shortest path for $node is " . $nref->dxchan->{call}) if isdbg('rspf');
+			dbg("RSPF: Shortest path for $node is " . $nref->bestdxchan->{call}) if isdbg('chanerr');
 		}
 	} else {
 		return 1 if $flag;
-		dbg("RSPF: required $node not found" ) if isdbg('rspf');
+		dbg("RSPF: required $node not found" ) if isdbg('chanerr');
 	}
 	return 0;
 }
@@ -544,7 +564,7 @@ sub broadcast_nodes
 
 # broadcast a message to all clusters ignoring isolation
 # [except those mentioned after buffer]
-sub broadcast_all_ak1a
+sub broadcast_all_nodes
 {
 	my $s = shift;				# the line to be rebroadcast
 	my @except = @_;			# to all channels EXCEPT these (dxchannel refs)
@@ -614,20 +634,20 @@ sub broadcast_list
 }
 
 
-no strict;
+#no strict;
 sub AUTOLOAD
 {
-	my $self = shift;
+	no strict;
 	my $name = $AUTOLOAD;
 	return if $name =~ /::DESTROY$/;
-	$name =~ s/.*:://o;
+	$name =~ s/^.*:://o;
   
 	confess "Non-existant field '$AUTOLOAD'" if !$valid{$name};
 
 	# 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}} ;
-    @_ ? $self->{$name} = shift : $self->{$name} ;
+	*$AUTOLOAD = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}};
+	goto &$AUTOLOAD;
 }