X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FMsg.pm;h=ad09c85da0f784d98b12634f01ad1a0e421144d5;hb=772dc67533220a11f5ff6962abff8ea46d247ece;hp=bad84a2c4f2277d7b117999f5fbe7e55e6aa9a16;hpb=28b4b03213440a9951d68da6ef1f5c17a327e002;p=spider.git

diff --git a/perl/Msg.pm b/perl/Msg.pm
index bad84a2c..ad09c85d 100644
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -120,9 +120,11 @@ sub ax25
 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};
 }
 
@@ -136,8 +138,8 @@ sub _on_connect
 	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; };