projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add CTY-3304
[spider.git]
/
perl
/
Route
/
Node.pm
diff --git
a/perl/Route/Node.pm
b/perl/Route/Node.pm
index 9c2b734e1b3bb867243c59a5a28b1ba37d3c577c..c700c496296ca554e77ad56e9db9a9da9c851754 100644
(file)
--- a/
perl/Route/Node.pm
+++ b/
perl/Route/Node.pm
@@
-19,20
+19,20
@@
use vars qw(%list %valid @ISA $max $filterdef $obscount);
@ISA = qw(Route);
%valid = (
@ISA = qw(Route);
%valid = (
- parent => '0,Parent Calls,parray',
- nodes => '0,Nodes,parray',
- users => '0,Users,parray',
- usercount => '0,User Count',
- version => '0,Version',
+ K => '9,Seen on PC92K,yesno',
+ PC92C_dxchan => '9,PC92C hops,phash',
build => '0,Build',
build => '0,Build',
+ do_pc9x => '0,Uses pc9x,yesno',
handle_xml => '0,Using XML,yesno',
handle_xml => '0,Using XML,yesno',
- last
msg => '0,Last Route Msg,atime
',
+ last
_PC92C => '9,Last PC92C
',
lastid => '0,Last Route MsgID',
lastid => '0,Last Route MsgID',
-
do_pc9x => '0,Uses pc9x,yesno
',
-
via_pc92 => '0,Came in via pc92,yesno
',
+
lastmsg => '0,Last Route Msg,atime
',
+
nodes => '0,Nodes,parray
',
obscount => '0,Obscount',
obscount => '0,Obscount',
- last_PC92C => '9,Last PC92C',
- PC92C_dxchan => '9,Channel of PC92C,phash',
+ usercount => '0,User Count',
+ users => '0,Users,parray',
+ version => '0,Version',
+ via_pc92 => '0,In via pc92?,yesno',,
);
$filterdef = $Route::filterdef;
);
$filterdef = $Route::filterdef;
@@
-78,6
+78,7
@@
sub add
}
$self = $parent->new($call, @_);
$parent->_addnode($self);
}
$self = $parent->new($call, @_);
$parent->_addnode($self);
+ dbg("CLUSTER: node $call added") if isdbg('cluster');
return $self;
}
return $self;
}
@@
-109,6
+110,7
@@
sub del
$self->_del_users;
delete $list{$ncall};
push @nodes, $self;
$self->_del_users;
delete $list{$ncall};
push @nodes, $self;
+ dbg("CLUSTER: node $ncall deleted") if isdbg('cluster');
}
return @nodes;
}
}
return @nodes;
}
@@
-166,6
+168,8
@@
sub add_user
{
my $self = shift;
my $ucall = shift;
{
my $self = shift;
my $ucall = shift;
+ my $here = shift;
+ my $ip = shift;
confess "Trying to add NULL User call to routing tables" unless $ucall;
confess "Trying to add NULL User call to routing tables" unless $ucall;
@@
-174,7
+178,7
@@
sub add_user
if ($uref) {
@out = $uref->addparent($self);
} else {
if ($uref) {
@out = $uref->addparent($self);
} else {
- $uref = Route::User->new($ucall, $self->{call},
@_
);
+ $uref = Route::User->new($ucall, $self->{call},
$here, $ip
);
@out = $uref;
}
$self->_adduser($uref);
@out = $uref;
}
$self->_adduser($uref);
@@
-200,6
+204,14
@@
sub del_user
return @out;
}
return @out;
}
+# is a user on this node
+sub is_user
+{
+ my $self = shift;
+ my $call = shift;
+ return scalar grep {$_ eq $call} @{$self->{users}};
+}
+
sub usercount
{
my $self = shift;
sub usercount
{
my $self = shift;
@@
-221,12
+233,6
@@
sub nodes
return @{$self->{nodes}};
}
return @{$self->{nodes}};
}
-sub parents
-{
- my $self = shift;
- return @{$self->{parent}};
-}
-
sub rnodes
{
my $self = shift;
sub rnodes
{
my $self = shift;
@@
-273,6
+279,7
@@
sub calc_config_changes
return (\@dnodes, \@dusers, \@nnodes, \@nusers);
}
return (\@dnodes, \@dusers, \@nnodes, \@nusers);
}
+
sub new
{
my $pkg = shift;
sub new
{
my $pkg = shift;
@@
-287,6
+294,8
@@
sub new
$self->{users} = [];
$self->{nodes} = [];
$self->{PC92C_dxchan} = {};
$self->{users} = [];
$self->{nodes} = [];
$self->{PC92C_dxchan} = {};
+ my $ip = shift;
+ $self->{ip} = $ip if defined $ip;
$self->reset_obs; # by definition
$list{$call} = $self;
$self->reset_obs; # by definition
$list{$call} = $self;
@@
-299,7
+308,7
@@
sub get
my $call = shift;
$call = shift if ref $call;
my $ref = $list{uc $call};
my $call = shift;
$call = shift if ref $call;
my $ref = $list{uc $call};
- dbg("Failed to get Node $call" ) if !$ref && isdbg('routerr');
+ dbg("
ROUTE:
Failed to get Node $call" ) if !$ref && isdbg('routerr');
return $ref;
}
return $ref;
}
@@
-390,7
+399,7
@@
sub DESTROY
my $pkg = ref $self;
my $call = $self->{call} || "Unknown";
my $pkg = ref $self;
my $call = $self->{call} || "Unknown";
- dbg("destroying $pkg with $call") if isdbg('routelow');
+ dbg("
ROUTE:
destroying $pkg with $call") if isdbg('routelow');
}
#
}
#