X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FMsg.pm;h=ceace3ca774c62603b22f2ab8577f8907c4af5f4;hb=0bca43685143e42a93bdcdaa9e34e115b22552e9;hp=9251a1208f250c004217d0053a28d29db68a67e0;hpb=fd2d8314dd4fcdd7997ef80e7740702e0bad618d;p=spider.git

diff --git a/perl/Msg.pm b/perl/Msg.pm
index 9251a120..ceace3ca 100644
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -205,6 +205,7 @@ sub peerhost
 	$conn->{peerhost} ||= 'ax25' if $conn->ax25;
 	$conn->{peerhost} ||= $conn->{sock}->peerhost if $conn->{sock} && $conn->{sock}->isa('IO::Socket::INET');
 	$conn->{peerhost} ||= 'UNKNOWN';
+	$conn->{peerhost} =~ s/^::ffff://;
 	return $conn->{peerhost};
 }
 
@@ -506,9 +507,9 @@ sub dequeue
 	my $conn = shift;
 	return if $conn->{disconnecting};
 	
-	if ($conn->{msg} =~ /\n/) {
-		my @lines = split /\r?\n/, $conn->{msg};
-		if ($conn->{msg} =~ /\n$/) {
+	if ($conn->{msg} =~ /\cJ/) {
+		my @lines = split /\cM?\cJ/, $conn->{msg};
+		if ($conn->{msg} =~ /\cM?\cJ$/) {
 			delete $conn->{msg};
 		} else {
 			$conn->{msg} = pop @lines;