projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add CTY-2615 prefixes
[spider.git]
/
perl
/
Route
/
Node.pm
diff --git
a/perl/Route/Node.pm
b/perl/Route/Node.pm
index 123f21f9f2e952d4c74a06a69ddf8c8544afa212..89e84d4072b1910b83b6b41d05c2d50431df2b4e 100644
(file)
--- a/
perl/Route/Node.pm
+++ b/
perl/Route/Node.pm
@@
-33,6
+33,7
@@
use vars qw(%list %valid @ISA $max $filterdef $obscount);
obscount => '0,Obscount',
last_PC92C => '9,Last PC92C',
PC92C_dxchan => '9,Channel of PC92C,phash',
obscount => '0,Obscount',
last_PC92C => '9,Last PC92C',
PC92C_dxchan => '9,Channel of PC92C,phash',
+ ip => '0,IP Address',
);
$filterdef = $Route::filterdef;
);
$filterdef = $Route::filterdef;
@@
-78,6
+79,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
+111,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
+169,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
+179,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);
@@
-281,6
+286,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;
@@
-293,7
+300,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;
}
@@
-384,7
+391,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');
}
#
}
#