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

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 6ff479c1..4e32c22e 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -32,26 +32,23 @@ use DXHash;
 use Route;
 use Route::Node;
 use Script;
-use Investigate;
 use RouteDB;
 use DXProtHandle;
 
 use strict;
 
 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;
-
 use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restime $eph_pc34_restime
 			$last_hour $last10 %eph  %pings %rcmds $ann_to_talk
 			$pingint $obscount %pc19list $chatdupeage $chatimportfn
 			$investigation_int $pc19_version $myprot_version
 			%nodehops $baddx $badspotter $badnode $censorpc $rspfcheck
 			$allowzero $decode_dk0wcy $send_opernam @checklist
+			$eph_pc15_restime $pc92_update_period $last_pc92_update
 		   );
 
+($VERSION, $BRANCH) = dxver(q$Revision$);
+
 $pc11_max_age = 1*3600;			# the maximum age for an incoming 'real-time' pc11
 $pc23_max_age = 1*3600;			# the maximum age for an incoming 'real-time' pc23
 
@@ -70,6 +67,7 @@ $ann_to_talk = 1;
 $rspfcheck = 1;
 $eph_restime = 180;
 $eph_info_restime = 60*60;
+$eph_pc15_restime = 6*60;
 $eph_pc34_restime = 30;
 $pingint = 5*60;
 $obscount = 2;
@@ -77,6 +75,9 @@ $chatdupeage = 20 * 60 * 60;
 $chatimportfn = "$main::root/chat_import";
 $investigation_int = 12*60*60;	# time between checks to see if we can see this node
 $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
+
 
 @checklist = 
 (
@@ -220,6 +221,8 @@ 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;
 }
 
 #
@@ -233,6 +236,14 @@ sub new
 	# add this node to the table, the values get filled in later
 	my $pkg = shift;
 	my $call = shift;
+
+	# if we have an entry already, then send a PC21 to all connect
+	# old style connections, because we are about to get the real deal
+	if (my $ref = Route::Node::get($call)) {
+		dbg("ROUTE: $call is already in the routing table, deleting") if isdbg('route');
+		my @rout = $ref->delete;
+		$self->route_pc21($main::mycall, undef, @rout) if @rout;
+	}
 	$main::routeroot->add($call, '5000', Route::here(1)) if $call ne $main::mycall;
 
 	return $self;
@@ -360,12 +371,14 @@ sub normal
 	}
 
 	# modify the hop count here
-	if (my ($hops, $trail) = $line =~ /\^H(\d+)(\^?\~?)?$/) {
-		$trail ||= '';
-		$hops--;
-		return if $hops < 0;
-		$line =~ s/\^H(\d+)(\^?\~?)?$/sprintf('^H%d%s', $hops, $trail)/e;
-		$field[-1] = "H$hops";
+	if ($self != $main::me) {
+		if (my ($hops, $trail) = $line =~ /\^H(\d+)(\^?\~?)?$/) {
+			$trail ||= '';
+			$hops--;
+			return if $hops < 0;
+			$line =~ s/\^H(\d+)(\^?\~?)?$/sprintf('^H%d%s', $hops, $trail)/e;
+			$field[-1] = "H$hops";
+		}
 	}
 
 	# send it out for processing
@@ -427,8 +440,14 @@ sub process
 
 		eph_clean();
 		import_chat();
-		
 
+		if ($main::systime >= $last_pc92_update + $pc92_update_period) {
+			dbg("ROUTE: sending pc92 update") if isdbg('route');
+			send_pc92_update();
+			time_out_pc92_routes();
+			$last_pc92_update = $main::systime + int rand(180);
+		}
+		
 		$last10 = $t;
 	}
 	
@@ -763,16 +782,118 @@ sub send_local_config
 	}
 }
 
