X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=958fe61860b3cb69122df0101fe8741c6afcc805;hb=refs%2Fheads%2Fip_address;hp=e386d0849e2b5330c53a8727d1511d0eb065640f;hpb=7b9256ceade8b18b48f848c9ac659c2de7322b0b;p=spider.git

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index e386d084..958fe618 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -21,7 +21,7 @@
 #
 # Copyright (c) 1998-2000 - Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 package DXChannel;
 
@@ -35,7 +35,7 @@ use Prefix;
 use Route;
 
 use strict;
-use vars qw(%channels %valid @ISA $count);
+use vars qw(%channels %valid @ISA $count $maxerrors);
 
 %channels = ();
 $count = 0;
@@ -80,11 +80,13 @@ $count = 0;
 		  wcyfilter => '5,WCY Filt-out',
 		  spotsfilter => '5,Spot Filt-out',
 		  routefilter => '5,Route Filt-out',
+		  pc92filter => '5,PC92 Route Filt-out',
 		  inannfilter => '5,Ann Filt-inp',
 		  inwwvfilter => '5,WWV Filt-inp',
 		  inwcyfilter => '5,WCY Filt-inp',
 		  inspotsfilter => '5,Spot Filt-inp',
 		  inroutefilter => '5,Route Filt-inp',
+		  inpc92filter => '5,PC92 Route Filt-inp',
 		  passwd => '9,Passwd List,yesno',
 		  pingint => '5,Ping Interval ',
 		  nopings => '5,Ping Obs Count',
@@ -121,8 +123,11 @@ $count = 0;
 		  handle_xml => '9,Handles XML,yesno',
 		  do_pc9x => '9,Handles PC9x,yesno',
 		  inqueue => '9,Input Queue,parray',
+		  next_pc92_update => '9,Next PC92 Update,atime',
+		  next_pc92_keepalive => '9,Next PC92 KeepAlive,atime',
 		 );
 
+$maxerrors = 20;				# the maximum number of concurrent errors allowed before disconnection
 
 # object destruction
 sub DESTROY
@@ -176,6 +181,22 @@ sub alloc
 	return $channels{$call} = $self;
 }
 
+# count errors and disconnect if too many
+# this has to be here because it can come from rcmd (DXProt) as
+# well as DXCommandmode.
+sub _error_out
+{
+	my $self = shift;
+	my $e = shift;
+	if (++$self->{errors} > $maxerrors) {
+		$self->send($self->msg('e26'));
+		$self->disconnect;
+		return ();
+	} else {
+		return ($self->msg($e));
+	}
+}
+
 # rebless this channel as something else
 sub rebless
 {
@@ -220,6 +241,17 @@ sub get_all_nodes
 	return @out;
 }
 
+# return a list of node calls
+sub get_all_node_calls
+{
+	my $ref;
+	my @out;
+	foreach $ref (values %channels) {
+		push @out, $ref->{call} if $ref->is_node;
+	}
+	return @out;
+}
+
 # return a list of all users
 sub get_all_users
 {
@@ -573,28 +605,6 @@ sub decode_input
 	return ($sort, $call, $line);
 }
 
-sub rspfcheck
-{
-	my ($self, $flag, $node, $user) = @_;
-	my $nref = Route::Node::get($node);
-	my $dxchan = $nref->dxchan 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('chanerr');
-		} else {
-			dbg("RSPF: Shortest path for $node is " . $nref->dxchan->{call}) if isdbg('chanerr');
-		}
-	} else {
-		return 1 if $flag;
-		dbg("RSPF: required $node not found" ) if isdbg('chanerr');
-	}
-	return 0;
-}
-
 # broadcast a message to all clusters taking into account isolation
 # [except those mentioned after buffer]
 sub broadcast_nodes