projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix longstanding possibility of a crash on new user.
[spider.git]
/
perl
/
Route
/
Node.pm
diff --git
a/perl/Route/Node.pm
b/perl/Route/Node.pm
index d1b0b1647fd304ff048ab4b7e150d64fa48e6e2d..3fa7a09750402ec49db1e5c7d3f28745478519cd 100644
(file)
--- a/
perl/Route/Node.pm
+++ b/
perl/Route/Node.pm
@@
-3,24
+3,19
@@
#
# Copyright (c) 2001 Dirk Koopman G1TLH
#
#
# Copyright (c) 2001 Dirk Koopman G1TLH
#
-#
$Id$
-#
+#
+#
package Route::Node;
use DXDebug;
use Route;
use Route::User;
package Route::Node;
use DXDebug;
use Route;
use Route::User;
+use DXUtil;
use strict;
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;
-
-use vars qw(%list %valid @ISA $max $filterdef);
+use vars qw(%list %valid @ISA $max $filterdef $obscount);
@ISA = qw(Route);
%valid = (
@ISA = qw(Route);
%valid = (
@@
-29,15
+24,21
@@
use vars qw(%list %valid @ISA $max $filterdef);
users => '0,Users,parray',
usercount => '0,User Count',
version => '0,Version',
users => '0,Users,parray',
usercount => '0,User Count',
version => '0,Version',
+ build => '0,Build',
handle_xml => '0,Using XML,yesno',
lastmsg => '0,Last Route Msg,atime',
lastid => '0,Last Route MsgID',
handle_xml => '0,Using XML,yesno',
lastmsg => '0,Last Route Msg,atime',
lastid => '0,Last Route MsgID',
- do_pc92 => '0,Uses pc92,yesno',
+ do_pc9x => '0,Uses pc9x,yesno',
+ via_pc92 => '0,Came in via pc92,yesno',
+ obscount => '0,Obscount',
+ last_PC92C => '9,Last PC92C',
+ PC92C_dxchan => '9,Channel of PC92C',
);
$filterdef = $Route::filterdef;
%list = ();
$max = 0;
);
$filterdef = $Route::filterdef;
%list = ();
$max = 0;
+$obscount = 3;
sub count
{
sub count
{
@@
-61,7
+62,7
@@
sub max
# object with that callsign. The upper layers are expected to do something
# sensible with this!
#
# 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
#
sub add
@@
-97,7
+98,7
@@
sub del
$self->_delparent($pref);
my @nodes;
my $ncall = $self->{call};
$self->_delparent($pref);
my @nodes;
my $ncall = $self->{call};
-
+
# is this the last connection, I have no parents anymore?
unless (@{$self->{parent}}) {
foreach my $rcall (@{$self->{nodes}}) {
# is this the last connection, I have no parents anymore?
unless (@{$self->{parent}}) {
foreach my $rcall (@{$self->{nodes}}) {
@@
-112,6
+113,21
@@
sub del
return @nodes;
}
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;
sub del_nodes
{
my $parent = shift;
@@
-161,7
+177,7
@@
sub del_user
my $self = shift;
my $ref = shift;
my @out;
my $self = shift;
my $ref = shift;
my @out;
-
+
if ($ref) {
@out = $self->_deluser($ref);
$ref->del($self);
if ($ref) {
@out = $self->_deluser($ref);
$ref->del($self);
@@
-212,10
+228,10
@@
sub rnodes
return @out;
}
return @out;
}
-# this takes in a list of node and user calls (not references) from
+# 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
# 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.
+# and things that have been added.
sub calc_config_changes
{
my $self = shift;
sub calc_config_changes
{
my $self = shift;
@@
-223,11
+239,25
@@
sub calc_config_changes
my %users = map {$_ => 1} @{$self->{users}};
my $cnodes = shift;
my $cusers = shift;
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;
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);
}
return (\@dnodes, \@dusers, \@nnodes, \@nusers);
}
@@
-235,19
+265,20
@@
sub new
{
my $pkg = shift;
my $call = uc shift;
{
my $pkg = shift;
my $call = uc shift;
-
+
confess "already have $call in $pkg" if $list{$call};
confess "already have $call in $pkg" if $list{$call};
-
+
my $self = $pkg->SUPER::new($call);
$self->{parent} = ref $pkg ? [ $pkg->{call} ] : [ ];
my $self = $pkg->SUPER::new($call);
$self->{parent} = ref $pkg ? [ $pkg->{call} ] : [ ];
- $self->{version} = shift || 5
000
;
+ $self->{version} = shift || 5
401
;
$self->{flags} = shift || Route::here(1);
$self->{users} = [];
$self->{nodes} = [];
$self->{lastid} = {};
$self->{flags} = shift || Route::here(1);
$self->{users} = [];
$self->{nodes} = [];
$self->{lastid} = {};
-
+ $self->reset_obs; # by definition
+
$list{$call} = $self;
$list{$call} = $self;
-
+
return $self;
}
return $self;
}
@@
-303,12
+334,25
@@
sub _deluser
return $self->_dellist('users', @_);
}
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";
sub DESTROY
{
my $self = shift;
my $pkg = ref $self;
my $call = $self->{call} || "Unknown";
-
+
dbg("destroying $pkg with $call") if isdbg('routelow');
}
dbg("destroying $pkg with $call") if isdbg('routelow');
}
@@
-322,7
+366,7
@@
sub AUTOLOAD
my $name = $AUTOLOAD;
return if $name =~ /::DESTROY$/;
$name =~ s/^.*:://o;
my $name = $AUTOLOAD;
return if $name =~ /::DESTROY$/;
$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
confess "Non-existant field '$AUTOLOAD'" unless $valid{$name} || $Route::valid{$name};
# this clever line of code creates a subroutine which takes over from autoload