Merge branch 'feature/KASM-2997_udp_port_arg' into 'master'

Add -udpPort

Closes KASM-2997

See merge request kasm-technologies/internal/KasmVNC!58
This commit is contained in:
Matthew McClaskey 2022-08-02 17:56:49 +00:00
commit 5ecd18bf1b
5 changed files with 15 additions and 2 deletions

View File

@ -699,7 +699,10 @@ WebsocketListener::WebsocketListener(const struct sockaddr *listenaddr,
pthread_create(&tid, NULL, start_server, NULL); pthread_create(&tid, NULL, start_server, NULL);
uint16_t *nport = (uint16_t *) calloc(1, sizeof(uint16_t)); uint16_t *nport = (uint16_t *) calloc(1, sizeof(uint16_t));
*nport = ntohs(sa.u.sin.sin_port); if (rfb::Server::udpPort)
*nport = rfb::Server::udpPort;
else
*nport = ntohs(sa.u.sin.sin_port);
pthread_create(&tid, NULL, udpserver, nport); pthread_create(&tid, NULL, udpserver, nport);
} }

View File

@ -60,6 +60,7 @@ void *udpserver(void *nport) {
vlog.error("Failed to create WebUDP host"); vlog.error("Failed to create WebUDP host");
return NULL; return NULL;
} }
vlog.debug("UDP listening on port %u", *(uint16_t *) nport);
__sync_bool_compare_and_swap(&host, host, myhost); __sync_bool_compare_and_swap(&host, host, myhost);

View File

@ -226,6 +226,10 @@ rfb::IntParameter rfb::Server::udpFullFrameFrequency
("udpFullFrameFrequency", ("udpFullFrameFrequency",
"Send a full frame every N frames for clients using UDP. 0 to disable", "Send a full frame every N frames for clients using UDP. 0 to disable",
0, 0, 1000); 0, 0, 1000);
rfb::IntParameter rfb::Server::udpPort
("udpPort",
"Which port to use for UDP. Default same as websocket",
0, 0, 65535);
static void bandwidthPreset() { static void bandwidthPreset() {
rfb::Server::dynamicQualityMin.setParam(2); rfb::Server::dynamicQualityMin.setParam(2);
@ -236,4 +240,4 @@ static void bandwidthPreset() {
rfb::PresetParameter rfb::Server::preferBandwidth rfb::PresetParameter rfb::Server::preferBandwidth
("PreferBandwidth", ("PreferBandwidth",
"Set various options for lower bandwidth use. The default is off, aka to prefer quality.", "Set various options for lower bandwidth use. The default is off, aka to prefer quality.",
false, bandwidthPreset); false, bandwidthPreset);

View File

@ -61,6 +61,7 @@ namespace rfb {
static IntParameter videoArea; static IntParameter videoArea;
static IntParameter videoScaling; static IntParameter videoScaling;
static IntParameter udpFullFrameFrequency; static IntParameter udpFullFrameFrequency;
static IntParameter udpPort;
static StringParameter kasmPasswordFile; static StringParameter kasmPasswordFile;
static StringParameter publicIP; static StringParameter publicIP;
static BoolParameter printVideoArea; static BoolParameter printVideoArea;

View File

@ -131,6 +131,10 @@ Default unset.
Send a full frame every N frames for clients using UDP. 0 to disable. Default \fI0\fP. Send a full frame every N frames for clients using UDP. 0 to disable. Default \fI0\fP.
. .
.TP .TP
.B \-udpPort \fIport\fP
Which port to use for UDP. Default same as websocket.
.
.TP
.B \-AcceptCutText .B \-AcceptCutText
Accept clipboard updates from clients. Default is on. Accept clipboard updates from clients. Default is on.
. .