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

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 829c6b55..adf7c358 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -114,6 +114,11 @@ $count = 0;
 		  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',
+		  inqueue => '9,Input Queue,parray',
 		 );
 
 use vars qw($VERSION $BRANCH);
@@ -165,6 +170,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');
@@ -172,17 +178,34 @@ sub alloc
 	return $channels{$call} = $self;
 }
 
-# obtain a channel object by callsign [$obj = DXChannel->get($call)]
+# 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);
 }
 
@@ -252,7 +275,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
@@ -275,6 +298,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
 {
@@ -436,7 +466,6 @@ 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();
@@ -524,7 +553,7 @@ sub rspfcheck
 {
 	my ($self, $flag, $node, $user) = @_;
 	my $nref = Route::Node::get($node);
-	my $dxchan = $nref->bestdxchan if $nref;
+	my $dxchan = $nref->dxchan if $nref;
 	if ($nref && $dxchan) {
 	    if ($dxchan == $self) {
 			return 1 unless $user;
@@ -533,7 +562,7 @@ sub rspfcheck
 			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->bestdxchan->{call}) if isdbg('chanerr');
+			dbg("RSPF: Shortest path for $node is " . $nref->dxchan->{call}) if isdbg('chanerr');
 		}
 	} else {
 		return 1 if $flag;
@@ -548,7 +577,7 @@ sub broadcast_nodes
 {
 	my $s = shift;				# the line to be rebroadcast
 	my @except = @_;			# to all channels EXCEPT these (dxchannel refs)
-	my @dxchan = DXChannel::get_all_nodes();
+	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
@@ -568,7 +597,7 @@ sub broadcast_all_nodes
 {
 	my $s = shift;				# the line to be rebroadcast
 	my @except = @_;			# to all channels EXCEPT these (dxchannel refs)
-	my @dxchan = DXChannel::get_all_nodes();
+	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
@@ -589,7 +618,7 @@ sub broadcast_users
 	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 = DXChannel::get_all_users();
+	my @dxchan = get_all_users();
 	my $dxchan;
 	my @out;
 	
@@ -633,6 +662,42 @@ sub broadcast_list
 	}
 }
 
+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";
+			}
+		}
+	}
+}
 
 #no strict;
 sub AUTOLOAD