-sub send_pc92_config
+sub gen_my_pc92_config
+{
+	my $node = shift;
+	
+	if ($node->{call} eq $main::mycall) {
+		my @dxchan = grep { $_->call ne $main::mycall && !$_->{isolate} } DXChannel::get_all();
+		dbg("ROUTE: all dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow');
+		my @localnodes = map { my $r = Route::get($_->{call}); $r ? $r : () } @dxchan;
+		dbg("ROUTE: localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
+		return pc92c($main::routeroot, @localnodes);
+	} else {
+		my @rout = map {my $r = Route::User::get($_); $r ? ($r) : ()} $node->users;
+		return pc92c($node, @rout);
+	}
+}
+
+sub gen_pc92_update
 {
 	my $self = shift;
+	my $with_pc92_nodes = shift;
 	my $node;
+	my @lines;
+	my @dxchan;
+	my @localnodes;
+
+	dbg('ROUTE: DXProt::gen_pc92_update start') if isdbg('routelow');
+
+	# send 'my' configuration for all channels
+	push @lines, gen_my_pc92_config($main::routeroot);
+	
+	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();
+		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');
+		foreach $node (@localnodes) {
+			if ($node && $node->lastid->{92}) {
+				my @rout = map {my $r = Route::get($_); $r ? ($r) : ()} $node->nodes, $node->users;
+				push @lines, gen_pc92_with_time($node->call, 'C', $node->lastid->{92}, @rout);
+			}
+		}
+	}
+	
+	# 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();
+	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');
+	foreach $node (@localnodes) {
+		if ($node) {
+			push @lines, gen_my_pc92_config($node);
+		} 
+	}
+
+	dbg('ROUTE: DXProt::gen_pc92_update end with ' . scalar @lines . ' lines') if isdbg('routelow');
+	return @lines;
+}
+
+
+sub send_pc92_config
+{
+	my $self = shift;
 
 	dbg('DXProt::send_pc92_config') if isdbg('trace');
+
+	my @out = $self->gen_pc92_update(1);
 	
-	my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all();
-	my @localnodes = map { my $r = Route::get($_->{call}); $r ? $r : () } @dxchan if @dxchan;
-	$self->send_route_pc92($main::mycall, \&pc92c, scalar @localnodes, @localnodes);
+	# send the complete config out on this interface
+	for (@out) {
+		$self->send($_);
+	}
+} 
+
+sub send_pc92_update
+{
+	my @out = $main::me->gen_pc92_update(0);
+	
+	# broadcast the lines to all PC92 nodes
+	for (@out) {
+		$main::me->broadcast_route_pc9x($main::mycall, undef, $_, 0);
+	}
+} 
+
+sub time_out_pc92_routes
+{
+	my @nodes = grep {$_->call ne $main::mycall && ($_->do_pc92 || $_->via_pc92)} Route::Node::get_all();
+	my @rdel;
+	foreach my $n (@nodes) {
+		my $o = $n->dec_obs;
+		if ($o <= 0) {
+			if (my $dxchan = DXChannel::get($n->call)) {
+				dbg("ROUTE: disconnecting local pc92 $dxchan->{call} on obscount") if isdbg('route');
+				$dxchan->disconnect;
+				next;
+			}
+			my @parents = map {Route::Node::get($_)} $n->parents;
+			for (@parents) {
+				if ($_) {
+					dbg("ROUTE: deleting pc92 $_->{call} from $n->{call} on obscount") if isdbg('route');
+					push @rdel, $n->del($_);
+				}
+			}
+		} else {
+			dbg("ROUTE: obscount on $n->{call} now $o") if isdbg('route');
+		}
+	}
+	for (@rdel) {
+		$main::me->route_pc21($main::mycall, undef, $_) if $_;
+	}
 }
 
 #
@@ -1013,7 +1134,7 @@ sub disconnect
 	# broadcast to all other nodes that all the nodes connected to via me are gone
 	unless ($pc39flag && $pc39flag == 2)  {
 		$self->route_pc21($main::mycall, undef, @rout) if @rout;
-		$self->route_pc92d($main::mycall, undef, $node) if $node;
+		$self->route_pc92d($main::mycall, undef, $main::routeroot, $node) if $node;
 	}
 
 	# remove outstanding pings
@@ -1038,8 +1159,11 @@ sub talk
 {
 	my ($self, $from, $to, $via, $line, $origin) = @_;
 	
-	$line =~ s/\^/\\5E/g;			# remove any ^ characters
-	$self->send(DXProt::pc10($from, $to, $via, $line, $origin));
+	if ($self->{do_pc93}) {
+		$self->send(pc93($to, $from, $via, $line));
+	} else {
+		$self->send(pc10($from, $to, $via, $line, $origin));
+	}
 	Log('talk', $to, $from, $via?$via:$self->call, $line) unless $origin && $origin ne $main::mycall;
 }
 
@@ -1142,15 +1266,15 @@ sub broadcast_route_pc9x
 	my @dxchan = DXChannel::get_all_nodes();
 	my $dxchan;
 
-	if ($origin eq $main::mycall) {
+	if ($origin eq $main::mycall && $generate && !$line) {
 		$line = &$generate(@_);
 	} 
 
-	$line =~ /\^H(\d+)\^$/;
+	$line =~ /\^H(\d+)\^\~?$/;
 	unless ($1 > 0 && $self->{isolate}) {
 		foreach $dxchan (@dxchan) {
-			next if $dxchan == $self;
-			next if $dxchan == $main::me;
+			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->isa('DXProt');