X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute%2FNode.pm;h=00e410713354bfde7db1f7a909144a86be0ca070;hb=314a26e98d3c3e6a717a9f66ead3ed91cce09ea5;hp=0c2b2e4a6f69c7d20449fc1005250a66f2869bda;hpb=7b616aeabce92e3cb416a5fe6640a288adfe5410;p=spider.git

diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm
index 0c2b2e4a..00e41071 100644
--- a/perl/Route/Node.pm
+++ b/perl/Route/Node.pm
@@ -11,16 +11,14 @@ package Route::Node;
 use DXDebug;
 use Route;
 use Route::User;
+use DXUtil;
 
 use strict;
 
 use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $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 = (
@@ -29,13 +27,18 @@ use vars qw(%list %valid @ISA $max $filterdef);
 		  users => '0,Users,parray',
 		  usercount => '0,User Count',
 		  version => '0,Version',
-		  np => '0,Using New Prot,yesno',
-		  lid => '0,Last Msgid',
+		  handle_xml => '0,Using XML,yesno',
+		  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
 {
@@ -210,6 +213,24 @@ sub rnodes
 	return @out;
 }
 
+# this takes in a list of node and user calls (not references) from 
+# a config type update for a node and returns
+# the differences as lists of things that have gone away
+# and things that have been added. 
+sub calc_config_changes
+{
+	my $self = shift;
+	my %nodes = map {$_ => 1} @{$self->{nodes}};
+	my %users = map {$_ => 1} @{$self->{users}};
+	my $cnodes = shift;
+	my $cusers = shift;
+	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;
+	return (\@dnodes, \@dusers, \@nnodes, \@nusers);
+}
 
 sub new
 {
@@ -220,11 +241,11 @@ sub new
 	
 	my $self = $pkg->SUPER::new($call);
 	$self->{parent} = ref $pkg ? [ $pkg->{call} ] : [ ];
-	$self->{version} = shift;
-	$self->{flags} = shift;
+	$self->{version} = shift || 5401;
+	$self->{flags} = shift || Route::here(1);
 	$self->{users} = [];
 	$self->{nodes} = [];
-	$self->{lid} = 0;
+	$self->{lastid} = {};
 	
 	$list{$call} = $self;
 	
@@ -245,22 +266,6 @@ sub get_all
 	return values %list;
 }
 
-sub newid
-{
-	my $self = shift;
-	my $id = shift;
-	
-	return 0 if $id == $self->{lid};
-	if ($id > $self->{lid}) {
-		$self->{lid} = $id;
-		return 1;
-	} elsif ($self->{lid} - $id > 60000) {
-		$self->{id} = $id;
-		return 1;
-	}
-	return 0;
-}
-
 sub _addparent
 {
 	my $self = shift;
@@ -299,6 +304,18 @@ sub _deluser
     return $self->_dellist('users', @_);
 }
 
+sub dec_obs
+{
+	my $self = shift;
+	$self->{obscount}--;
+}
+
+sub reset_obs
+{
+	my $self = shift;
+	$self->{obscount} = $obscount;
+}
+
 sub DESTROY
 {
 	my $self = shift;