More fixes for get_peerinfo().

1 files changed, 9 insertions, 8 deletions

diff --git a/sitesummary-collector.cgi b/sitesummary-collector.cgi
index 38238ea..1ba4607 100644
--- a/sitesummary-collector.cgi
+++ b/sitesummary-collector.cgi
@@ -142,12 +142,13 @@ sub process_entry {
 
 sub get_peerinfo {
     my $sockethandle = shift;
-    my ($peeripaddr, $peername) = ("", "");
+    my ($peeripstr, $peername) = ("", "");
 
     if ($ENV{'REMOTE_ADDR'}) { # CGI variable
-        $peeripaddr = $ENV{'REMOTE_ADDR'};
-        $peeripaddr =~ m/(\d+).(\d+).(\d+).(\d+)/; # Untaint
-        $peeripaddr = inet_aton("$1.$2.$3.$4");
+        $peeripstr = $ENV{'REMOTE_ADDR'};
+        $peeripstr =~ m/(\d+).(\d+).(\d+).(\d+)/; # Untaint
+        $peeripstr = "$1.$2.$3.$4";
+        $peeripaddr = inet_aton($peeripstr);
         $peername = gethostbyaddr($peeripaddr, AF_INET);
     } elsif (my $sockaddr = getpeername($sockethandle)) {
         my $peerport;
@@ -155,12 +156,12 @@ sub get_peerinfo {
         $peername = gethostbyaddr($peeripaddr, AF_INET);
     } else {
         # Running on the command line, use test host
-        $peeripaddr = "127.0.0.1";
+        $peeripstr = "127.0.0.1";
         $peername = "localhost";
     }
     if ("" eq $peername) {
-        syslog('warning', "%s", "client without DNS entry connected from \[$peeripaddr\]");
-        $peername = "$peeripaddr";
+        syslog('warning', "%s", "client without DNS entry connected from \[$peeripstr\]");
+        $peername = "$peeripstr";
     }
-    return ($peeripaddr, $peername);
+    return ($peeripstr, $peername);
 }