try to sort out PC16 so that local connections override and update remote

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

diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm
index 00e410713354bfde7db1f7a909144a86be0ca070..ccbd91d1e1ce4b28da7b0a50985b8e5477f54fc2 100644 (file)
--- a/perl/Route/Node.pm
+++ b/perl/Route/Node.pm
@@ -113,6 +113,20 @@ sub del
        return @nodes;
 }
 
+# this deletes this node completely by grabbing the parents
+# and deleting me from them
+sub delete
+{
+       my $self = shift;
+       my @out;
+       
+       $self->_del_users;
+       foreach my $parent (@{$self->{parent}}) {
+               push @out, $parent->del($self);
+       }
+       return @out;
+}
+
 sub del_nodes
 {
        my $parent = shift;
@@ -224,11 +238,25 @@ sub calc_config_changes
        my %users = map {$_ => 1} @{$self->{users}};
        my $cnodes = shift;
        my $cusers = shift;
+       if (isdbg('route')) {
+               dbg("ROUTE: start calc_config_changes");
+               dbg("ROUTE: incoming nodes on $self->{call}: " . join(',', sort @$cnodes));
+               dbg("ROUTE: incoming users on $self->{call}: " . join(',', sort @$cusers));
+               dbg("ROUTE: existing nodes on $self->{call}: " . join(',', sort keys %nodes));
+               dbg("ROUTE: existing users on $self->{call}: " . join(',', sort keys %users));
+       }
        my (@dnodes, @dusers, @nnodes, @nusers);
        push @nnodes, map {my @r = $nodes{$_} ? () : $_; delete $nodes{$_}; @r} @$cnodes;
        push @dnodes, keys %nodes;
        push @nusers, map {my @r = $users{$_} ? () : $_; delete $users{$_}; @r} @$cusers;
        push @dusers, keys %users;
+       if (isdbg('route')) {
+               dbg("ROUTE: deleted nodes on $self->{call}: " . join(',', sort @dnodes));
+               dbg("ROUTE: deleted users on $self->{call}: " . join(',', sort @dusers));
+               dbg("ROUTE: added nodes on $self->{call}: " . join(',', sort  @nnodes));
+               dbg("ROUTE: added users on $self->{call}: " . join(',', sort @nusers));
+               dbg("ROUTE: end calc_config_changes");
+       }
        return (\@dnodes, \@dusers, \@nnodes, \@nusers);
 }
 
@@ -246,6 +274,7 @@ sub new
        $self->{users} = [];
        $self->{nodes} = [];
        $self->{lastid} = {};
+       $self->reset_obs;                       # by definition
        
        $list{$call} = $self;
        
@@ -308,6 +337,7 @@ sub dec_obs
 {
        my $self = shift;
        $self->{obscount}--;
+       return $self->{obscount};
 }
 
 sub reset_obs