use DXDebug;
use Timer;
-use vars qw($now %conns $noconns $cnum $total_in $total_out $connect_timeout);
+use vars qw($now %conns $noconns $cnum $total_in $total_out $connect_timeout $disc_waittime);
$total_in = $total_out = 0;
$cnum = 0;
$connect_timeout = 5;
+$disc_waittime = 3;
+
+our %delqueue;
#
#-----------------------------------------------------------------
{
my $conn = shift;
my $callback = shift;
- $conn->{sock}->on(error => sub {$callback->($conn, $_[1]);});
+ $conn->{sock}->on(error => sub {$callback->($_[1]);});
}
sub set_on_eof
{
my $conn = shift;
my $callback = shift;
- $conn->{sock}->on(close => sub {$callback->($conn);});
+ $conn->{sock}->on(close => sub {$callback->()});
}
sub set_rproc
sub peerhost
{
my $conn = shift;
- $conn->{peerhost} ||= 'ax25' if $conn->ax25;
- $conn->{peerhost} ||= $conn->{sock}->handle->peerhost if $conn->{sock};
- $conn->{peerhost} ||= 'UNKNOWN';
+ unless ($conn->{peerhost}) {
+ $conn->{peerhost} ||= 'ax25' if $conn->ax25;
+ $conn->{peerhost} ||= $conn->{sock}->handle->peerhost if $conn->{sock};
+ $conn->{peerhost} ||= 'UNKNOWN';
+ }
return $conn->{peerhost};
}
undef $conn->{sock};
my $sock = $conn->{sock} = Mojo::IOLoop::Stream->new($handle);
$sock->on(read => sub {$conn->_rcv($_[1]);} );
- $sock->on(error => sub {$conn->disconnect;});
- $sock->on(close => sub {$conn->disconnect;});
+ $sock->on(error => sub {delete $conn->{sock}; $conn->disconnect;});
+ $sock->on(close => sub {delete $conn->{sock}; $conn->disconnect;});
$sock->timeout(0);
$sock->start;
$conn->{peerhost} = eval { $handle->peerhost; };
return $pid;
}
-sub disconnect
+sub disconnect
{
- my $conn = shift;
- return if exists $conn->{disconnecting};
+ 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 ");
+ }
+ return if $count;
- $conn->{disconnecting} = 1;
+
+ 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;
+ }
+ $conn->{delay} = Mojo::IOLoop->delay (
+# Mojo::IOLoop->delay (
+ sub {
+ my $delay = shift;
+ dbg("before drain $call");
+ $sock->on(drain => $delay->begin);
+ 1;
+ },
+ sub {
+ my $delay = shift;
+ _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');
+ _close_it($conn);
+ }
+}
+
+sub _close_it
+{
+ my $conn = shift;
my $sock = delete $conn->{sock};
$conn->{state} = 'E';
$conn->{timeout}->del if $conn->{timeout};
+ 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}) {
delete $conns{$call} if $ref && $ref == $conn;
}
$call ||= 'unallocated';
- dbg((ref $conn) . " Connection $conn->{cnum} $call disconnected") if isdbg('connll');
+
+ dbg((ref $conn) . " Connection $conn->{cnum} $call starting to close") if isdbg('connll');
if ($conn->{on_disconnect}) {
&{$conn->{on_disconnect}}($conn);
}
+ if ($sock) {
+ dbg((ref $conn) . " Connection $conn->{cnum} $call closing gracefully") if isdbg('connll');
+ $sock->close_gracefully;
+ }
+
# get rid of any references
for (keys %$conn) {
if (ref($conn->{$_})) {
}
}
- if (defined($sock)) {
- $sock->close_gracefully;
- }
+ delete $delqueue{$conn}; # finally remove the $conn
unless ($main::is_win) {
kill 'TERM', $conn->{pid} if exists $conn->{pid};
my $conn = shift;
my $rq = $conn->{outqueue};
my $sock = $conn->{sock};
+ return unless defined $sock;
+ return if $conn->{disconnecting};
+
while (@$rq) {
my $data = shift @$rq;
my $lth = length $data;
}
if (defined $sock) {
$sock->write($data);
- $total_out = $lth;
+ $total_out += $lth;
} else {
dbg("_send_stuff $call ending data ignored: $data");
}
my $msg = shift;
my $sock = $conn->{sock};
return unless defined($sock);
+ return if $conn->{disconnecting};
+
+ $total_in += length $msg;
my @lines;
if (isdbg('raw')) {
sub new_client {
my $server_conn = shift;
- my $client = shift;
+ my $handle = shift;
my $conn = $server_conn->new($server_conn->{rproc});
- my $sock = $conn->{sock} = Mojo::IOLoop::Stream->new($client);
+ my $sock = $conn->{sock} = Mojo::IOLoop::Stream->new($handle);
$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} = $client->peerhost, $conn->{peerport} = $client->peerport);
+ my ($rproc, $eproc) = &{$server_conn->{rproc}} ($conn, $conn->{peerhost} = $handle->peerhost, $conn->{peerport} = $handle->peerport);
$conn->{sort} = 'Incoming';
if ($eproc) {
$conn->{eproc} = $eproc;
sub DESTROY
{
my $conn = shift;
+ my $call = $conn->{call} || 'unallocated';
+
+ if (isdbg('connll')) {
+ my ($pkg, $fn, $line) = caller;
+ dbg((ref $conn) . "::DESTROY on call $call called from ${pkg}::${fn} line $line ");
+
+ }
+
my $call = $conn->{call} || 'unallocated';
my $host = $conn->{peerhost} || '';
my $port = $conn->{peerport} || '';
+ my $sock = $conn->{sock};
+
+ if ($sock) {
+ $sock->close_gracefully;
+ }
+
$noconns--;
dbg((ref $conn) . " Connection $conn->{cnum} $call [$host $port] being destroyed (total $noconns)") if isdbg('connll');
}