proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-07 12:43:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pass port family to next_vnc_port

Browse Source
This commit is contained in:
Wolfgang Bumiller 2015-05-12 12:12:47 +02:00 committed by Dietmar Maurer
parent 9c91d3be17
commit eb6d749792
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PVE/API2/Nodes.pm
View File

@ -680,14 +680,16 @@ __PACKAGE__->register_method ({
$sslcert = PVE::Tools::file_get_contents("/etc/pve/pve-root-ca.pem", 8192) $sslcert = PVE::Tools::file_get_contents("/etc/pve/pve-root-ca.pem", 8192)
if !$sslcert; if !$sslcert;
my $port = PVE::Tools::next_vnc_port(); my ($remip, $family);
my $remip;
if ($node ne PVE::INotify::nodename()) { if ($node ne PVE::INotify::nodename()) {
$remip = PVE::Cluster::remote_node_ip($node); ($remip, $family) = PVE::Cluster::remote_node_ip($node);
} else {
$family = PVE::Tools::get_host_address_family($node);
} }
my $port = PVE::Tools::next_vnc_port($family);
# NOTE: vncterm VNC traffic is already TLS encrypted, # NOTE: vncterm VNC traffic is already TLS encrypted,
# so we select the fastest chipher here (or 'none'?) # so we select the fastest chipher here (or 'none'?)
my $remcmd = $remip ? my $remcmd = $remip ?

5
PVE/API2Tools.pm
View File

@ -5,6 +5,7 @@ use warnings;
use Net::IP; use Net::IP;
use PVE::Tools; use PVE::Tools;
use PVE::INotify;
use Digest::MD5 qw(md5_hex); use Digest::MD5 qw(md5_hex);
use URI; use URI;
use URI::Escape; use URI::Escape;
@ -143,7 +144,9 @@ sub run_spiceterm {
my $authuser = $rpcenv->get_user(); my $authuser = $rpcenv->get_user();
my $port = PVE::Tools::next_spice_port(); my $nodename = PVE::INotify::nodename();
my $family = PVE::Tools::get_host_address_family($nodename);
my $port = PVE::Tools::next_spice_port($family);
my ($ticket, undef, $remote_viewer_config) = my ($ticket, undef, $remote_viewer_config) =
PVE::AccessControl::remote_viewer_config($authuser, $vmid, $node, $proxy, $title, $port); PVE::AccessControl::remote_viewer_config($authuser, $vmid, $node, $proxy, $title, $port);