some final warnings removed

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 7cf460cc0d7d9a9b3319d0945b815fe8d3c49f56..a5d3b4253f8882659dc8eeea48eac8842a837694 100644 (file)
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -172,7 +172,7 @@ if ($freq =~ /^69/ || $localonly) {
 } else {
        # send orf to the users
        $ipaddr ||= $main::mycall;      # emergency backstop
-       my $spot = DXProt::pc61($spotter, $freq, $spotted, $line,  $ipaddr);
+       my $spot = DXProt::pc61($spotter, $freq, $spotted, unpad($line),  $ipaddr);
        
        $self->dx_spot(undef, undef, @spot);
        if ($self->isslugged) {

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 1ea3ebc97bd2cb1b3326eedc830ffe4ffdeb2737..23c17f0c34177c4913e07e73d86532de462e1a13 100644 (file)
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -1560,7 +1560,6 @@ sub _decode_pc92_call
        my $ip;
        my $version = $part[1] || 0;
        my $build = $part[2] || 0;
-       $build =~ s/\D+//g;
        my $ip = $part[3] || '';
        
        if ($version =~ /[,.]/) {
@@ -1570,8 +1569,13 @@ sub _decode_pc92_call
        $version =~ s/\D+//g;
        $build =~ s/^0\.//;
        $build =~ s/\D+//g;
-       $ip =~ s/,/:/g if $ip;
-       return ($call, $is_node, $is_extnode, $here, $version, $build, $ip);
+       if ($ip) {
+        $ip =~ s/,/:/g;
+        $ip =~ s/^::ffff://i;
+    }
+       dbg("$icall = '" . join("', '", $call, $is_node, $is_extnode, $here, $version, $build, $ip) . "'") if isdbg('pc92');
+
+       return ($call, $is_node, $is_extnode, $here, $version+0, $build+0, $ip);
 }
 
 # decode a pc92 call: flag call : version : build
@@ -1602,6 +1606,7 @@ sub _encode_pc92_call
                $ip =~ s/:/,/g;
                $extra .= ':' . $ip;
        }
+
        return "$flag$call$extra";
 }
 
@@ -1618,11 +1623,6 @@ sub _add_thingy
        my ($call, $is_node, $is_extnode, $here, $version, $build, $ip) = @$s;
        my @rout;
 
-       # remove spurious IPV6 prefix on IPV4 addresses
-       $ip =~ s/^::ffff:// if $ip;
-       $build ||= 0;
-       $version ||= 0;
-
        if ($call) {
                my $ncall = $parent->call;
                if ($ncall ne $call) {

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 51272d743420eea029be9a8d0b9e04bc77e029a1..be6dfb4d308e2152e158000a9ddb41582bcc02df 100644 (file)
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -222,7 +222,7 @@ sub phash
        my $ref = shift;
        my $out;
 
-       while (my $k = sort keys %$ref) {
+       foreach my $k (sort keys %$ref) {
                $out .= "${k}=>$ref->{$k}, ";
        }
        $out =~ s/, $// if $out;

diff --git a/perl/Msg.pm b/perl/Msg.pm
index 8992d3c108b85d94886bd3b2d0bf213740eeec94..9a6f8d1f06894cd25d749afc9d2bac8019fd132d 100644 (file)
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -133,6 +133,7 @@ sub peerhost
                $conn->{peerhost} ||= $conn->{sock}->handle->peerhost if $conn->{sock};
                $conn->{peerhost} ||= 'UNKNOWN';
        }
+       $conn->{peerhost} =~ s/^::ffff://;
        return $conn->{peerhost};
 }