X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FExtMsg.pm;h=f3f473ab7cb776b5cbd932f74e7e65edb36c5743;hb=23b5ee57c8db6a3269d41bf11f2264c074780b88;hp=0ca2de83c6f5d367a67fbb4dc87d0267372b84f0;hpb=ab811a0c902225075a9bd69749f65594079433a9;p=spider.git

diff --git a/perl/ExtMsg.pm b/perl/ExtMsg.pm
index 0ca2de83..f3f473ab 100644
--- a/perl/ExtMsg.pm
+++ b/perl/ExtMsg.pm
@@ -72,7 +72,7 @@ sub dequeue
 	my $conn = shift;
 	my $msg;
 
-	if ($conn->{csort} eq 'ax25' && exists $conn->{msg}) {
+	if ($conn->ax25 && exists $conn->{msg}) {
 		$conn->{msg} =~ s/\cM/\cJ/g;
 	}
 	if ($conn->{state} eq 'WC') {
@@ -153,7 +153,11 @@ sub to_connected
 	delete $conn->{cmd};
 	$conn->{timeout}->del if $conn->{timeout};
 	delete $conn->{timeout};
-	$conn->nolinger unless $conn->isa('AGWMsg') || $conn->isa('BPQMsg');
+	$conn->{csort} = $sort;
+	unless ($conn->ax25) {
+		eval {$conn->{peerhost} = $conn->{sock}->peerhost};
+		$conn->nolinger;
+	}
 	&{$conn->{rproc}}($conn, "$dir$call|$sort");
 	$conn->_send_file("$main::data/connected") unless $conn->{outgoing};
 }
@@ -361,6 +365,7 @@ sub _doclient
 	$conn->conns($call);
 	$conn->{csort} = $f[1] if $f[1];
 	$conn->{state} = 'C';
+	eval {$conn->{peerhost} = $conn->{sock}->peerhost} unless $conn->ax25;
 	&{$conn->{rproc}}($conn, "O$call|$conn->{csort}");
 	delete $conn->{cmd};
 	$conn->{timeout}->del if $conn->{timeout};