projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add logging of PC92A ip addresses
[spider.git]
/
perl
/
Route
/
Node.pm
diff --git
a/perl/Route/Node.pm
b/perl/Route/Node.pm
index 23e293820295f6c8f4379373e8a85ae5c0481181..617a0aed43a0718c47cebaf5ea28413d95165a39 100644
(file)
--- a/
perl/Route/Node.pm
+++ b/
perl/Route/Node.pm
@@
-32,7
+32,8
@@
use vars qw(%list %valid @ISA $max $filterdef $obscount);
via_pc92 => '0,Came in via pc92,yesno',
obscount => '0,Obscount',
last_PC92C => '9,Last PC92C',
via_pc92 => '0,Came in via pc92,yesno',
obscount => '0,Obscount',
last_PC92C => '9,Last PC92C',
- PC92C_dxchan => '9,Channel of PC92C',
+ PC92C_dxchan => '9,Channel of PC92C,phash',
+ ip => '0,IP Address',
);
$filterdef = $Route::filterdef;
);
$filterdef = $Route::filterdef;
@@
-166,6
+167,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
+177,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);
@@
-221,12
+224,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;
@@
-286,7
+283,9
@@
sub new
$self->{flags} = shift || Route::here(1);
$self->{users} = [];
$self->{nodes} = [];
$self->{flags} = shift || Route::here(1);
$self->{users} = [];
$self->{nodes} = [];
- $self->{PC92C_dxchan} = '';
+ $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;
@@
-371,6
+370,19
@@
sub measure_pc9x_t
}
}
}
}
+sub PC92C_dxchan
+{
+ my $parent = shift;
+ my $call = shift;
+ my $hops = shift;
+ if ($call && $hops) {
+ $hops =~ s/^H//;
+ $parent->{PC92C_dxchan}->{$call} = $hops;
+ return;
+ }
+ return (%{$parent->{PC92C_dxchan}});
+}
+
sub DESTROY
{
my $self = shift;
sub DESTROY
{
my $self = shift;