diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2017-02-03 12:06:45 +0000 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2017-02-09 17:28:45 +0100 |
| commit | 275e0d616bc36f5e0ffa4eb5e28069d66e8e2137 (patch) | |
| tree | 8f6def99bff5dc2a32d01e5519038720c0a3a00e /qemu-options.hx | |
| parent | 4ee74fa7082a1a521dc5f7a4b61a62b61d1480b2 (diff) | |
| download | qemu-275e0d616bc36f5e0ffa4eb5e28069d66e8e2137.zip qemu-275e0d616bc36f5e0ffa4eb5e28069d66e8e2137.tar.gz qemu-275e0d616bc36f5e0ffa4eb5e28069d66e8e2137.tar.bz2 | |
ui: refactor code for populating SocketAddress from vnc_display_open
The code which interprets the CLI args to populate the SocketAddress
objects for plain & websockets VNC is quite complex already and will
need further enhancements shortly. Refactor it into separate methods
to avoid vnc_display_open getting even larger. As a side effect of
the refactoring, it is now possible to specify a listen address for
the websocket server explicitly. e.g,
-vnc localhost:5900,websockets=0.0.0.0:8080
will listen on localhost for the plain VNC server, but expose the
websockets VNC server on the public interface. This refactoring
also removes the restriction that prevents enabling websockets
when the plain VNC server is listening on a UNIX socket.
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 20170203120649.15637-5-berrange@redhat.com
[ kraxel: squashed clang build fix ]
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'qemu-options.hx')
| -rw-r--r-- | qemu-options.hx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index ad2f8fc..ac036b4 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1296,10 +1296,14 @@ is a TCP port number, not a display number. @item websocket Opens an additional TCP listening port dedicated to VNC Websocket connections. -By definition the Websocket port is 5700+@var{display}. If @var{host} is -specified connections will only be allowed from this host. -As an alternative the Websocket port could be specified by using -@code{websocket}=@var{port}. +If a bare @var{websocket} option is given, the Websocket port is +5700+@var{display}. An alternative port can be specified with the +syntax @code{websocket}=@var{port}. + +If @var{host} is specified connections will only be allowed from this host. +It is possible to control the websocket listen address independently, using +the syntax @code{websocket}=@var{host}:@var{port}. + If no TLS credentials are provided, the websocket connection runs in unencrypted mode. If TLS credentials are provided, the websocket connection requires encrypted client connections. |