X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute%2FNode.pm;h=e50302cd1b494e65a16fa04f3befb37e1b1c4337;hb=aeb4c8591de710bd8de14f33817d2f0aabbd5e28;hp=bde0a74476ac51819a4a27817d43db39ab41a852;hpb=ad7e69f78ee4c0593e1d7576a7c1fd3b13931f84;p=spider.git

diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm
index bde0a744..e50302cd 100644
--- a/perl/Route/Node.pm
+++ b/perl/Route/Node.pm
@@ -18,7 +18,7 @@ use strict;
 use vars qw($VERSION $BRANCH);
 ($VERSION, $BRANCH) = dxver( q$Revision$);
 
-use vars qw(%list %valid @ISA $max $filterdef);
+use vars qw(%list %valid @ISA $max $filterdef $obscount);
 @ISA = qw(Route);
 
 %valid = (
@@ -31,11 +31,14 @@ use vars qw(%list %valid @ISA $max $filterdef);
 		  lastmsg => '0,Last Route Msg,atime',
 		  lastid => '0,Last Route MsgID',
 		  do_pc92 => '0,Uses pc92,yesno',
+		  via_pc92 => '0,Came in via pc92,yesno',
+		  obscount => '0,Obscount',
 );
 
 $filterdef = $Route::filterdef;
 %list = ();
 $max = 0;
+$obscount = 3;
 
 sub count
 {
@@ -110,6 +113,21 @@ 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 $call (@{$self->{parent}}) {
+		my $parent = Route::Node::get($call);
+		push @out, $parent->del($self) if $parent;
+	}
+	return @out;
+}
+
 sub del_nodes
 {
 	my $parent = shift;
@@ -221,11 +239,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);
 }
 
@@ -238,11 +270,12 @@ sub new
 	
 	my $self = $pkg->SUPER::new($call);
 	$self->{parent} = ref $pkg ? [ $pkg->{call} ] : [ ];
-	$self->{version} = shift || 5000;
+	$self->{version} = shift || 5401;
 	$self->{flags} = shift || Route::here(1);
 	$self->{users} = [];
 	$self->{nodes} = [];
 	$self->{lastid} = {};
+	$self->reset_obs;			# by definition
 	
 	$list{$call} = $self;
 	
@@ -301,6 +334,19 @@ sub _deluser
     return $self->_dellist('users', @_);
 }
 
+sub dec_obs
+{
+	my $self = shift;
+	$self->{obscount}--;
+	return $self->{obscount};
+}
+
+sub reset_obs
+{
+	my $self = shift;
+	$self->{obscount} = $obscount;
+}
+
 sub DESTROY
 {
 	my $self = shift;