unless ($msg =~ /^[ABZ]/) {
if ($msg =~ /^E[-\w]+\|([01])/) {
$conn->{echo} = $1;
+ if ($1) {
+ $conn->send_raw("\xFF\xFC\x01");
+ } else {
+ $conn->send_raw("\xFF\xFB\x01");
+ }
} else {
$msg =~ s/^[-\w]+\|//;
push (@{$conn->{outqueue}}, $msg . $conn->{lineend});
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
} elsif ($conn->{state} eq 'WC') {
if (exists $conn->{cmd} && @{$conn->{cmd}}) {
$conn->_docmd($msg);
- unless (exists $conn->{cmd} && @{$conn->{cmd}}) {
+ if ($conn->{state} eq 'WC' && exists $conn->{cmd} && @{$conn->{cmd}} == 0) {
$conn->{state} = 'C';
&{$conn->{rproc}}($conn, "O$conn->{call}|telnet");
delete $conn->{cmd};
}
}
if ($conn->{msg} && $conn->{state} eq 'WC' && exists $conn->{cmd} && @{$conn->{cmd}}) {
+ dbg('connect', $conn->{msg});
$conn->_docmd($conn->{msg});
- unless (@{$conn->{cmd}}) {
+ if ($conn->{state} eq 'WC' && exists $conn->{cmd} && @{$conn->{cmd}} == 0) {
$conn->{state} = 'C';
&{$conn->{rproc}}($conn, "O$conn->{call}|telnet");
delete $conn->{cmd};
$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");
_send_file($conn, "$main::data/issue");
$conn->send_raw("Login: ");
} else {
if ($conn->{abort} && $line =~ /$conn->{abort}/i) {
dbg('connect', "aborted on /$conn->{abort}/");
$conn->disconnect;
+ delete $conn->{cmd};
return;
}
if ($line =~ /$expect/i) {
my @f = split /\s+/, $line;
$conn->{call} = uc $f[0] if $f[0];
$conn->{csort} = $f[1] if $f[1];
+ $conn->{state} = 'C';
+ &{$conn->{rproc}}($conn, "O$conn->{call}|telnet");
+ delete $conn->{cmd};
+ $conn->{timeout}->del_timer if $conn->{timeout};
}
sub _send_file
if ($f) {
while (<$f>) {
chomp;
- $conn->send_later($_);
+ $conn->send_raw($_ . $conn->{lineend});
}
$f->close;
}