X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRoute%2FNode.pm;h=e17b01f8858feaf4aee5f965c71bb6bf79fbf48a;hb=b1a1e93daee349cc9a1efdc73dd2e3147a7ca767;hp=e29fe3caefb1eeb393dd1322ff21f99ee3428888;hpb=6624dcdf07d628e8d6a16fc6549edf40be25b7b2;p=spider.git

diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm
index e29fe3ca..e17b01f8 100644
--- a/perl/Route/Node.pm
+++ b/perl/Route/Node.pm
@@ -4,17 +4,18 @@
 # Copyright (c) 2001 Dirk Koopman G1TLH
 #
 # $Id$
-# 
+#
 
 package Route::Node;
 
 use DXDebug;
 use Route;
 use Route::User;
+use DXUtil;
 
 use strict;
 
-use vars qw(%list %valid @ISA $max $filterdef);
+use vars qw(%list %valid @ISA $max $filterdef $obscount);
 @ISA = qw(Route);
 
 %valid = (
@@ -23,11 +24,18 @@ use vars qw(%list %valid @ISA $max $filterdef);
 		  users => '0,Users,parray',
 		  usercount => '0,User Count',
 		  version => '0,Version',
+		  handle_xml => '0,Using XML,yesno',
+		  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',
+		  obscount => '0,Obscount',
 );
 
 $filterdef = $Route::filterdef;
 %list = ();
 $max = 0;
+$obscount = 3;
 
 sub count
 {
@@ -38,6 +46,7 @@ sub count
 
 sub max
 {
+	count();
 	return $max;
 }
 
@@ -50,7 +59,7 @@ sub max
 # object with that callsign. The upper layers are expected to do something
 # sensible with this!
 #
-# called as $parent->add(call, dxchan, version, flags) 
+# called as $parent->add(call, dxchan, version, flags)
 #
 
 sub add
@@ -60,12 +69,12 @@ sub add
 	confess "Route::add trying to add $call to myself" if $call eq $parent->{call};
 	my $self = get($call);
 	if ($self) {
-		$self->_addparent($parent->{call});
-		$parent->_addnode($call);
+		$self->_addparent($parent);
+		$parent->_addnode($self);
 		return undef;
 	}
-	$parent->_addnode($call);
 	$self = $parent->new($call, @_);
+	$parent->_addnode($self);
 	return $self;
 }
 
@@ -82,14 +91,13 @@ sub del
 	my $pref = shift;
 
 	# delete parent from this call's parent list
-	my $pcall = $pref->{call};
-	my $ncall = $self->{call};
-	$pref->_delnode($ncall);;
-	my $ref = $self->_delparent($pcall);
+	$pref->_delnode($self);
+    $self->_delparent($pref);
 	my @nodes;
-	
+	my $ncall = $self->{call};
+
 	# is this the last connection, I have no parents anymore?
-	unless (@$ref) {
+	unless (@{$self->{parent}}) {
 		foreach my $rcall (@{$self->{nodes}}) {
 			next if grep $rcall eq $_, @_;
 			my $r = Route::Node::get($rcall);
@@ -102,6 +110,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;
@@ -131,16 +154,17 @@ sub add_user
 
 	confess "Trying to add NULL User call to routing tables" unless $ucall;
 
-	$self->_adduser($ucall);
-
-	$self->{usercount} = scalar @{$self->{users}};
 	my $uref = Route::User::get($ucall);
 	my @out;
 	if ($uref) {
-		$uref->addparent($self->{call});
+		@out = $uref->addparent($self);
 	} else {
-		@out = Route::User->new($ucall, $self->{call}, @_);
+		$uref = Route::User->new($ucall, $self->{call}, @_);
+		@out = $uref;
 	}
+	$self->_adduser($uref);
+	$self->{usercount} = scalar @{$self->{users}};
+
 	return @out;
 }
 
@@ -148,10 +172,16 @@ sub add_user
 sub del_user
 {
 	my $self = shift;
-	my $ucall = shift;
-	my $ref = Route::User::get($ucall);
-	$self->_deluser($ucall);
-	my @out = $ref->del($self) if $ref;
+	my $ref = shift;
+	my @out;
+
+	if ($ref) {
+		@out = $self->_deluser($ref);
+		$ref->del($self);
+	} else {
+		confess "tried to delete non-existant $ref->{call} from $self->{call}";
+	}
+	$self->{usercount} = scalar @{$self->{users}};
 	return @out;
 }
 
@@ -176,6 +206,12 @@ sub nodes
 	return @{$self->{nodes}};
 }
 
+sub parents
+{
+	my $self = shift;
+	return @{$self->{parent}};
+}
+
 sub rnodes
 {
 	my $self = shift;
@@ -189,23 +225,57 @@ 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;
+	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);
+}
 
 sub new
 {
 	my $pkg = shift;
 	my $call = uc shift;
-	
+
 	confess "already have $call in $pkg" if $list{$call};
-	
+
 	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->{lastid} = {};
+	$self->reset_obs;			# by definition
+
 	$list{$call} = $self;
-	
+
 	return $self;
 }
 
@@ -261,12 +331,25 @@ 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;
 	my $pkg = ref $self;
 	my $call = $self->{call} || "Unknown";
-	
+
 	dbg("destroying $pkg with $call") if isdbg('routelow');
 }
 
@@ -277,19 +360,16 @@ sub DESTROY
 sub AUTOLOAD
 {
 	no strict;
-
-	my $self = shift;
-	$name = $AUTOLOAD;
+	my $name = $AUTOLOAD;
 	return if $name =~ /::DESTROY$/;
-	$name =~ s/.*:://o;
-  
+	$name =~ s/^.*:://o;
+
 	confess "Non-existant field '$AUTOLOAD'" unless $valid{$name} || $Route::valid{$name};
 
 	# this clever line of code creates a subroutine which takes over from autoload
 	# from OO Perl - Conway
-#	print "AUTOLOAD: $AUTOLOAD\n";
-#	*{$AUTOLOAD} = sub {my $self = shift; @_ ? $self->{$name} = shift : $self->{$name}} ;
-    @_ ? $self->{$name} = shift : $self->{$name} ;
+        *$AUTOLOAD = sub {$_[0]->{$name} = $_[1] if @_ > 1; return $_[0]->{$name}};
+        goto &$AUTOLOAD;
 }
 
 1;