remove any leading ::ffff: on ipv4 addresses

[spider.git] / perl / Msg.pm

diff --git a/perl/Msg.pm b/perl/Msg.pm
index e3385d9166585436dad106bd94e8b94aa6b0c411..f3642d59b79dfabd3bbe0b7f00e7d514421981ba 100644 (file)
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -177,9 +177,18 @@ sub connect {
        
        my $sock;
        $conn->{sock} = $sock = Mojo::IOLoop::Client->new;
-       $sock->on(connect => sub {$conn->_on_connect($_[1])} );
-       $sock->on(error => sub {&{$conn->{eproc}}($conn, $_[1]) if exists $conn->{eproc}; $conn->disconnect});
-       $sock->on(close => sub {$conn->disconnect});
+       $sock->on(connect => sub {
+                                 $conn->_on_connect($_[1])
+                         } );
+       $sock->on(error => sub {
+                                 &{$conn->{eproc}}($conn, $_[1]) if exists $conn->{eproc};
+                                 delete $conn->{sock};
+                                 $conn->disconnect
+                         });
+       $sock->on(close => sub {
+                                 delete $conn->{sock};
+                                 $conn->disconnect}
+                        );
 
        # copy any args like on_connect, on_disconnect etc
        while (my ($k, $v) = each %args) {
@@ -244,13 +253,27 @@ sub disconnect
 {
        my $conn = shift;
        my $count = $conn->{disconnecting}++;
-       if (isdbg('connll')) {
-               my ($pkg, $fn, $line) = caller;
-               dbg((ref $conn) . "::disconnect on call $conn->{call} attempt $conn->{disconnecting} called from ${pkg}::${fn} line $line ");
+       my $dbg = isdbg('connll');
+       my ($pkg, $fn, $line) = caller if $dbg;
+
+       if ($count >= 2) {
+               dbg((ref $conn) . "::disconnect on call $conn->{call} attempt $conn->{disconnecting} called from ${pkg}::${fn} line $line FORCING CLOSE ") if $dbg;
+               _close_it($conn);
+               return;
        }
+       dbg((ref $conn) . "::disconnect on call $conn->{call} attempt $conn->{disconnecting} called from ${pkg}::${fn} line $line ") if $dbg;
        return if $count;
 
-       
+       # remove this conn from the active queue
+       # be careful to delete the correct one
+       my $call;
+       if ($call = $conn->{call}) {
+               my $ref = $conns{$call};
+               delete $conns{$call} if $ref && $ref == $conn;
+       }
+       $call ||= 'unallocated';
+
+       $delqueue{$conn} = $conn; # save this connection until everything is finished
        my $sock = $conn->{sock};
        if ($sock) {
 
@@ -260,25 +283,26 @@ sub disconnect
                        my $ref = $conns{$call};
                        delete $conns{$call} if $ref && $ref == $conn;
                }
+
                $conn->{delay} = Mojo::IOLoop->delay (
 #                               Mojo::IOLoop->delay (
                                                                                          sub {
                                                                                                  my $delay = shift;
-                                                                                                 dbg("before drain $call");
+                                                                                                 dbg("before drain $call") if $dbg;
                                                                                                  $sock->on(drain => $delay->begin);
                                                                                                  1;
                                                                                          },
                                                                                          sub {
                                                                                                  my $delay = shift;
+                                                                                                 dbg("before _close_it $call") if $dbg;
                                                                                                  _close_it($conn);
                                                                                                  1;
                                                                                          }
                                                                                         );
                $conn->{delay}->wait;
-               
-               $delqueue{$conn} = $conn; # save this connection until everything is finished
+
        } else {
-               dbg((ref $conn) . " socket missing on $conn->{call}") if isdbg('connll');
+               dbg((ref $conn) . " socket missing on $conn->{call}") if $dbg;
                _close_it($conn);
        }
 }
@@ -290,18 +314,13 @@ sub _close_it
        $conn->{state} = 'E';
        $conn->{timeout}->del if $conn->{timeout};
 
+       my $call = $conn->{call};
+
        if (isdbg('connll')) {
                my ($pkg, $fn, $line) = caller;
                dbg((ref $conn) . "::_close_it on call $conn->{call} attempt $conn->{disconnecting} called from ${pkg}::${fn} line $line ");
        }
 
-       # be careful to delete the correct one
-       my $call;
-       if ($call = $conn->{call}) {
-               my $ref = $conns{$call};
-               delete $conns{$call} if $ref && $ref == $conn;
-       }
-       $call ||= 'unallocated';
 
        dbg((ref $conn) . " Connection $conn->{cnum} $call starting to close") if isdbg('connll');
        
@@ -478,9 +497,11 @@ sub new_client {
        $sock->on(read => sub {$conn->_rcv($_[1])});
        $sock->timeout(0);
        $sock->start;
-       dbg((ref $conn) . "accept $conn->{cnum} from $conn->{peerhost} $conn->{peerport}") if isdbg('connll');
-
-       my ($rproc, $eproc) = &{$server_conn->{rproc}} ($conn, $conn->{peerhost} = $handle->peerhost, $conn->{peerport} = $handle->peerport);
+       $conn->{peerhost} = $handle->peerhost;
+       $conn->{peerhost} =~ s|^::ffff:||; # chop off leading pseudo IPV6 stuff on dual stack listeners
+       $conn->{peerport} = $handle->peerport;
+       dbg((ref $conn) . " accept $conn->{cnum} from $conn->{peerhost}:$conn->{peerport}") if isdbg('connll');
+       my ($rproc, $eproc) = &{$server_conn->{rproc}} ($conn, $conn->{peerhost}, $conn->{peerport});
        $conn->{sort} = 'Incoming';
        if ($eproc) {
                $conn->{eproc} = $eproc;