| Message ID | 20230724100353.16628-1-sergii@zasenko.name |
|---|---|
| State | New |
| Headers | show |
| Series | Allow UNIX socket option for VNC websocket | expand |
On Mon, Jul 24, 2023 at 2:04 PM Sergii Zasenko <sergii@zasenko.name> wrote: > - Remove unix socket option limitation for VNC websocket > - Reflect websocket option changes in documentation > > Signed-off-by: Sergii Zasenko <sergii@zasenko.name> > Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > qemu-options.hx | 4 ++++ > ui/vnc.c | 5 ----- > 2 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/qemu-options.hx b/qemu-options.hx > index 29b98c3..8cc910d 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -2451,6 +2451,10 @@ SRST > host. It is possible to control the websocket listen address > independently, using the syntax ``websocket``\ =host:port. > > + Websocket could be allowed over UNIX domain socket, using the > syntax > + ``websocket``\ =unix:path, where path is the location of a unix > socket > + to listen for connections on. > + > 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. > diff --git a/ui/vnc.c b/ui/vnc.c > index 92964dc..dea1414 100644 > --- a/ui/vnc.c > +++ b/ui/vnc.c > @@ -3715,11 +3715,6 @@ static int vnc_display_get_address(const char > *addrstr, > addr->type = SOCKET_ADDRESS_TYPE_UNIX; > addr->u.q_unix.path = g_strdup(addrstr + 5); > > - if (websocket) { > - error_setg(errp, "UNIX sockets not supported with websock"); > - goto cleanup; > - } > - > if (to) { > error_setg(errp, "Port range not support with UNIX socket"); > goto cleanup; > -- > 2.39.2 > > >
diff --git a/qemu-options.hx b/qemu-options.hx index 29b98c3..8cc910d 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2451,6 +2451,10 @@ SRST host. It is possible to control the websocket listen address independently, using the syntax ``websocket``\ =host:port. + Websocket could be allowed over UNIX domain socket, using the syntax + ``websocket``\ =unix:path, where path is the location of a unix socket + to listen for connections on. + 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. diff --git a/ui/vnc.c b/ui/vnc.c index 92964dc..dea1414 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3715,11 +3715,6 @@ static int vnc_display_get_address(const char *addrstr, addr->type = SOCKET_ADDRESS_TYPE_UNIX; addr->u.q_unix.path = g_strdup(addrstr + 5); - if (websocket) { - error_setg(errp, "UNIX sockets not supported with websock"); - goto cleanup; - } - if (to) { error_setg(errp, "Port range not support with UNIX socket"); goto cleanup;
- Remove unix socket option limitation for VNC websocket - Reflect websocket option changes in documentation Signed-off-by: Sergii Zasenko <sergii@zasenko.name> --- qemu-options.hx | 4 ++++ ui/vnc.c | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-)