projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add localhost client aliasing on spots and PC92A
[spider.git]
/
perl
/
DXProt.pm
diff --git
a/perl/DXProt.pm
b/perl/DXProt.pm
index 4886a7ff3ce736ef8876b887c9526fc7be462d6b..ac675f7cafefa6496064a65172c27a9a6bc32e88 100644
(file)
--- a/
perl/DXProt.pm
+++ b/
perl/DXProt.pm
@@
-33,6
+33,7
@@
use Route;
use Route::Node;
use Script;
use DXProtHandle;
use Route::Node;
use Script;
use DXProtHandle;
+use DXCIDR;
use Time::HiRes qw(gettimeofday tv_interval);
use DXSubprocess;
use Time::HiRes qw(gettimeofday tv_interval);
use DXSubprocess;
@@
-297,9
+298,9
@@
sub start
# log it
my $host = $self->{conn}->peerhost;
$host ||= "AGW Port #$self->{conn}->{agwport}" if exists $self->{conn}->{agwport};
# log it
my $host = $self->{conn}->peerhost;
$host ||= "AGW Port #$self->{conn}->{agwport}" if exists $self->{conn}->{agwport};
+ $host ||= $host if is_ipaddr($host);
$host ||= "unknown";
$self->{hostname} = $host if is_ipaddr($host);
$host ||= "unknown";
$self->{hostname} = $host if is_ipaddr($host);
-
Log('DXProt', "$call connected from $host");
# remember type of connection
Log('DXProt', "$call connected from $host");
# remember type of connection
@@
-428,14
+429,15
@@
sub normal
}
}
}
}
+ my $origin = $self->{call};
+
if (defined &Local::pcprot) {
my $r;
if (defined &Local::pcprot) {
my $r;
- eval { $r = Local::pcprot($self, $pcno, $line, @field); };
+ eval { $r = Local::pcprot($self, $pcno, $line,
$origin, \
@field); };
return if $r; # i.e don't process it
}
# send it out for processing
return if $r; # i.e don't process it
}
# send it out for processing
- my $origin = $self->{call};
no strict 'subs';
my $sub = "handle_$pcno";
no strict 'subs';
my $sub = "handle_$pcno";
@@
-1080,7
+1082,7
@@
sub get_hops
{
my $pcno = shift;
my $hops = $DXProt::hopcount{$pcno};
{
my $pcno = shift;
my $hops = $DXProt::hopcount{$pcno};
- $hops = $DXProt::def_hopcount
if !
$hops;
+ $hops = $DXProt::def_hopcount
unless
$hops;
return "H$hops";
}
return "H$hops";
}