From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 540BE613D6 for ; Fri, 4 Feb 2022 12:44:15 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 29D62312F0 for ; Fri, 4 Feb 2022 12:44:15 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 9C682312E7 for ; Fri, 4 Feb 2022 12:44:14 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5492C43B7D for ; Fri, 4 Feb 2022 12:44:14 +0100 (CET) Message-ID: Date: Fri, 4 Feb 2022 12:44:13 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Content-Language: en-US To: pve-devel@lists.proxmox.com, =?UTF-8?Q?Fabian_Gr=c3=bcnbichler?= References: <20220203124143.1931377-1-f.gruenbichler@proxmox.com> <20220203124143.1931377-3-f.gruenbichler@proxmox.com> From: Fabian Ebner In-Reply-To: <20220203124143.1931377-3-f.gruenbichler@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.138 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pve-devel] [PATCH v4 guest-common 2/3] add tunnel helper module X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Feb 2022 11:44:15 -0000 Am 03.02.22 um 13:41 schrieb Fabian Grünbichler: > + if ($cpid) { > + $writer->writer(); > + $reader->reader(); > + my $tunnel = { > + writer => $writer, > + reader => $reader, > + pid => $cpid, > + log => $log, > + }; > + > + eval { > + my $writer = $tunnel->{writer}; > + my $cmd = encode_json({ > + control => JSON::true, > + cmd => 'connect', > + data => $tunnel_params, > + }); > + > + eval { > + PVE::Tools::run_with_timeout(15, sub { > + print {$writer} "$cmd\n"; > + $writer->flush(); > + }); > + }; > + die "failed to write tunnel connect command - $@\n" if $@; > + }; > + die "failed to connect via WS: $@\n" if $@; > + > + my $err; > + eval { > + my $writer = $tunnel->{writer}; > + my $cmd = encode_json({ > + cmd => 'version', > + }); > + > + eval { > + PVE::Tools::run_with_timeout(15, sub { > + print {$writer} "$cmd\n"; > + $writer->flush(); > + }); > + }; > + $err = "failed to write tunnel version command - $@\n" if $@; > + my $res = read_tunnel($tunnel, 10); > + $res = JSON::decode_json($res); > + my $version = $res->{api}; > + > + if ($version =~ /^(\d+)$/) { > + $tunnel->{version} = $1; > + $tunnel->{age} = $res->{age}; > + } else { > + $err = "received invalid tunnel version string '$version'\n" if !$err; > + } > + }; > + $err = $@ if !$err; > + > + if ($err) { > + $finish_command_pipe->($tunnel); > + die "can't open tunnel - $err"; > + } > + > + $tunnel_params->{url} = "$websocket_url?"; # reset ticket and socket > + > + $tunnel->{params} = $tunnel_params; # for forwarding > + $tunnel->{log} = $log; Nit: was already set further above. > + > + return $tunnel; > + } else {