{
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; };
}
}
- if (defined($sock)) {
- $sock->close;
- }
+ $sock->close_gracefully if defined $sock && $sock->can('close_gracefully');
+ undef $sock;
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;
my $call = $conn->{call} || 'unallocated';
my $host = $conn->{peerhost} || '';
my $port = $conn->{peerport} || '';
+ my $sock = $conn->{sock};
+
+ $sock->close_gracefully if defined $sock && $sock->can('close_gracefully');
+
$noconns--;
dbg((ref $conn) . " Connection $conn->{cnum} $call [$host $port] being destroyed (total $noconns)") if isdbg('connll');
}