return $len;
};
+# Takes an escape character with an optional '^' prefix and returns an escape
+# character code.
+my $escapekey_to_char = sub {
+ my ($def) = @_;
+ if ($def =~ /^\^?([a-zA-Z])$/) {
+ return 1 + ord(lc($1)) - ord('a');
+ }
+ die "bad escape key definition: $def\n";
+};
+
__PACKAGE__->register_method ({
name => 'enter',
path => 'enter',
my $config = PVE::APIClient::Config->load();
my $conn = PVE::APIClient::Config->remote_conn($config, $param->{remote});
+ # FIXME: This should come from $config
+ my $escape_char = $escapekey_to_char->('a');
+
# Get the real node from the resources endpoint
my $resource_list = $conn->get("api2/json/cluster/resources", { type => 'vm'});
my ($resource) = grep { $_->{type} eq "lxc" && $_->{vmid} eq $param->{vmid}} @$resource_list;
my $wb_socket_read_available_bytes = sub {
my $nr = $web_socket->sysread($wsbuf, $max_payload_size, length($wsbuf));
- die "web socket read error - $!\n" if $nr < 0;
+ if (!defined($nr) && !($! == EINTR || $! == EAGAIN)) {
+ die "web socket read error - $!\n";
+ }
return $nr;
};
# And set it to non-blocking so we can every char with IO::Select.
STDIN->blocking(0);
- $web_socket->blocking(1);
+ STDOUT->blocking(0);
+ $web_socket->blocking(0);
$read_select->add($web_socket);
- my $input_fh = fileno(STDIN);
+ my $input_fh = \*STDIN;
$read_select->add($input_fh);
- my $output_fh = fileno(STDOUT);
+ my $output_fh = \*STDOUT;
- my $ctrl_a_pressed_before = 0;
+ my $in_escape_sequence;
my $winch_received = 0;
$SIG{WINCH} = sub { $winch_received = 1; };
$winch_received = 0;
};
+ my $max_buffer_len = 256*1024;
+
my $drain_buffer = sub {
my ($fh, $buffer_ref) = @_;
my $len = length($$buffer_ref);
my $nr = syswrite($fh, $$buffer_ref);
if (!defined($nr)) {
- next if $! == EINTR || $! == EAGAIN;
+ return if $! == EINTR || $! == EAGAIN;
die "drain buffer - write error - $!\n";
}
return $nr if !$nr;
substr($$buffer_ref, 0, $nr, '');
- $write_select->remove($fh) if !length($$buffer_ref);
+ $len = length($$buffer_ref);
+ $write_select->remove($fh) if !$len;
};
while (1) {
foreach my $fh (@$writable) {
if ($fh == $output_fh) {
- $drain_buffer->(\*STDOUT, \$output_buffer);
+ $drain_buffer->($output_fh, \$output_buffer);
+ $read_select->add($web_socket) if length($output_buffer) <= $max_buffer_len;
} elsif ($fh == $web_socket) {
$drain_buffer->($web_socket, \$websock_buffer);
}
my $nr = $wb_socket_read_available_bytes->();
if (!defined($nr)) {
- die "web socket read error $!\n";
+ # wait
} elsif ($nr == 0) {
return; # EOF
} else {
my ($payload, $req_close) = $parse_web_socket_frame->(\$wsbuf);
- if ($payload) {
+ if (defined($payload) && length($payload)) {
$output_buffer .= $payload;
$write_select->add($output_fh);
+ if (length($output_buffer) > $max_buffer_len) {
+ $read_select->remove($web_socket);
+ }
}
return if $req_close;
}
} elsif ($fh == $input_fh) {
# Read from STDIN
- my $nr = read(\*STDIN, my $buff, 4096);
+ my $nr = sysread($input_fh, my $buff, 4096);
return if !$nr; # EOF or error
my $char = ord($buff);
- # check for CTRL-a-q
- return if $ctrl_a_pressed_before == 1 && $char == hex("0x71");
-
- $ctrl_a_pressed_before = ($char == hex("0x01") && $ctrl_a_pressed_before == 0) ? 1 : 0;
+ # Handle escape sequences:
+ if ($in_escape_sequence) {
+ $in_escape_sequence = 0;
+ if ($char == 0x71) {
+ # (escape, 'q')
+ return;
+ } elsif ($char == $escape_char) {
+ # (escape, escape)
+ # Pass this one through as a single escapekey
+ } else {
+ # Unknown escape sequence
+ # We could generate a bell or something...
+ # but for now just skip it
+ next;
+ }
+ } elsif ($char == $escape_char) {
+ $in_escape_sequence = 1;
+ next;
+ }
+ # Pass the key through:
$websock_buffer .= $create_websockt_frame->("0:" . $nr . ":" . $buff);
$write_select->add($web_socket);
}
return undef;
}});
-__PACKAGE__->register_method ({
- name => 'list',
- path => 'list',
- method => 'GET',
- description => "List containers.",
- parameters => {
- additionalProperties => 0,
- properties => {
- remote => get_standard_option('pveclient-remote-name'),
- },
- },
- returns => { type => 'null'},
- code => sub {
- my ($param) = @_;
-
- die "implement me";
-
- }});
-
-
our $cmddef = {
enter => [ __PACKAGE__, 'enter', ['remote', 'vmid']],
- list => [ __PACKAGE__, 'list', ['remote']],
};
1;