X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute%2FNode.pm;h=90f691e44e343e47c27de6d3868649d9d3f8f683;hb=5835ca385fb719194163512276666aaf75e82484;hp=9c2b734e1b3bb867243c59a5a28b1ba37d3c577c;hpb=c1540ccd7990ec4bd151604dd63583d19fe4d0f6;p=spider.git

diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm
index 9c2b734e..90f691e4 100644
--- a/perl/Route/Node.pm
+++ b/perl/Route/Node.pm
@@ -12,6 +12,8 @@ use DXDebug;
 use Route;
 use Route::User;
 use DXUtil;
+use DXJSON;
+use Time::HiRes qw(gettimeofday);
 
 use strict;
 
@@ -19,7 +21,6 @@ use vars qw(%list %valid @ISA $max $filterdef $obscount);
 @ISA = qw(Route);
 
 %valid = (
-		  parent => '0,Parent Calls,parray',
 		  nodes => '0,Nodes,parray',
 		  users => '0,Users,parray',
 		  usercount => '0,User Count',
@@ -29,16 +30,17 @@ use vars qw(%list %valid @ISA $max $filterdef $obscount);
 		  lastmsg => '0,Last Route Msg,atime',
 		  lastid => '0,Last Route MsgID',
 		  do_pc9x => '0,Uses pc9x,yesno',
-		  via_pc92 => '0,Came in via pc92,yesno',
+		  via_pc92 => '0,In via pc92?,yesno',
 		  obscount => '0,Obscount',
 		  last_PC92C => '9,Last PC92C',
-		  PC92C_dxchan => '9,Channel of PC92C,phash',
+		  PC92C_dxchan => '9,PC92C hops,phash',
 );
 
 $filterdef = $Route::filterdef;
 %list = ();
 $max = 0;
 $obscount = 3;
+our $cachefn = localdata('route_node_cache');
 
 sub count
 {
@@ -78,6 +80,7 @@ sub add
 	}
 	$self = $parent->new($call, @_);
 	$parent->_addnode($self);
+	dbg("CLUSTER: node $call added") if isdbg('cluster');
 	return $self;
 }
 
@@ -109,6 +112,7 @@ sub del
 		$self->_del_users;
 		delete $list{$ncall};
 		push @nodes, $self;
+		dbg("CLUSTER: node $ncall deleted") if isdbg('cluster');
 	}
 	return @nodes;
 }
@@ -166,6 +170,8 @@ sub add_user
 {
 	my $self = shift;
 	my $ucall = shift;
+	my $here = shift;
+	my $ip = shift;
 
 	confess "Trying to add NULL User call to routing tables" unless $ucall;
 
@@ -174,7 +180,7 @@ sub add_user
 	if ($uref) {
 		@out = $uref->addparent($self);
 	} else {
-		$uref = Route::User->new($ucall, $self->{call}, @_);
+		$uref = Route::User->new($ucall, $self->{call}, $here, $ip);
 		@out = $uref;
 	}
 	$self->_adduser($uref);
@@ -200,6 +206,14 @@ sub del_user
 	return @out;
 }
 
+# is a user on this node
+sub is_user
+{
+	my $self = shift;
+	my $call = shift;
+	return scalar grep {$_ eq $call} @{$self->{users}};
+}
+
 sub usercount
 {
 	my $self = shift;
@@ -221,12 +235,6 @@ sub nodes
 	return @{$self->{nodes}};
 }
 
-sub parents
-{
-	my $self = shift;
-	return @{$self->{parent}};
-}
-
 sub rnodes
 {
 	my $self = shift;
@@ -273,6 +281,7 @@ sub calc_config_changes
 	return (\@dnodes, \@dusers, \@nnodes, \@nusers);
 }
 
+
 sub new
 {
 	my $pkg = shift;
@@ -287,6 +296,8 @@ sub new
 	$self->{users} = [];
 	$self->{nodes} = [];
 	$self->{PC92C_dxchan} = {};
+	my $ip = shift;
+	$self->{ip} = $ip if defined $ip;
 	$self->reset_obs;			# by definition
 
 	$list{$call} = $self;
@@ -299,7 +310,7 @@ sub get
 	my $call = shift;
 	$call = shift if ref $call;
 	my $ref = $list{uc $call};
-	dbg("Failed to get Node $call" ) if !$ref && isdbg('routerr');
+	dbg("ROUTE: Failed to get Node $call" ) if !$ref && isdbg('routerr');
 	return $ref;
 }
 
@@ -384,13 +395,38 @@ sub PC92C_dxchan
 	return (%{$parent->{PC92C_dxchan}});
 }
 
+sub TO_JSON { return { %{ shift() } }; }
+
+sub write_cache
+{
+	my $json = DXJSON->new;
+	$json->canonical(0)->allow_blessed(1)->convert_blessed(1);
+	
+	my $ta = [ gettimeofday ];
+	$json->indent(1)->canonical(1) if isdbg('routecache');
+	my $s = eval {$json->encode(\%list)};
+	if ($s) {
+		my $fh = IO::File->new(">$cachefn") or confess("writing $cachefn $!");
+		$fh->print($s);
+		$fh->close;
+	} else {
+		dbg("Route::User:Write_cache error '$@'");
+		return;
+	}
+	$json->indent(0)->canonical(0);
+	my $diff = _diffms($ta);
+	my $size = sprintf('%.3fKB', (length($s) / 1000));
+	dbg("Route::User:WRITE_CACHE size: $size time to write: $diff mS");
+}
+
+
 sub DESTROY
 {
 	my $self = shift;
 	my $pkg = ref $self;
 	my $call = $self->{call} || "Unknown";
 
-	dbg("destroying $pkg with $call") if isdbg('routelow');
+	dbg("ROUTE: destroying $pkg with $call") if isdbg('routelow');
 }
 
 #