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;
-$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 = (
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_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
{
sub max
{
+ count();
return $max;
}
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;
}
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);
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;
}
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;
}
return @{$self->{nodes}};
}
+sub parents
+{
+ my $self = shift;
+ return @{$self->{parent}};
+}
+
sub rnodes
{
my $self = shift;
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 $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->_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;
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;
projects / spider.git / blobdiff