allow debug to track cluster config

[spider.git] / perl / Route / Node.pm

diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm
index 23e293820295f6c8f4379373e8a85ae5c0481181..89e84d4072b1910b83b6b41d05c2d50431df2b4e 100644 (file)
--- 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;
@@ -78,6 +79,7 @@ sub add
        }
        $self = $parent->new($call, @_);
        $parent->_addnode($self);
+       dbg("CLUSTER: node $call added") if isdbg('cluster');
        return $self;
 }
 
@@ -109,6 +111,7 @@ sub del
                $self->_del_users;
                delete $list{$ncall};
                push @nodes, $self;
+               dbg("CLUSTER: node $ncall deleted") if isdbg('cluster');
        }
        return @nodes;
 }
@@ -166,6 +169,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 +179,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 +226,6 @@ sub nodes
        return @{$self->{nodes}};
 }
 
-sub parents
-{
-       my $self = shift;
-       return @{$self->{parent}};
-}
-
 sub rnodes
 {
        my $self = shift;
@@ -286,7 +285,9 @@ sub new
        $self->{flags} = shift || Route::here(1);
        $self->{users} = [];
        $self->{nodes} = [];
-       $self->{PC92C_dxchan} = '';
+       $self->{PC92C_dxchan} = {};
+       my $ip = shift;
+       $self->{ip} = $ip if defined $ip;
        $self->reset_obs;                       # by definition
 
        $list{$call} = $self;
@@ -299,7 +300,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;
 }
 
@@ -371,13 +372,26 @@ 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;
        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');
 }
 
 #