X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute%2FNode.pm;h=76d987572e3e789f6beee90ba9a0ed0bfcddbcf3;hb=4b207544da78b182bd12e94eab01451694749012;hp=a9bb2a44aa3f02deda232e301bc593ad6f43a2c3;hpb=fd0a34c34ad4112ee21e0730f7307498ff437e18;p=spider.git

diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm
index a9bb2a44..76d98757 100644
--- a/perl/Route/Node.pm
+++ b/perl/Route/Node.pm
@@ -19,7 +19,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,9 +28,10 @@ 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,PC92C hops,phash',
 );
 
 $filterdef = $Route::filterdef;
@@ -77,6 +77,7 @@ sub add
 	}
 	$self = $parent->new($call, @_);
 	$parent->_addnode($self);
+	dbg("CLUSTER: node $call added") if isdbg('cluster');
 	return $self;
 }
 
@@ -106,23 +107,36 @@ sub del
 			push @nodes, $r->del($self, $ncall, @_) if $r;
 		}
 		$self->_del_users;
-		delete $list{$self->{call}};
+		delete $list{$ncall};
 		push @nodes, $self;
+		dbg("CLUSTER: node $ncall deleted") if isdbg('cluster');
 	}
 	return @nodes;
 }
 
 # this deletes this node completely by grabbing the parents
-# and deleting me from them
+# and deleting me from them, then deleting me from all the
+# dependent nodes.
 sub delete
 {
 	my $self = shift;
 	my @out;
+	my $ncall = $self->{call};
 
+	# get rid of users and parents
 	$self->_del_users;
-	foreach my $call (@{$self->{parent}}) {
-		my $parent = Route::Node::get($call);
-		push @out, $parent->del($self) if $parent;
+	if (@{$self->{parent}}) {
+		foreach my $call (@{$self->{parent}}) {
+			my $parent = Route::Node::get($call);
+			push @out, $parent->del($self) if $parent;
+		}
+	}
+	# get rid of my nodes
+	push @out, $self->del_nodes;
+	# this only happens if we a orphan with no parents
+	if ($list{$ncall}) {
+		push @out, $self;
+		delete $list{$ncall};
 	}
 	return @out;
 }
@@ -153,6 +167,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;
 
@@ -161,7 +177,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);
@@ -187,6 +203,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;
@@ -208,12 +232,6 @@ sub nodes
 	return @{$self->{nodes}};
 }
 
-sub parents
-{
-	my $self = shift;
-	return @{$self->{parent}};
-}
-
 sub rnodes
 {
 	my $self = shift;
@@ -260,6 +278,7 @@ sub calc_config_changes
 	return (\@dnodes, \@dusers, \@nnodes, \@nusers);
 }
 
+
 sub new
 {
 	my $pkg = shift;
@@ -273,7 +292,9 @@ sub new
 	$self->{flags} = shift || Route::here(1);
 	$self->{users} = [];
 	$self->{nodes} = [];
-	$self->{lastid} = {};
+	$self->{PC92C_dxchan} = {};
+	my $ip = shift;
+	$self->{ip} = $ip if defined $ip;
 	$self->reset_obs;			# by definition
 
 	$list{$call} = $self;
@@ -286,7 +307,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;
 }
 
@@ -346,13 +367,38 @@ sub reset_obs
 	$self->{obscount} = $obscount;
 }
 
+sub measure_pc9x_t
+{
+	my $parent = shift;
+	my $t = shift;
+	my $lastid = $parent->{lastid};
+	if ($lastid) {
+		return ($t < $lastid) ? $t+86400-$lastid : $t - $lastid;
+	} else {
+		return 86400;
+	}
+}
+
+sub PC92C_dxchan
+{
+	my $parent = shift;
+	my $call = shift;
+	my $hops = shift;
+	if ($call && $hops) {
+		$hops =~ s/^H//;
+		$parent->{PC92C_dxchan}->{$call} = $hops;
+		return;
+	}
+	return (%{$parent->{PC92C_dxchan}});
+}
+
 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');
 }
 
 #