$cnum = 0;
$connect_timeout = 5;
-$disc_waittime = 3;
+$disc_waittime = 1.5;
our %delqueue;
my $dbg = isdbg('connll');
my ($pkg, $fn, $line) = caller if $dbg;
- if ($count > 2) {
+ 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;
$delqueue{$conn} = $conn; # save this connection until everything is finished
my $sock = $conn->{sock};
if ($sock) {
-
- # remove me from the active list
- my $call;
- if ($call = $conn->{call}) {
- my $ref = $conns{$call};
- delete $conns{$call} if $ref && $ref == $conn;
+ if ($sock->{buffer}) {
+ my $lth = length $sock->{buffer};
+ Mojo::IOLoop->timer($disc_waittime, sub {
+ dbg("Buffer contained $lth characters, coordinated for $disc_waittime secs, now disconnecting $call") if $dbg;
+ _close_it($conn);
+ });
+ } else {
+ dbg("Buffer empty, just close $call") if $dbg;
+ _close_it($conn);
}
-
- $conn->{delay} = Mojo::IOLoop->delay (
-# Mojo::IOLoop->delay (
- sub {
- my $delay = shift;
- 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;
-
} else {
dbg((ref $conn) . " socket missing on $conn->{call}") if $dbg;
_close_it($conn);
$sock->timeout(0);
$sock->start;
$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});