X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=c2358c3dd2366f56e1d7018c23fde7d474bb288d;hb=4b207544da78b182bd12e94eab01451694749012;hp=bf419cec07452ce674993085f99cc72acb2bce69;hpb=dab9e3607e7a6592fc3e316cc83ab17fcd09cb61;p=spider.git

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index bf419cec..c2358c3d 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -19,9 +19,9 @@
 # firstly and OO about ninthly (if you don't like the design and you can't 
 # improve it with better OO and thus make it smaller and more efficient, then tough). 
 #
-# Copyright (c) 1998-2000 - Dirk Koopman G1TLH
+# Copyright (c) 1998-2016 - 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,15 @@ $count = 0;
 		  wcyfilter => '5,WCY Filt-out',
 		  spotsfilter => '5,Spot Filt-out',
 		  routefilter => '5,Route Filt-out',
+		  rbnfilter => '5,RBN 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',
+		  inrbnfilter => '5,RBN Filt-inp',
+		  inpc92filter => '5,PC92 Route Filt-inp',
 		  passwd => '9,Passwd List,yesno',
 		  pingint => '5,Ping Interval ',
 		  nopings => '5,Ping Obs Count',
@@ -119,16 +123,16 @@ $count = 0;
 		  lastmsgpoll => '0,Last Msg Poll,atime',
 		  inscript => '9,In a script,yesno',
 		  handle_xml => '9,Handles XML,yesno',
-		  do_pc92 => '9,Handles PC92,yesno',
-		  send_pc92 => '9,Send PC92,atime',
+		  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',
+		  hostname => '0,Hostname',
+		  isslugged => '9,Still Slugged,yesno',
+		  sluggedpcs => '9,Slugged PCxx Queue,parray',
 		 );
 
-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
@@ -160,19 +164,21 @@ sub alloc
 		$user->new_buddies unless $user->buddies;
 		$self->{group} = $user->group;
 		$self->{sort} = $user->sort;
+		$self->{width} = $user->width;
 	}
-	$self->{startt} = $self->{t} = time;
+	$self->{startt} = $self->{t} = $main::systime;
 	$self->{state} = 0;
 	$self->{oldstate} = 0;
 	$self->{lang} = $main::lang if !$self->{lang};
 	$self->{func} = "";
+	$self->{width} ||=  80;
 
 	# add in all the dxcc, itu, zone info
 	my @dxcc = Prefix::extract($call);
 	if (@dxcc > 0) {
 		$self->{dxcc} = $dxcc[1]->dxcc;
 		$self->{itu} = $dxcc[1]->itu;
-		$self->{cq} = $dxcc[1]->cq;						
+		$self->{cq} = $dxcc[1]->cq;
 	}
 	$self->{inqueue} = [];
 
@@ -182,6 +188,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
 {
@@ -198,6 +220,7 @@ sub rec
 	if (defined $msg) {
 		push @{$self->{inqueue}}, $msg;
 	}
+	$self->process_one;
 }
 
 # obtain a channel object by callsign [$obj = DXChannel::get($call)]
@@ -226,6 +249,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
 {
@@ -272,69 +306,70 @@ sub del
 # is it a bbs
 sub is_bbs
 {
-	my $self = shift;
-	return $self->{'sort'} eq 'B';
+	return $_[0]->{sort} eq 'B';
 }
 
 sub is_node
 {
-	my $self = shift;
-	return $self->{'sort'} =~ /[ACRSXW]/;
+	return $_[0]->{sort} =~ /^[ACRSX]$/;
 }
 # is it an ak1a node ?
 sub is_ak1a
 {
-	my $self = shift;
-	return $self->{'sort'} eq 'A';
+	return $_[0]->{sort} eq 'A';
 }
 
 # is it a user?
 sub is_user
 {
-	my $self = shift;
-	return $self->{'sort'} eq 'U';
+	return $_[0]->{sort} =~ /^[UW]$/;
 }
 
 # is it a clx node
 sub is_clx
 {
-	my $self = shift;
-	return $self->{'sort'} eq 'C';
+	return $_[0]->{sort} eq 'C';
 }
 
-# it is Aranea
-sub is_aranea
+# it is a Web connected user
+sub is_web
 {
-	my $self = shift;
-	return $self->{'sort'} eq 'W';
+	return $_[0]->{sort} eq 'W';
 }
 
 # is it a spider node
 sub is_spider
 {
-	my $self = shift;
-	return $self->{'sort'} eq 'S';
+	return $_[0]->{sort} eq 'S';
 }
 
 # is it a DXNet node
 sub is_dxnet
 {
-	my $self = shift;
-	return $self->{'sort'} eq 'X';
+	return $_[0]->{sort} eq 'X';
 }
 
 # is it a ar-cluster node
 sub is_arcluster
 {
-	my $self = shift;
-	return $self->{'sort'} eq 'R';
+	return $_[0]->{sort} eq 'R';
+}
+
+sub is_rbn
+{
+	return $_[0]->{sort} eq 'N';
+}
+
+sub is_dslink
+{
+	return $_[0]->{sort} eq 'L';
 }
 
 # for perl 5.004's benefit
 sub sort
 {
 	my $self = shift;
-	return @_ ? $self->{'sort'} = shift : $self->{'sort'} ;
+	return @_ ? $self->{sort} = shift : $self->{sort} ;
 }
 
 # find out whether we are prepared to believe this callsign on this interface
@@ -473,8 +508,8 @@ sub disconnect
 	my $self = shift;
 	my $user = $self->{user};
 	
-	$user->close() if defined $user;
-	$self->{conn}->disconnect;
+	$user->close($self->{startt}, $self->{hostname}) if defined $user;
+	$self->{conn}->disconnect if $self->{conn};
 	$self->del();
 }
 
@@ -560,7 +595,7 @@ sub decode_input
 {
 	my $dxchan = shift;
 	my $data = shift;
-	my ($sort, $call, $line) = $data =~ /^([A-Z])([A-Z0-9\-]{3,9})\|(.*)$/;
+	my ($sort, $call, $line) = $data =~ /^([A-Z])(#?[A-Z0-9\/\-]{3,25})\|(.*)$/;
 
 	my $chcall = (ref $dxchan) ? $dxchan->call : "UN.KNOWN";
 	
@@ -579,28 +614,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
@@ -674,7 +687,7 @@ sub broadcast_list
 		
 		if ($sort eq 'dx') {
 		    next unless $dxchan->{dx};
-			($filter) = $dxchan->{spotsfilter}->it(@{$fref}) if ref $fref;
+			($filter) = $dxchan->{spotsfilter}->it($fref) if $dxchan->{spotsfilter} && ref $fref;
 			next unless $filter;
 		}
 		next if $sort eq 'ann' && !$dxchan->{ann} && $s !~ /^To\s+LOCAL\s+de\s+(?:$main::myalias|$main::mycall)/i;
@@ -692,43 +705,48 @@ sub broadcast_list
 	}
 }
 
-sub process
+sub process_one
 {
-	foreach my $dxchan (get_all()) {
-
-		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;
-			}
+	my $self = shift;
 
-			# handle A records
-			my $user = $dxchan->user;
-			if ($sort eq 'A' || $sort eq 'O') {
-				$dxchan->start($line, $sort);
-			} elsif ($sort eq 'I') {
-				die "\$user not defined for $call" if !defined $user;
+	while (my $data = shift @{$self->{inqueue}}) {
+		my ($sort, $call, $line) = $self->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');
+		
+		# handle A records
+		my $user = $self->user;
+		if ($sort eq 'I') {
+			die "\$user not defined for $call" unless defined $user;
 			
-				# normal input
-				$dxchan->normal($line);
-			} elsif ($sort eq 'Z') {
-				$dxchan->disconnect;
-			} elsif ($sort eq 'D') {
-				;				# ignored (an echo)
-			} elsif ($sort eq 'G') {
-				$dxchan->enhanced($line);
-			} else {
-				print STDERR atime, " Unknown command letter ($sort) received from $call\n";
-			}
+			# normal input
+			$self->normal($line);
+		} elsif ($sort eq 'G') {
+			$self->enhanced($line);
+		} elsif ($sort eq 'A' || $sort eq 'O' || $sort eq 'W') {
+			$self->start($line, $sort);
+		} elsif ($sort eq 'C') {
+			$self->width($line); # change number of columns
+		} elsif ($sort eq 'Z') {
+			$self->disconnect;
+		} elsif ($sort eq 'D') {
+			;				# ignored (an echo)
+		} else {
+			dbg atime . " DXChannel::process_one: Unknown command letter ($sort) received from $call\n";
 		}
 	}
 }
 
+sub process
+{
+	foreach my $dxchan (values %channels) {
+		next if $dxchan->{disconnecting};
+		$dxchan->process_one;
+	}
+}
+
 sub handle_xml
 {
 	my $self = shift;
@@ -742,6 +760,30 @@ 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);
+}
+
+
+sub isregistered
+{
+	my $self = shift;
+
+	# the sysop is registered!
+	return 1 if $self->{call} eq $main::myalias || $self->{call} eq $main::mycall;
+	
+	if ($main::reqreg) {
+		return $self->{registered};
+	} else {
+		return 1;
+	}
+}
+
 #no strict;
 sub AUTOLOAD
 {