X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=b1c084fd52d6712e3af3eb5247cce33e69c3becb;hb=893a6f6711e298eda86d8696093bf223c431729f;hp=4e32c22e77940e1eea3db025e85a55b08c0039ca;hpb=aeb4c8591de710bd8de14f33817d2f0aabbd5e28;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 4e32c22e..b1c084fd 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -45,6 +45,7 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim
 			%nodehops $baddx $badspotter $badnode $censorpc $rspfcheck
 			$allowzero $decode_dk0wcy $send_opernam @checklist
 			$eph_pc15_restime $pc92_update_period $last_pc92_update
+			%pc92_find $pc92_find_timeout
 		   );
 
 ($VERSION, $BRANCH) = dxver(q$Revision$);
@@ -77,6 +78,9 @@ $investigation_int = 12*60*60;	# time between checks to see if we can see this n
 $pc19_version = 5466;			# the visible version no for outgoing PC19s generated from pc59
 $pc92_update_period = 30*60;	# the period between PC92 C updates
 $last_pc92_update = time + int rand(180);		# the last time a PC92 config update
+%pc92_find = ();				# outstanding pc92 find operations
+$pc92_find_timeout = 30;		# maximum time to wait for a reply
+
 
 
 @checklist = 
@@ -221,8 +225,7 @@ sub init
 	$main::me->{registered} = 1;
 	$main::me->{version} = $main::version;
 	$main::me->{build} = $main::build;
-	$main::me->{do_pc92} = 1;
-	$main::me->{via_pc92} = 1;
+	$main::me->{do_pc9x} = 1;
 }
 
 #
@@ -433,6 +436,7 @@ sub process
 	}
 
 	Investigate::process();
+	clean_pc92_find();
 
 	# every ten seconds
 	if ($t - $last10 >= 10) {	
@@ -445,7 +449,7 @@ sub process
 			dbg("ROUTE: sending pc92 update") if isdbg('route');
 			send_pc92_update();
 			time_out_pc92_routes();
-			$last_pc92_update = $main::systime + int rand(180);
+			$last_pc92_update = $main::systime + int rand(5*60);
 		}
 		
 		$last10 = $t;
