X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FMsg.pm;h=ba0e6b8eadf520d92f78ecde2219ae49bc903a1d;hb=8d4360134b5a83741dbd77ef99a56c2f1c40db05;hp=cd5dd051b8c384f0011fdd496335c2638d9f9570;hpb=511d83a615a5e65e85d7337c85280c2b6470a91b;p=spider.git

diff --git a/perl/Msg.pm b/perl/Msg.pm
index cd5dd051..ba0e6b8e 100644
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -61,14 +61,14 @@ sub set_error
 {
 	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
@@ -265,9 +265,8 @@ sub disconnect
 		}
 	}
 
-	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};
@@ -290,7 +289,7 @@ sub _send_stuff
 		}
 		if (defined $sock) {
 			$sock->write($data);
-			$total_out = $lth;
+			$total_out += $lth;
 		} else {
 			dbg("_send_stuff $call ending data ignored: $data");
 		}
@@ -379,6 +378,8 @@ sub _rcv {                     # Complement to _send
     my $sock = $conn->{sock};
     return unless defined($sock);
 
+	$total_in += length $msg;
+
 	my @lines;
 	if (isdbg('raw')) {
 		my $call = $conn->{call} || 'none';
@@ -411,16 +412,16 @@ sub _rcv {                     # Complement to _send
 
 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;
@@ -486,6 +487,10 @@ sub DESTROY
 	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');
 }