extern/KasmVNC
1
0
Fork 0
mirror of https://github.com/kasmtech/KasmVNC.git synced 2025-01-07 14:39:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

vncserver: swallow -interface and pass through to Xvnc

Browse Source
This commit is contained in:
Dmitry Maksyoma 2021-10-04 22:52:59 +13:00
parent ca42870585
commit e453c7d73b
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
unix/vncserver
View File

@ -957,11 +957,24 @@ sub ConstructXvncCmd {
foreach $arg (@ARGV) { foreach $arg (@ARGV) {
$cmd .= " " . &quotedString($arg); $cmd .= " " . &quotedString($arg);
} }
$cmd .= SwallowedArgs();
$cmd .= " >> " . &quotedString($desktopLog) . " 2>&1"; $cmd .= " >> " . &quotedString($desktopLog) . " 2>&1";
return $cmd; return $cmd;
} }
sub SwallowedArgs {
my $cmd;
if ($opt{"-interface"}) {
$cmd .= " " . "-interface " . &quotedString($opt{"-interface"});
}
$cmd;
}
sub StartXvncAndRecordPID { sub StartXvncAndRecordPID {
system("$cmd & echo \$! >$pidFile"); system("$cmd & echo \$! >$pidFile");
} }
@ -1085,7 +1098,7 @@ sub DefineFilePathsAndStuff {
} }
sub ParseAndProcessCliOptions { sub ParseAndProcessCliOptions {
my @supportedOptions = ("-geometry",1,"-depth",1,"-pixelformat",1,"-name",1,"-kill",1,"-help",0,"-h",0,"--help",0,"-fp",1,"-list",0,"-fg",0,"-autokill",0,"-noxstartup",0,"-xstartup",1,"-select-de",OPTIONAL_ARG_VALUE); my @supportedOptions = ("-geometry",1,"-depth",1,"-pixelformat",1,"-name",1,"-kill",1,"-help",0,"-h",0,"--help",0,"-fp",1,"-list",0,"-fg",0,"-autokill",0,"-noxstartup",0,"-xstartup",1,"-select-de",OPTIONAL_ARG_VALUEi, "-interface", REQUIRED_ARG_VALUE);
&ParseOptionsAndRemoveMatchesFromARGV(@supportedOptions); &ParseOptionsAndRemoveMatchesFromARGV(@supportedOptions);
&ProcessCliOptions(); &ProcessCliOptions();
&CheckGeometryAndDepthAreSensible(); &CheckGeometryAndDepthAreSensible();