X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=958fe61860b3cb69122df0101fe8741c6afcc805;hb=a48eea32af123b571889f70a3e7cef8e157cf389;hp=61e6a5d3e9dd31dd2ac094d7e34ce168c8248256;hpb=c87553a14286b31db30d28decb1c0d5c8327e443;p=spider.git

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 61e6a5d3..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,12 +80,14 @@ $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',
-		  passwd => '9,Passwd List,parray',
+		  inpc92filter => '5,PC92 Route Filt-inp',
+		  passwd => '9,Passwd List,yesno',
 		  pingint => '5,Ping Interval ',
 		  nopings => '5,Ping Obs Count',
 		  lastping => '5,Ping last sent,atime',
@@ -101,17 +103,31 @@ $count = 0;
 		  itu => '0,ITU Zone',
 		  cq => '0,CQ Zone',
 		  enhanced => '5,Enhanced Client,yesno',
+		  gtk => '5,Using GTK,yesno',
 		  senddbg => '8,Sending Debug,yesno',
 		  width => '0,Column Width',
 		  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',
+		  ve7cc => '0,VE7CC program special,yesno',
+		  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;
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+$maxerrors = 20;				# the maximum number of concurrent errors allowed before disconnection
 
 # object destruction
 sub DESTROY
@@ -139,7 +155,8 @@ sub alloc
 	if (defined $user) {
 		$self->{user} = $user;
 		$self->{lang} = $user->lang;
-		$user->new_group() if !$user->group;
+		$user->new_group unless $user->group;
+		$user->new_buddies unless $user->buddies;
 		$self->{group} = $user->group;
 		$self->{sort} = $user->sort;
 	}
@@ -156,6 +173,7 @@ sub alloc
 		$self->{itu} = $dxcc[1]->itu;
 		$self->{cq} = $dxcc[1]->cq;						
 	}
+	$self->{inqueue} = [];
 
 	$count++;
 	dbg("DXChannel $self->{call} created ($count)") if isdbg('chan');
@@ -163,17 +181,50 @@ sub alloc
 	return $channels{$call} = $self;
 }
 
-# obtain a channel object by callsign [$obj = DXChannel->get($call)]
+# 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
+{
+	my $self = shift;
+	my $class = shift;
+	return $channels{$self->{call}} = bless $self, $class;
+}
+
+sub rec	
+{
+	my ($self, $msg) = @_;
+	
+	# queue the message and the channel object for later processing
+	if (defined $msg) {
+		push @{$self->{inqueue}}, $msg;
+	}
+}
+
+# obtain a channel object by callsign [$obj = DXChannel::get($call)]
 sub get
 {
-	my ($pkg, $call) = @_;
+	my $call = shift;
 	return $channels{$call};
 }
 
 # obtain all the channel objects
 sub get_all
 {
-	my ($pkg) = @_;
 	return values(%channels);
 }
 
@@ -190,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
 {
@@ -243,7 +305,7 @@ sub is_bbs
 sub is_node
 {
 	my $self = shift;
-	return $self->{'sort'} =~ /[ACRSX]/;
+	return $self->{'sort'} =~ /[ACRSXW]/;
 }
 # is it an ak1a node ?
 sub is_ak1a
@@ -266,6 +328,13 @@ sub is_clx
 	return $self->{'sort'} eq 'C';
 }
 
+# it is Aranea
+sub is_aranea
+{
+	my $self = shift;
+	return $self->{'sort'} eq 'W';
+}
+
 # is it a spider node
 sub is_spider
 {
@@ -294,6 +363,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
@@ -309,7 +387,8 @@ sub send_now
         my @lines = split /\n/;
 		for (@lines) {
 			$conn->send_now("$sort$call|$_");
-			dbg("-> $sort $call $_") if isdbg('chan');
+			# debug log it, but not if it is a log message
+			dbg("-> $sort $call $_") if $sort ne 'L' && isdbg('chan');
 		}
 	}
 	$self->{t} = time;
@@ -332,7 +411,8 @@ sub send_later
         my @lines = split /\n/;
 		for (@lines) {
 			$conn->send_later("$sort$call|$_");
-			dbg("-> $sort $call $_") if isdbg('chan');
+			# debug log it, but not if it is a log message
+			dbg("-> $sort $call $_") if $sort ne 'L' && isdbg('chan');
 		}
 	}
 	$self->{t} = time;
@@ -348,15 +428,16 @@ sub send						# this is always later and always data
 	return unless $conn;
 	my $call = $self->{call};
 
-	for (@_) {
-#		chomp;
-        my @lines = split /\n/;
-		for (@lines) {
-			$conn->send_later("D$call|$_");
-			dbg("-> D $call $_") if isdbg('chan');
+	foreach my $l (@_) {
+		for (ref $l ? @$l : $l) {
+			my @lines = split /\n/;
+			for (@lines) {
+				$conn->send_later("D$call|$_");
+				dbg("-> D $call $_") if isdbg('chan');
+			}
 		}
 	}
-	$self->{t} = time;
+	$self->{t} = $main::systime;
 }
 
 # send a file (always later)
@@ -419,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();
 }
 
@@ -444,7 +525,30 @@ sub closeall
 #
 sub tell_login
 {
-	my ($self, $m) = @_;
+	my ($self, $m, $call) = @_;
+	
+	$call ||= $self->{call};
+	
+	# send info to all logged in thingies
+	my @dxchan = get_all_users();
+	my $dxchan;
+	foreach $dxchan (@dxchan) {
+		next if $dxchan == $self;
+		next if $dxchan->{call} eq $main::mycall;
+		$dxchan->send($dxchan->msg($m, $call)) if $dxchan->{logininfo};
+	}
+}
+
+#
+# Tell all the users if a buddy is logged or out
+#
+sub tell_buddies
+{
+	my ($self, $m, $call, $node) = @_;
+	
+	$call ||= $self->{call};
+	$call =~ s/-\d+$//;
+	$m .= 'n' if $node;
 	
 	# send info to all logged in thingies
 	my @dxchan = get_all_users();
@@ -452,7 +556,7 @@ sub tell_login
 	foreach $dxchan (@dxchan) {
 		next if $dxchan == $self;
 		next if $dxchan->{call} eq $main::mycall;
-		$dxchan->send($dxchan->msg($m, $self->{call})) if $dxchan->{logininfo};
+		$dxchan->send($dxchan->msg($m, $call, $node)) if grep $_ eq $call, @{$dxchan->{user}->{buddies}} ;
 	}
 }
 
@@ -489,51 +593,173 @@ 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();
 	}
 	
 	return ($sort, $call, $line);
 }
 
-sub rspfcheck
+# broadcast a message to all clusters taking into account isolation
+# [except those mentioned after buffer]
+sub broadcast_nodes
+{
+	my $s = shift;				# the line to be rebroadcast
+	my @except = @_;			# to all channels EXCEPT these (dxchannel refs)
+	my @dxchan = get_all_nodes();
+	my $dxchan;
+	
+	# send it if it isn't the except list and isn't isolated and still has a hop count
+	foreach $dxchan (@dxchan) {
+		next if grep $dxchan == $_, @except;
+		next if $dxchan == $main::me;
+		
+		my $routeit = $dxchan->can('adjust_hops') ? $dxchan->adjust_hops($s) : $s;      # adjust its hop count by node name
+
+		$dxchan->send($routeit) unless $dxchan->{isolate} || !$routeit;
+	}
+}
+
+# broadcast a message to all clusters ignoring isolation
+# [except those mentioned after buffer]
+sub broadcast_all_nodes
 {
-	my ($self, $flag, $node, $user) = @_;
-	my $nref = Route::Node::get($node);
-	if ($nref) {
-	    if ($nref->dxchan == $self) {
-			return 1 unless $user;
-			return 1 if grep $user eq $_, $nref->users;
-			dbg("RSPF: $user not on $node") if isdbg('rspf');
+	my $s = shift;				# the line to be rebroadcast
+	my @except = @_;			# to all channels EXCEPT these (dxchannel refs)
+	my @dxchan = get_all_nodes();
+	my $dxchan;
+	
+	# send it if it isn't the except list and isn't isolated and still has a hop count
+	foreach $dxchan (@dxchan) {
+		next if grep $dxchan == $_, @except;
+		next if $dxchan == $main::me;
+
+		my $routeit = $dxchan->can('adjust_hops') ? $dxchan->adjust_hops($s) : $s;      # adjust its hop count by node name
+		$dxchan->send($routeit);
+	}
+}
+
+# broadcast to all users
+# storing the spot or whatever until it is in a state to receive it
+sub broadcast_users
+{
+	my $s = shift;				# the line to be rebroadcast
+	my $sort = shift;           # the type of transmission
+	my $fref = shift;           # a reference to an object to filter on
+	my @except = @_;			# to all channels EXCEPT these (dxchannel refs)
+	my @dxchan = get_all_users();
+	my $dxchan;
+	my @out;
+	
+	foreach $dxchan (@dxchan) {
+		next if grep $dxchan == $_, @except;
+		push @out, $dxchan;
+	}
+	broadcast_list($s, $sort, $fref, @out);
+}
+
+
+# broadcast to a list of users
+sub broadcast_list
+{
+	my $s = shift;
+	my $sort = shift;
+	my $fref = shift;
+	my $dxchan;
+	
+	foreach $dxchan (@_) {
+		my $filter = 1;
+		next if $dxchan == $main::me;
+		
+		if ($sort eq 'dx') {
+		    next unless $dxchan->{dx};
+			($filter) = $dxchan->{spotsfilter}->it(@{$fref}) if ref $fref;
+			next unless $filter;
+		}
+		next if $sort eq 'ann' && !$dxchan->{ann} && $s !~ /^To\s+LOCAL\s+de\s+(?:$main::myalias|$main::mycall)/i;
+		next if $sort eq 'wwv' && !$dxchan->{wwv};
+		next if $sort eq 'wcy' && !$dxchan->{wcy};
+		next if $sort eq 'wx' && !$dxchan->{wx};
+
+		$s =~ s/\a//og unless $dxchan->{beep};
+
+		if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
+			$dxchan->send($s);	
 		} else {
-			dbg("RSPF: Shortest path for $node is " . $nref->dxchan->{call}) if isdbg('rspf');
+			$dxchan->delay($s);
+		}
+	}
+}
+
+sub process
+{
+	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;
+			}
+
+			# 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;
+			
+				# 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";
+			}
 		}
+	}
+}
+
+sub handle_xml
+{
+	my $self = shift;
+	my $r = 0;
+	
+	if (DXXml::available()) {
+		$r = $self->{handle_xml} || 0;
 	} else {
-		return 1 if $flag;
-		dbg("RSPF: required $node not found" ) if isdbg('rspf');
+		delete $self->{handle_xml} if exists $self->{handle_xml};
 	}
-	return 0;
+	return $r;
 }
 
-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;
 }