extern/KasmVNC
1
0
Fork 0
mirror of https://github.com/kasmtech/KasmVNC.git synced 2024-11-24 00:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

vncserver: use unique -websocketPort for each display

Browse Source
This commit is contained in:
Dmitry Maksyoma 2021-08-18 23:51:47 +12:00
parent fa7b3492da
commit b0ffc6a27e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
unix/vncserver
View File

@ -741,7 +741,7 @@ sub SetReasonabeDefaults {
$default_opts{pixelformat} = $pixelformat if ($pixelformat); $default_opts{pixelformat} = $pixelformat if ($pixelformat);
$default_opts{rfbwait} = 30000; $default_opts{rfbwait} = 30000;
$default_opts{rfbauth} = "$vncUserDir/passwd"; $default_opts{rfbauth} = "$vncUserDir/passwd";
$default_opts{rfbport} = $vncPort; $default_opts{websocketPort} = $websocketPort;
$default_opts{fp} = $fontPath if ($fontPath); $default_opts{fp} = $fontPath if ($fontPath);
$default_opts{pn} = ""; $default_opts{pn} = "";
} }
@ -986,6 +986,7 @@ sub DefineFilePathsAndStuff {
$vncSystemConfigDir = "/etc/kasmvnc"; $vncSystemConfigDir = "/etc/kasmvnc";
$vncSystemConfigDefaultsFile = "$vncSystemConfigDir/vncserver-config-defaults"; $vncSystemConfigDefaultsFile = "$vncSystemConfigDir/vncserver-config-defaults";
$vncSystemConfigMandatoryFile = "$vncSystemConfigDir/vncserver-config-mandatory"; $vncSystemConfigMandatoryFile = "$vncSystemConfigDir/vncserver-config-mandatory";
$defaultWebsocketPort = 8443;
$skipxstartup = 0; $skipxstartup = 0;
$xauthorityFile = "$ENV{XAUTHORITY}" || "$ENV{HOME}/.Xauthority"; $xauthorityFile = "$ENV{XAUTHORITY}" || "$ENV{HOME}/.Xauthority";
@ -1023,7 +1024,7 @@ sub PrepareDefaultsForPassingToXvnc {
%default_opts; %default_opts;
%config; %config;
$vncPort = 5900 + $displayNumber; $websocketPort = $defaultWebsocketPort + $displayNumber;
$desktopName = $opt{'-name'} || "$host:$displayNumber ($ENV{USER})"; $desktopName = $opt{'-name'} || "$host:$displayNumber ($ENV{USER})";
&SetReasonabeDefaults(); &SetReasonabeDefaults();