X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FExtMsg.pm;h=78daffe263483b32d53a405c154ee696adadac47;hb=407d9a80a8af1fa6c1ae2c8fbca833e49da6e816;hp=146604169096a658270ec2e2681024f04911c00e;hpb=2b58ccdf81685a1167a43c38705a0d84b9d8d661;p=spider.git

diff --git a/perl/ExtMsg.pm b/perl/ExtMsg.pm
index 14660416..78daffe2 100644
--- a/perl/ExtMsg.pm
+++ b/perl/ExtMsg.pm
@@ -60,6 +60,12 @@ sub send_raw
     Msg::set_event_handler ($sock, "write" => sub {$conn->_send(0)});
 }
 
+sub echo
+{
+	my $conn = shift;
+	$conn->{echo} = shift;
+}
+
 sub dequeue
 {
 	my $conn = shift;
@@ -83,7 +89,7 @@ sub dequeue
 		if ($conn->{msg} =~ /\cJ$/) {
 			delete $conn->{msg};
 		} else {
-			$conn->{msg} = pop @lines;
+			$conn->{msg} =~ s/([^\cM\cJ]*)\cM?\cJ//g;
 		}
 		while (defined ($msg = shift @lines)) {
 			dbg("connect $conn->{cnum}: $msg") if $conn->{state} ne 'C' && isdbg('connect');
@@ -95,7 +101,7 @@ sub dequeue
 				&{$conn->{rproc}}($conn, "I$conn->{call}|$msg");
 			} elsif ($conn->{state} eq 'WL' ) {
 				$msg = uc $msg;
-				if (is_callsign($msg)) {
+				if (is_callsign($msg) && $msg !~ m|/| ) {
 					my $sort = $conn->{csort};
 					$sort = 'local' if $conn->{peerhost} eq "127.0.0.1";
 					$conn->to_connected($msg, 'A', $sort);
@@ -160,6 +166,7 @@ sub new_client {
 				$conn->_send_file("$main::data/issue");
 				$conn->send_raw("login: ");
 				$conn->_dotimeout(60);
+				$conn->{echo} = 1;
 			} else { 
 				&{$conn->{eproc}}() if $conn->{eproc};
 				$conn->disconnect();