use strict;
use warnings;
+use Errno qw(EINTR EAGAIN);
use JSON;
use URI::Escape;
use IO::Select;
use PVE::APIClient::Config;
my $CRLF = "\x0D\x0A";
-my $max_payload_size = 65536;
+my $max_payload_size = 128*1024;
my $build_web_socket_request = sub {
my ($host, $path, $ticket, $termproxy) = @_;
my $parse_web_socket_frame = sub {
my ($wsbuf_ref) = @_;
- my $wsbuf = $$wsbuf_ref;
-
my $payload;
my $req_close = 0;
- while (my $len = length($wsbuf)) {
+ while (my $len = length($$wsbuf_ref)) {
last if $len < 2;
- my $hdr = unpack('C', substr($wsbuf, 0, 1));
+ my $hdr = unpack('C', substr($$wsbuf_ref, 0, 1));
my $opcode = $hdr & 0b00001111;
my $fin = $hdr & 0b10000000;
my $rsv = $hdr & 0b01110000;
die "received websocket frame with RSV flags\n" if $rsv;
- my $payload_len = unpack 'C', substr($wsbuf, 1, 1);
+ my $payload_len = unpack 'C', substr($$wsbuf_ref, 1, 1);
my $masked = $payload_len & 0b10000000;
die "received masked websocket frame from server\n" if $masked;
$payload_len = $payload_len & 0b01111111;
if ($payload_len == 126) {
last if $len < 4;
- $payload_len = unpack('n', substr($wsbuf, $offset, 2));
+ $payload_len = unpack('n', substr($$wsbuf_ref, $offset, 2));
$offset += 2;
} elsif ($payload_len == 127) {
last if $len < 10;
- $payload_len = unpack('Q>', substr($wsbuf, $offset, 8));
+ $payload_len = unpack('Q>', substr($$wsbuf_ref, $offset, 8));
$offset += 8;
}
last if $len < ($offset + $payload_len);
- my $data = substr($wsbuf, 0, $offset + $payload_len, ''); # now consume data
+ my $data = substr($$wsbuf_ref, 0, $offset + $payload_len, ''); # now consume data
my $frame_data = substr($data, $offset, $payload_len);
return ($payload, $req_close);
};
-my $client_exit = sub {
- my ($select, $web_socket, $old_termios) = @_;
-
- foreach my $fh ($select->handles) {
- $select->remove($fh);
-
- if ($fh == $web_socket) {
- if ($fh->connected) {
-
- # close connection
- # Opcode, mask, statuscode
- my $msg = "\x88" . pack('N', 0) . pack('n', 0);
- $fh->syswrite($msg);
- close($fh);
- }
+my $full_write = sub {
+ my ($fh, $data) = @_;
+
+ my $len = length($data);
+ my $todo = $len;
+ my $offset = 0;
+ while(1) {
+ my $nr = syswrite($fh, $data, $todo, $offset);
+ if (!defined($nr)) {
+ next if $! == EINTR || $! == EAGAIN;
+ die "console write error - $!\n"
}
-
+ $offset += $nr;
+ $todo -= $nr;
+ last if $todo <= 0;
}
- # switch back to blocking mode (else later shell commands will fail).
- STDIN->blocking(1);
-
- #
- # Reset the terminal parameters.
- #
- print "\e[24H\r\n";
- PVE::PTY::tcsetattr(*STDIN, $old_termios);
+ return $len;
};
__PACKAGE__->register_method ({
my ($request, $wskey) = $build_web_socket_request->(
$conn->{host}, "/$api_path/vncwebsocket", $conn->{ticket}, $termproxy);
- $web_socket->syswrite($request);
+ $full_write->($web_socket, $request);
my $wsbuf = '';
# send auth again...
my $frame = $create_websockt_frame->($termproxy->{user} . ":" . $termproxy->{ticket} . "\n");
- $web_socket->syswrite($frame);
+ $full_write->($web_socket, $frame);
# Send resize command
my ($columns, $rows) = PVE::PTY::tcgetsize(*STDIN);
$frame = $create_websockt_frame->("1:$columns:$rows:");
- $web_socket->syswrite($frame);
+ $full_write->($web_socket, $frame);
# Set STDIN to "raw -echo" mode
my $old_termios = PVE::PTY::tcgetattr(*STDIN);
my $raw_termios = {%$old_termios};
- PVE::PTY::cfmakeraw($raw_termios);
- PVE::PTY::tcsetattr(*STDIN, $raw_termios);
-
- # And set it to non-blocking so we can every char with IO::Select.
- STDIN->blocking(0);
my $select = IO::Select->new;
- $web_socket->blocking(0);
- $select->add($web_socket);
- $select->add(fileno(STDIN));
+ eval {
+ $SIG{TERM} = $SIG{INT} = $SIG{KILL} = sub { die "received interrupt\n"; };
- my @messages;
- my $ctrl_a_pressed_before = 0;
- my $next_ping = time() + 3;
+ PVE::PTY::cfmakeraw($raw_termios);
+ PVE::PTY::tcsetattr(*STDIN, $raw_termios);
- eval {
- while (1) {
- # Ping server every 3 seconds.
- my $now = time();
- if ($now >= $next_ping) {
- push(@messages, $create_websockt_frame->("2"));
- $next_ping = $now + 3;
- }
+ # And set it to non-blocking so we can every char with IO::Select.
+ STDIN->blocking(0);
- # Write
- foreach my $fh ($select->can_write(0.5)) {
- if ($fh == $web_socket and my $msg = shift @messages) {
- $fh->syswrite($msg, length($msg));
- }
- }
+ $web_socket->blocking(1);
+ $select->add($web_socket);
+ my $input_fh = fileno(STDIN);
+ $select->add($input_fh);
- # Read
- foreach my $fh ($select->can_read(0.5)) {
+ my $ctrl_a_pressed_before = 0;
- # From Web Socket
- if ($fh == $web_socket) {
- # Read from WebSocket
- my $nr = $wb_socket_read_available_bytes->();
- my ($payload, $req_close) = $parse_web_socket_frame->(\$wsbuf);
+ my $winch_received = 0;
+ $SIG{WINCH} = sub { $winch_received = 1; };
- if ($payload ne "OK") {
- syswrite(\*STDOUT, $payload, length($payload));
- }
- }
+ my $check_terminal_size = sub {
+ my ($ncols, $nrows) = PVE::PTY::tcgetsize(*STDIN);
+ if ($ncols != $columns or $nrows != $rows) {
+ $columns = $ncols;
+ $rows = $nrows;
+ $frame = $create_websockt_frame->("1:$columns:$rows:");
+ $full_write->($web_socket, $frame);
+ }
+ $winch_received = 0;
+ };
- # From STDIN
- elsif ($fh == fileno(STDIN)) {
+ while (1) {
+ while(my ($readable) = IO::Select->select($select, undef, undef, 3)) {
+ $check_terminal_size->() if $winch_received;
+
+ foreach my $fh (@$readable) {
+
+ if ($fh == $web_socket) {
+ # Read from WebSocket
+
+ my $nr = $wb_socket_read_available_bytes->();
+ if (!defined($nr)) {
+ die "web socket read error $!\n";
+ } elsif ($nr == 0) {
+ return; # EOF
+ } else {
+ my ($payload, $req_close) = $parse_web_socket_frame->(\$wsbuf);
+ if ($payload) {
+ $full_write->(\*STDOUT, $payload);
+ }
+ return if $req_close;
+ }
- # Read from STDIN
- my $nr = read(\*STDIN, my $buff, 4096);
- if (!$nr) {
- next;
- }
+ } elsif ($fh == $input_fh) {
+ # Read from STDIN
- my $char = ord($buff);
+ my $nr = read(\*STDIN, my $buff, 4096);
+ return if !$nr; # EOF or error
- if ($ctrl_a_pressed_before == 1 && $char == hex("0x71")) {
- $client_exit->($select, $web_socket, $old_termios);
- return;
- }
+ my $char = ord($buff);
- if ($char == hex("0x01")) {
- if ($ctrl_a_pressed_before == 0) {
- $ctrl_a_pressed_before = 1;
- }
- }
- else {
- $ctrl_a_pressed_before = 0;
- }
+ # check for CTRL-a-q
+ return if $ctrl_a_pressed_before == 1 && $char == hex("0x71");
- push(@messages, $create_websockt_frame->("0:" . $nr . ":" . $buff));
+ $ctrl_a_pressed_before = ($char == hex("0x01") && $ctrl_a_pressed_before == 0) ? 1 : 0;
+
+ my $frame = $create_websockt_frame->("0:" . $nr . ":" . $buff);
+ $full_write->($web_socket, $frame);
+ }
}
}
+ $check_terminal_size->() if $winch_received;
+
+ # got timeout
+ $full_write->($web_socket, $create_websockt_frame->("2")); # ping server to keep connection alive
+ }
+ };
+ my $err = $@;
+
+ eval { # cleanup
+
+ # switch back to blocking mode (else later shell commands will fail).
+ STDIN->blocking(1);
+
+ if ($web_socket->connected) {
+ # close connection
+ my $msg = "\x88" . pack('N', 0) . pack('n', 0); # Opcode, mask, statuscode
+ $full_write->($web_socket, $msg);
+ close($web_socket);
}
+
+ # Reset the terminal parameters.
+ $full_write->(\*STDOUT, "\e[24H\r\n");
+ PVE::PTY::tcsetattr(*STDIN, $old_termios);
};
- print "ERROR: " . $@ . ".\n" if $@;
+ warn $@ if $@; # show cleanup errors
- $client_exit->($select, $web_socket, $old_termios);
+ print STDERR "\nERROR: $err" if $err;
- return undef
+ return undef;
}});
__PACKAGE__->register_method ({
projects / pve-client.git / blobdiff