use strict;
-use vars qw(%list %valid @ISA $max);
+use vars qw($VERSION $BRANCH);
+
+main::mkver($VERSION = q$Revision$);
+
+use vars qw(%list %valid @ISA $max $filterdef);
@ISA = qw(Route);
%valid = (
parent => '0,Parent Calls,parray',
nodes => '0,Nodes,parray',
users => '0,Users,parray',
+ usercount => '0,User Count',
version => '0,Version',
+ build => '0,Build',
+ sw => '0,Software',
+ np => '0,Using New Prot,yesno',
);
+$filterdef = $Route::filterdef;
%list = ();
$max = 0;
sub count
{
- my $n = scalar %list;
+ my $n = scalar (keys %list);
$max = $n if $n > $max;
return $n;
}
sub max
{
+ count();
return $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, version, flags)
#
sub add
{
my $parent = shift;
my $call = uc shift;
+ confess "Route::add trying to add $call to myself" if $call eq $parent->{call};
+ my $version = shift;
+ my $here = shift;
+
my $self = get($call);
if ($self) {
- $self->_addparent($parent->{call});
+ $self->_addparent($parent);
+ $parent->_addnode($self);
+ if ($self->{version} != $version || $self->{flags} != $here) {
+ $self->{version} = $version;
+ $self->{flags} = $here;
+ return $self;
+ }
return undef;
}
- $parent->_addnode($call);
- $self = $parent->new($call, @_);
+ $self = $parent->new($call, $version, $here);
+ $parent->_addnode($self);
return $self;
}
my $pref = shift;
# delete parent from this call's parent list
- my $pcall = $pref->{call};
- my $ref = $self->_delparent($pcall);
+ $pref->_delnode($self);
+ $self->_delparent($pref);
my @nodes;
+ my $ncall = $self->{call};
- # is this the last connection?
- $self->_del_users;
- unless (@$ref) {
- push @nodes, $self->del_nodes;
+ # is this the last connection, I have no parents anymore?
+ unless (@{$self->{parent}}) {
+ foreach my $rcall (@{$self->{nodes}}) {
+ next if grep $rcall eq $_, @_;
+ my $r = Route::Node::get($rcall);
+ push @nodes, $r->del($self, $ncall, @_) if $r;
+ }
+ $self->_del_users;
delete $list{$self->{call}};
+ push @nodes, $self;
}
- push @nodes, $self;
return @nodes;
}
+sub del_nodes
+{
+ my $parent = shift;
+ my @out;
+ foreach my $rcall (@{$parent->{nodes}}) {
+ my $r = get($rcall);
+ push @out, $r->del($parent, $parent->{call}, @_) if $r;
+ }
+ return @out;
+}
sub _del_users
{
$self->{users} = [];
}
-# remove all sub nodes from this parent
-sub del_nodes
-{
- my $self = shift;
- my @nodes;
-
- for (@{$self->{nodes}}) {
- next if $self->{call} eq $_;
- push @nodes, $self->del_node($_);
- }
- return @nodes;
-}
-
# add a user to this node
sub add_user
{
my $self = shift;
my $ucall = shift;
- $self->_adduser($ucall);
-
+
+ confess "Trying to add NULL User call to routing tables" unless $ucall;
+
my $uref = Route::User::get($ucall);
- return $uref ? () : (Route::User->new($ucall, $self->{call}, @_));
+ my @out;
+ if ($uref) {
+ push @out, $uref->addparent($self);
+ } else {
+ $uref = Route::User->new($ucall, $self->{call}, @_);
+ push @out, $uref;
+ }
+ $self->_adduser($uref);
+ $self->{usercount} = scalar @{$self->{users}};
+
+ return @out;
}
# delete a user from this node
sub del_user
{
my $self = shift;
- my $ucall = shift;
- my $ref = Route::User::get($ucall);
- $self->_deluser($ucall);
- return ($ref->del($self)) if $ref;
- return ();
+ 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;
+}
+
+sub usercount
+{
+ my $self = shift;
+ if (@_ && @{$self->{users}} == 0) {
+ $self->{usercount} = shift;
+ }
+ return $self->{usercount};
+}
+
+sub users
+{
+ my $self = shift;
+ return @{$self->{users}};
}
-# delete a node from this node (ie I am a parent)
-sub del_node
+sub nodes
{
my $self = shift;
- my $ncall = shift;
- $self->_delnode($ncall);
- my $ref = get($ncall);
- return ($ref->del($self)) if $ref;
- return ();
+ return @{$self->{nodes}};
+}
+
+sub parents
+{
+ my $self = shift;
+ return @{$self->{parent}};
+}
+
+sub rnodes
+{
+ my $self = shift;
+ my @out;
+ foreach my $call (@{$self->{nodes}}) {
+ next if grep $call eq $_, @_;
+ push @out, $call;
+ my $r = get($call);
+ push @out, $r->rnodes($call, @_) if $r;
+ }
+ return @out;
+}
+
+# return the differences in nodes between what we currently have and
+# the list proffered. Returns two refs one to a list of nodes to remove and
+# the other a list of nodes to add
+#
+# input is a list of callsigns (not refs)
+sub diff_nodes
+{
+ my $self = shift;
+ my $in = ref $_[0] ? shift : \@_;
+ my %del = map {($_, 1)} nodes($self);
+ my %in = map {($_, 1)} @$in;
+
+ # remove all the calls that are in both lists
+ for (@$in) {
+ delete $in{$_} if delete $del{$_};
+ }
+ return ([keys %del], [keys %in]);
+}
+
+# same as above but for users
+sub diff_users
+{
+ my $self = shift;
+ my $in = ref $_[0] ? shift : \@_;
+ my %del = map {($_, 1)} users($self);
+ my %in = map {($_, 1)} @$in;
+
+ # remove all the calls that are in both lists
+ for (@$in) {
+ delete $in{$_} if delete $del{$_};
+ }
+ return ([keys %del], [keys %in]);
}
sub new
my $self = $pkg->SUPER::new($call);
$self->{parent} = ref $pkg ? [ $pkg->{call} ] : [ ];
- $self->{version} = shift;
- $self->{flags} = shift;
+ $self->{version} = 0 || shift;
+ $self->{flags} = 0 || shift;
$self->{users} = [];
$self->{nodes} = [];
+ $self->{lid} = 0;
$list{$call} = $self;
{
my $call = shift;
$call = shift if ref $call;
- return $list{uc $call};
+ my $ref = $list{uc $call};
+ dbg("Failed to get Node $call" ) if !$ref && isdbg('routerr');
+ return $ref;
+}
+
+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 > 500) {
+ $self->{id} = $id;
+ return 1;
+ }
+ return 0;
}
sub _addparent
my $pkg = ref $self;
my $call = $self->{call} || "Unknown";
- dbg('route', "destroying $pkg with $call");
+ dbg("destroying $pkg with $call") if isdbg('routelow');
}
#
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;