X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute%2FNode.pm;h=617a0aed43a0718c47cebaf5ea28413d95165a39;hb=e1d5c2a325cb6b8674eab55c23f12445aae01f52;hp=6e7d931541c89d48722085be2c8363848e640b93;hpb=93292dcd622b1505d2cbab334277c89e7c8afd27;p=spider.git

diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm
index 6e7d9315..617a0aed 100644
--- a/perl/Route/Node.pm
+++ b/perl/Route/Node.pm
@@ -32,7 +32,8 @@ use vars qw(%list %valid @ISA $max $filterdef $obscount);
 		  via_pc92 => '0,Came in via pc92,yesno',
 		  obscount => '0,Obscount',
 		  last_PC92C => '9,Last PC92C',
-		  PC92C_dxchan => '9,Channel of PC92C',
+		  PC92C_dxchan => '9,Channel of PC92C,phash',
+		  ip => '0,IP Address',
 );
 
 $filterdef = $Route::filterdef;
@@ -166,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;
 
@@ -174,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);
@@ -221,12 +224,6 @@ sub nodes
 	return @{$self->{nodes}};
 }
 
-sub parents
-{
-	my $self = shift;
-	return @{$self->{parent}};
-}
-
 sub rnodes
 {
 	my $self = shift;
@@ -286,8 +283,9 @@ sub new
 	$self->{flags} = shift || Route::here(1);
 	$self->{users} = [];
 	$self->{nodes} = [];
-	$self->{lastid} = 0;
-	$self->{PC92C_dxchan} = '';
+	$self->{PC92C_dxchan} = {};
+	my $ip = shift;
+	$self->{ip} = $ip if defined $ip;
 	$self->reset_obs;			# by definition
 
 	$list{$call} = $self;
@@ -372,6 +370,19 @@ sub measure_pc9x_t
 	}
 }
 
+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;