X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=b6e959e7ddc23b5dcc8109347ff5552fd00d3af0;hb=f63d598af3f797b56b8d5e23ec4ff5254192eee9;hp=ca9b49226d0ec6d8365aac4de77bd7df89fa2f7b;hpb=4ed6b6d9556b4252b012766043c65dce1ed55f0c;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index ca9b4922..b6e959e7 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -33,6 +33,7 @@ use Route; use Route::Node; use Script; use DXProtHandle; +use DXCIDR; use strict; @@ -248,6 +249,7 @@ sub init $main::me->{version} = $main::version; $main::me->{build} = $main::build; $main::me->{do_pc9x} = 1; + $main::me->{hostname} = $main::clusteraddr; $main::me->update_pc92_next($pc92_short_update_period); $main::me->update_pc92_keepalive; } @@ -288,7 +290,9 @@ sub start # 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; Log('DXProt', "$call connected from $host"); @@ -430,9 +434,9 @@ sub normal my $sub = "handle_$pcno"; if ($self->can($sub)) { - $self->$sub($pcno, $line, $origin, @field); + $self->$sub($pcno, $line, $origin, \@field); } else { - $self->handle_default($pcno, $line, $origin, @field); + $self->handle_default($pcno, $line, $origin, \@field); } }