X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FExtMsg.pm;h=81b9a1bc33b727798573dc91291e7492b2a33592;hb=f7d2c39f20734d48a5306ac585f1bbee2fc2fbe7;hp=58fb619f89925642561631e85dc6867e9b08b3ff;hpb=838a7345a2540d9707dacf2ff61431b214e4cdac;p=spider.git

diff --git a/perl/ExtMsg.pm b/perl/ExtMsg.pm
index 58fb619f..81b9a1bc 100644
--- a/perl/ExtMsg.pm
+++ b/perl/ExtMsg.pm
@@ -29,12 +29,12 @@ sub enqueue
 {
 	my ($conn, $msg) = @_;
 	unless ($msg =~ /^[ABZ]/) {
-		if ($msg =~ /^E[-\w]+\|([01])/) {
+		if ($msg =~ /^E[-\w]+\|([01])/ && $conn->{csort} eq 'telnet') {
 			$conn->{echo} = $1;
 			if ($1) {
-				$conn->send_raw("\xFF\xFC\x01");
+#				$conn->send_raw("\xFF\xFC\x01");
 			} else {
-				$conn->send_raw("\xFF\xFB\x01");
+#				$conn->send_raw("\xFF\xFB\x01");
 			}
 		} else {
 			$msg =~ s/^[-\w]+\|//;
@@ -58,7 +58,8 @@ sub dequeue
 	my $conn = shift;
 	my $msg;
 	
-	while ($msg = shift @{$conn->{inqueue}}){
+	while (@{$conn->{inqueue}}){
+		$msg = shift @{$conn->{inqueue}};
 		dbg('connect', $msg) unless $conn->{state} eq 'C';
 		
 		$msg =~ s/\xff\xfa.*\xff\xf0|\xff[\xf0-\xfe].//g; # remove telnet options
@@ -91,6 +92,7 @@ sub dequeue
 		}
 	}
 	if ($conn->{msg} && $conn->{state} eq 'WC' && exists $conn->{cmd} && @{$conn->{cmd}}) {
+		dbg('connect', $conn->{msg});
 		$conn->_docmd($conn->{msg});
 		if ($conn->{state} eq 'WC' && exists $conn->{cmd} && @{$conn->{cmd}} == 0) {
 			$conn->{state} = 'C';
@@ -116,9 +118,9 @@ sub new_client {
 		$conn->{state} = 'WL';
 #		$conn->send_raw("\xff\xfe\x01\xff\xfc\x01\ff\fd\x22");
 #		$conn->send_raw("\xff\xfa\x22\x01\x01\xff\xf0");
-		$conn->send_raw("\xFF\xFC\x01");
+#		$conn->send_raw("\xFF\xFC\x01");
 		_send_file($conn, "$main::data/issue");
-		$conn->send_raw("Login: ");
+		$conn->send_raw("login: ");
     } else { 
         $conn->disconnect();
     }
@@ -286,7 +288,7 @@ sub _send_file
 		if ($f) {
 			while (<$f>) {
 				chomp;
-				$conn->send_later($_);
+				$conn->send_raw($_ . $conn->{lineend});
 			}
 			$f->close;
 		}