@@ -586,10 +590,11 @@ sub wcy
 sub send_announce
 {
 	my $self = shift;
+	my $from_pc9x = shift;
 	my $line = shift;
 	my @dxchan = DXChannel::get_all();
 	my $dxchan;
-	my $target;
+	my $target = $_[6];
 	my $to = 'To ';
 	my $text = unpad($_[2]);
 				
@@ -598,7 +603,7 @@ sub send_announce
 	} elsif ($_[3] gt ' ') { # speciality list handling
 		my ($name) = split /\./, $_[3]; 
 		$target = "$name"; # put the rest in later (if bothered) 
-	} 
+	}  
 	
 	if ($_[5] eq '1') {
 		$target = "WX"; 
@@ -633,6 +638,8 @@ sub send_announce
 	foreach $dxchan (@dxchan) {
 		next if $dxchan == $main::me;
 		next if $dxchan == $self && $self->is_node;
+		next if $from_pc9x && $dxchan->{do_pc9x};
+		next if $target eq 'LOCAL' && $dxchan->is_node;
 		$dxchan->announce($line, $self->{isolate}, $to, $target, $text, @_, $self->{call},
 						  @a[0..2], @b[0..2]);
 	}
@@ -651,6 +658,7 @@ sub nextchatmsgid
 sub send_chat
 {
 	my $self = shift;
+	my $from_pc9x = shift;
 	my $line = shift;
 	my @dxchan = DXChannel::get_all();
 	my $dxchan;
@@ -693,10 +701,11 @@ sub send_chat
 		if ($dxchan->is_node) {
 			next if $dxchan == $main::me;
 			next if $dxchan == $self;
+			next if $from_pc9x && $dxchan->{do_pc9x};
 			next unless $dxchan->is_spider || $is_ak1a;
 			next if $target eq 'LOCAL';
 			if (!$ak1a_line && $is_ak1a) {
-				$ak1a_line = DXProt::pc12($_[0], $text, $_[1], "$target.LST");
+				$ak1a_line = pc12($_[0], $text, $_[1], "$target.LST");
 			}
 		}
 		
@@ -735,7 +744,7 @@ sub send_local_config
 	dbg('DXProt::send_local_config') if isdbg('trace');
 
 	# send our nodes
-	if ($self->{do_pc92}) { 
+	if ($self->{do_pc9x}) { 
 		$self->send_pc92_config;
 	} else {
 		my $node;
@@ -815,7 +824,7 @@ sub gen_pc92_update
 	if ($with_pc92_nodes) {
 		# send out the configuration of all the directly connected PC92 nodes with current configuration
 		# but with the dates that the last config came in with.
-		@dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && $_->{do_pc92} } DXChannel::get_all_nodes();
+		@dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && $_->{do_pc9x} } DXChannel::get_all_nodes();
 		dbg("ROUTE: pc92 dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow');
 		@localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan;
 		dbg("ROUTE: pc92 localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
@@ -829,7 +838,7 @@ sub gen_pc92_update
 	
 	# send the configuration of all the directly connected 'external' nodes that don't handle PC92
 	# out with the 'external' marker on the first node.
-	@dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && !$_->{do_pc92} } DXChannel::get_all_nodes();
+	@dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && !$_->{do_pc9x} } DXChannel::get_all_nodes();
 	dbg("ROUTE: non pc92 dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow');
 	@localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan;
 	dbg("ROUTE: non pc92 localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
@@ -870,7 +879,7 @@ sub send_pc92_update
 
 sub time_out_pc92_routes
 {
-	my @nodes = grep {$_->call ne $main::mycall && ($_->do_pc92 || $_->via_pc92)} Route::Node::get_all();
+	my @nodes = grep {$_->call ne $main::mycall && ($_->do_pc9x || $_->via_pc92)} Route::Node::get_all();
 	my @rdel;
 	foreach my $n (@nodes) {
 		my $o = $n->dec_obs;
@@ -1159,7 +1168,7 @@ sub talk
 {
 	my ($self, $from, $to, $via, $line, $origin) = @_;
 	
-	if ($self->{do_pc93}) {
+	if ($self->{do_pc9x}) {
 		$self->send(pc93($to, $from, $via, $line));
 	} else {
 		$self->send(pc10($from, $to, $via, $line, $origin));
@@ -1232,7 +1241,7 @@ sub broadcast_route
 			next if $dxchan == $self;
 			next if $dxchan == $main::me;
 			next unless $dxchan->isa('DXProt');
-			next if $dxchan->{do_pc92};
+			next if $dxchan->{do_pc9x};
 			next if ($generate == \&pc16 || $generate==\&pc17) && !$dxchan->user->wantsendpc16;
  
 			$dxchan->send_route($origin, $generate, @_);
@@ -1245,7 +1254,7 @@ sub send_route_pc92
 {
 	my $self = shift;
 
-	return unless $self->{do_pc92};
+	return unless $self->{do_pc9x};
 	
 	my $origin = shift;
 	my $generate = shift;
@@ -1275,7 +1284,7 @@ sub broadcast_route_pc9x
 		foreach $dxchan (@dxchan) {
 			next if $dxchan == $self || $dxchan == $main::me;
 			next if $origin eq $dxchan->{call};	# don't route some from this call back again.
-			next unless $dxchan->{do_pc92};
+			next unless $dxchan->{do_pc9x};
 			next unless $dxchan->isa('DXProt');
 
 			$dxchan->send($line);
@@ -1493,5 +1502,28 @@ sub import_chat
 	}
 }
 
+# start a pc92 find operation
+sub start_pc92_find
+{
+	my $dxchan = shift;
+	my $target = shift;
+	my $key = "$dxchan->{call}|$target";
+	if ($pc92_find{$key}) {
+		
+	}
+}
+
+# function (not method) to handle pc92 find returns
+sub handle_pc92_find_reply
+{
+	my ($dxchan, $node, $from, $target, $flag, $ms) = @_;
+	
+	$dxchan->print_pc92_find_reply($node, $target, $flag, $ms) if $dxchan->can('print_pc92_find_return');
+}
+
+sub clean_pc92_find
+{
+
+}
 1;
 __END__