X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=a000e17ac4657159c5a212514cf9c31a1320a53f;hb=4b94818ce60ca5727ceb77b0b5d752d5f5324680;hp=b8824cf4d43923290e35ac16f1e58c189bae5790;hpb=57a2e501a50d48dcb8915a05b90d0e8e948c999d;p=spider.git

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index b8824cf4..a000e17a 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',
@@ -119,14 +121,13 @@ $count = 0;
 		  lastmsgpoll => '0,Last Msg Poll,atime',
 		  inscript => '9,In a script,yesno',
 		  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',
 		 );
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+$maxerrors = 20;				# the maximum number of concurrent errors allowed before disconnection
 
 # object destruction
 sub DESTROY
@@ -180,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
 {
@@ -224,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
 {
@@ -472,7 +500,7 @@ sub disconnect
 	my $user = $self->{user};
 	
 	$user->close() if defined $user;
-	$self->{conn}->disconnect;
+	$self->{conn}->disconnect if $self->{conn};
 	$self->del();
 }
 
@@ -577,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
@@ -693,17 +699,14 @@ sub broadcast_list
 sub process
 {
 	foreach my $dxchan (get_all()) {
-
+		next if $dxchan->{disconnecting};
+		
 		while (my $data = shift @{$dxchan->{inqueue}}) {
 			my ($sort, $call, $line) = $dxchan->decode_input($data);
 			next unless defined $sort;
 
 			# do the really sexy console interface bit! (Who is going to do the TK interface then?)
 			dbg("<- $sort $call $line") if $sort ne 'D' && isdbg('chan');
-			if ($dxchan->{disconnecting}) {
-				dbg('In disconnection, ignored');
-				next;
-			}
 
 			# handle A records
 			my $user = $dxchan->user;
@@ -740,6 +743,16 @@ sub handle_xml
 	return $r;
 }
 
+sub error_handler
+{
+	my $self = shift;
+	my $error = shift || '';
+	dbg("$self->{call} ERROR '$error', closing") if isdbg('chan');
+	$self->{conn}->set_error(undef) if exists $self->{conn};
+	$self->disconnect(1);
+}
+
+
 #no strict;
 sub AUTOLOAD
 {