Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pve-manager
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
pve-manager
Commits
0f5bc844
Commit
0f5bc844
authored
May 12, 2015
by
Wolfgang Bumiller
Committed by
Dietmar Maurer
May 12, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pass port family to next_vnc_port
parent
cbfe220a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
5 deletions
+10
-5
Nodes.pm
PVE/API2/Nodes.pm
+6
-4
API2Tools.pm
PVE/API2Tools.pm
+4
-1
No files found.
PVE/API2/Nodes.pm
View file @
0f5bc844
...
...
@@ -680,14 +680,16 @@ __PACKAGE__->register_method ({
$sslcert
=
PVE::Tools::
file_get_contents
("
/etc/pve/pve-root-ca.pem
",
8192
)
if
!
$sslcert
;
my
$port
=
PVE::Tools::
next_vnc_port
();
my
$remip
;
my
(
$remip
,
$family
);
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,
# so we select the fastest chipher here (or 'none'?)
my
$remcmd
=
$remip
?
...
...
PVE/API2Tools.pm
View file @
0f5bc844
...
...
@@ -5,6 +5,7 @@ use warnings;
use
Net::
IP
;
use
PVE::
Tools
;
use
PVE::
INotify
;
use
Digest::
MD5
qw(md5_hex)
;
use
URI
;
use
URI::
Escape
;
...
...
@@ -143,7 +144,9 @@ sub run_spiceterm {
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
)
=
PVE::AccessControl::
remote_viewer_config
(
$authuser
,
$vmid
,
$node
,
$proxy
,
$title
,
$port
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment