X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FExtMsg.pm;h=090087817004ce648139d1068e48d66318fad715;hb=d0e999102802c57e45b9d3a31261caca6ae691c3;hp=58fb619f89925642561631e85dc6867e9b08b3ff;hpb=838a7345a2540d9707dacf2ff61431b214e4cdac;p=spider.git diff --git a/perl/ExtMsg.pm b/perl/ExtMsg.pm index 58fb619f..09008781 100644 --- a/perl/ExtMsg.pm +++ b/perl/ExtMsg.pm @@ -32,9 +32,9 @@ sub enqueue if ($msg =~ /^E[-\w]+\|([01])/) { $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'; @@ -118,7 +120,7 @@ sub new_client { # $conn->send_raw("\xff\xfa\x22\x01\x01\xff\xf0"); $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; }