mega-merge of major parts of mojo

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

diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm
index d2105f8f6b6bcf57aea77391344f243c7af3681e..76d987572e3e789f6beee90ba9a0ed0bfcddbcf3 100644 (file)
--- 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,10 +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,Channel of PC92C',
+                 PC92C_dxchan => '9,PC92C hops,phash',
 );
 
 $filterdef = $Route::filterdef;
@@ -78,6 +77,7 @@ sub add
        }
        $self = $parent->new($call, @_);
        $parent->_addnode($self);
+       dbg("CLUSTER: node $call added") if isdbg('cluster');
        return $self;
 }
 
@@ -109,6 +109,7 @@ sub del
                $self->_del_users;
                delete $list{$ncall};
                push @nodes, $self;
+               dbg("CLUSTER: node $ncall deleted") if isdbg('cluster');
        }
        return @nodes;
 }
@@ -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);
@@ -200,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;
@@ -221,12 +232,6 @@ sub nodes
        return @{$self->{nodes}};
 }
 
-sub parents
-{
-       my $self = shift;
-       return @{$self->{parent}};
-}
-
 sub rnodes
 {
        my $self = shift;
@@ -273,6 +278,7 @@ sub calc_config_changes
        return (\@dnodes, \@dusers, \@nnodes, \@nusers);
 }
 
+
 sub new
 {
        my $pkg = shift;
@@ -286,8 +292,9 @@ sub new
        $self->{flags} = shift || Route::here(1);
        $self->{users} = [];
        $self->{nodes} = [];
-       $self->{lastid} = {};
-       $self->{PC92C_dxchan} = '';
+       $self->{PC92C_dxchan} = {};
+       my $ip = shift;
+       $self->{ip} = $ip if defined $ip;
        $self->reset_obs;                       # by definition
 
        $list{$call} = $self;
@@ -300,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;
 }
 
@@ -360,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');
 }
 
 #