X-Git-Url: https://git.proxmox.com/?p=pve-client.git;a=blobdiff_plain;f=PVE%2FAPIClient%2FCommands%2Flxc.pm;h=620e4b1ca23bf93050526ffcc956488d8107e53c;hp=23f33b2a68ee3a7285218b17a341c9749b5e3c2d;hb=032dc44cfeb5be68d715c12c1baf47d8e124d61d;hpb=3226300c1bdd86a31d5efd7b81a4b02ed543d02e

diff --git a/PVE/APIClient/Commands/lxc.pm b/PVE/APIClient/Commands/lxc.pm
index 23f33b2..620e4b1 100644
--- a/PVE/APIClient/Commands/lxc.pm
+++ b/PVE/APIClient/Commands/lxc.pm
@@ -2,6 +2,7 @@ package PVE::APIClient::Commands::lxc;
 
 use strict;
 use warnings;
+use Errno qw(EINTR EAGAIN);
 use JSON;
 use URI::Escape;
 use IO::Select;
@@ -19,7 +20,7 @@ use base qw(PVE::CLIHandler);
 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) = @_;
@@ -71,15 +72,13 @@ my $create_websockt_frame = sub {
 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;
 
@@ -88,7 +87,7 @@ my $parse_web_socket_frame = sub  {
 	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;
@@ -97,11 +96,11 @@ my $parse_web_socket_frame = sub  {
 	$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;
 	}
 
@@ -110,7 +109,7 @@ my $parse_web_socket_frame = sub  {
 
 	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);
 
@@ -130,33 +129,24 @@ my $parse_web_socket_frame = sub  {
     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(0);
-
-    #
-    # Reset the terminal parameters.
-    #
-    print "\e[24H\r\n";
-    PVE::PTY::tcsetattr(*STDIN, $old_termios);
+    return $len;
 };
 
 __PACKAGE__->register_method ({
@@ -206,7 +196,7 @@ __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 = '';
 
@@ -243,97 +233,158 @@ __PACKAGE__->register_method ({
 
 	# 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 $read_select = IO::Select->new;
+	my $write_select = IO::Select->new;
+
+	my $output_buffer = ''; # write buffer for STDOUT
+	my $websock_buffer = ''; # write buffer for $web_socket
 
-	my $select = IO::Select->new;
+	eval {
+	    $SIG{TERM} = $SIG{INT} = $SIG{KILL} = sub { die "received interrupt\n"; };
 
-	$web_socket->blocking(0);
-	$select->add($web_socket);
-	$select->add(fileno(STDIN));
+	    PVE::PTY::cfmakeraw($raw_termios);
+	    PVE::PTY::tcsetattr(*STDIN, $raw_termios);
 
-	my @messages;
-	my $ctrl_a_pressed_before = 0;
-	my $next_ping = time() + 3;
+	    # And set it to non-blocking so we can every char with IO::Select.
+	    STDIN->blocking(0);
+	    $web_socket->blocking(1);
+	    $read_select->add($web_socket);
+	    my $input_fh = fileno(STDIN);
+	    $read_select->add($input_fh);
 
-	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;
-		}
+	    my $output_fh = fileno(STDOUT);
 
-		# Write
-		foreach my $fh ($select->can_write(0.5)) {
-		    if ($fh == $web_socket and my $msg = shift @messages) {
-			$fh->syswrite($msg, length($msg));
-		    }
+	    my $ctrl_a_pressed_before = 0;
+
+	    my $winch_received = 0;
+	    $SIG{WINCH} = sub { $winch_received = 1; };
+
+	    my $check_terminal_size = sub {
+		my ($ncols, $nrows) = PVE::PTY::tcgetsize(*STDIN);
+		if ($ncols != $columns or $nrows != $rows) {
+		    $columns = $ncols;
+		    $rows = $nrows;
+		    $websock_buffer .= $create_websockt_frame->("1:$columns:$rows:");
+		    $write_select->add($web_socket);
 		}
+		$winch_received = 0;
+	    };
 
-		# Read
-		foreach my $fh ($select->can_read(0.5)) {
+	    my $max_buffer_len = 256*1024;
 
-		    # 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 $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;
+		    die "drain buffer - write error - $!\n";
+		}
+		return $nr if !$nr;
+		substr($$buffer_ref, 0, $nr, '');
+		$len = length($$buffer_ref);
+		$write_select->remove($fh) if !$len;
+	    };
 
-			if ($payload ne "OK") {
-			    syswrite(\*STDOUT, $payload, length($payload));
+	    while (1) {
+		while(my ($readable, $writable) = IO::Select->select($read_select, $write_select, undef, 3)) {
+		    $check_terminal_size->() if $winch_received;
+
+		    foreach my $fh (@$writable) {
+			if ($fh == $output_fh) {
+			    $drain_buffer->(\*STDOUT, \$output_buffer);
+			    $read_select->add($web_socket) if length($output_buffer) <= $max_buffer_len;
+			} elsif ($fh == $web_socket) {
+			    $drain_buffer->($web_socket, \$websock_buffer);
 			}
 		    }
 
-		    # From STDIN
-		    elsif ($fh == fileno(STDIN)) {
+		    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 (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;
+			    }
 
-			# 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;
+
+			    $websock_buffer .= $create_websockt_frame->("0:" . $nr . ":" . $buff);
+			    $write_select->add($web_socket);
+			}
 		    }
 		}
+		$check_terminal_size->() if $winch_received;
+
+		# got timeout
+		$websock_buffer .= $create_websockt_frame->("2"); # ping server to keep connection alive
+		$write_select->add($web_socket);
 	    }
 	};
-	print "ERROR: " . $@ . ".\n" if $@;
+	my $err = $@;
+
+	eval {  # cleanup
+
+	    # switch back to blocking mode (else later shell commands will fail).
+	    STDIN->blocking(1);
+
+	    if ($web_socket->connected) {
+		# close connection
+		$websock_buffer .= "\x88" . pack('N', 0) . pack('n', 0); # Opcode, mask, statuscode
+		$full_write->($web_socket, $websock_buffer);
+		$websock_buffer = '';
+		close($web_socket);
+	    }
+
+	    # Reset the terminal parameters.
+	    $output_buffer .= "\e[24H\r\n";
+	    $full_write->(\*STDOUT, $output_buffer);
+	    $output_buffer = '';
+
+	    PVE::PTY::tcsetattr(*STDIN, $old_termios);
+	};
+	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 ({