da34e65cb4
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
126 lines
3.6 KiB
C
126 lines
3.6 KiB
C
/*
|
|
* QEMU VNC display driver: Websockets support
|
|
*
|
|
* Copyright (C) 2010 Joel Martin
|
|
* Copyright (C) 2012 Tim Hardeck
|
|
*
|
|
* This is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This software is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this software; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "vnc.h"
|
|
#include "io/channel-websock.h"
|
|
|
|
static void vncws_tls_handshake_done(Object *source,
|
|
Error *err,
|
|
gpointer user_data)
|
|
{
|
|
VncState *vs = user_data;
|
|
|
|
if (err) {
|
|
VNC_DEBUG("Handshake failed %s\n", error_get_pretty(err));
|
|
vnc_client_error(vs);
|
|
} else {
|
|
VNC_DEBUG("TLS handshake complete, starting websocket handshake\n");
|
|
vs->ioc_tag = qio_channel_add_watch(
|
|
QIO_CHANNEL(vs->ioc), G_IO_IN, vncws_handshake_io, vs, NULL);
|
|
}
|
|
}
|
|
|
|
|
|
gboolean vncws_tls_handshake_io(QIOChannel *ioc G_GNUC_UNUSED,
|
|
GIOCondition condition G_GNUC_UNUSED,
|
|
void *opaque)
|
|
{
|
|
VncState *vs = opaque;
|
|
QIOChannelTLS *tls;
|
|
Error *err = NULL;
|
|
|
|
VNC_DEBUG("TLS Websocket connection required\n");
|
|
if (vs->ioc_tag) {
|
|
g_source_remove(vs->ioc_tag);
|
|
vs->ioc_tag = 0;
|
|
}
|
|
|
|
tls = qio_channel_tls_new_server(
|
|
vs->ioc,
|
|
vs->vd->tlscreds,
|
|
vs->vd->tlsaclname,
|
|
&err);
|
|
if (!tls) {
|
|
VNC_DEBUG("Failed to setup TLS %s\n", error_get_pretty(err));
|
|
error_free(err);
|
|
vnc_client_error(vs);
|
|
return TRUE;
|
|
}
|
|
|
|
VNC_DEBUG("Start TLS WS handshake process\n");
|
|
object_unref(OBJECT(vs->ioc));
|
|
vs->ioc = QIO_CHANNEL(tls);
|
|
vs->tls = qio_channel_tls_get_session(tls);
|
|
|
|
qio_channel_tls_handshake(tls,
|
|
vncws_tls_handshake_done,
|
|
vs,
|
|
NULL);
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
|
|
static void vncws_handshake_done(Object *source,
|
|
Error *err,
|
|
gpointer user_data)
|
|
{
|
|
VncState *vs = user_data;
|
|
|
|
if (err) {
|
|
VNC_DEBUG("Websock handshake failed %s\n", error_get_pretty(err));
|
|
vnc_client_error(vs);
|
|
} else {
|
|
VNC_DEBUG("Websock handshake complete, starting VNC protocol\n");
|
|
vnc_init_state(vs);
|
|
vs->ioc_tag = qio_channel_add_watch(
|
|
vs->ioc, G_IO_IN, vnc_client_io, vs, NULL);
|
|
}
|
|
}
|
|
|
|
|
|
gboolean vncws_handshake_io(QIOChannel *ioc G_GNUC_UNUSED,
|
|
GIOCondition condition G_GNUC_UNUSED,
|
|
void *opaque)
|
|
{
|
|
VncState *vs = opaque;
|
|
QIOChannelWebsock *wioc;
|
|
|
|
VNC_DEBUG("Websocket negotiate starting\n");
|
|
if (vs->ioc_tag) {
|
|
g_source_remove(vs->ioc_tag);
|
|
vs->ioc_tag = 0;
|
|
}
|
|
|
|
wioc = qio_channel_websock_new_server(vs->ioc);
|
|
|
|
object_unref(OBJECT(vs->ioc));
|
|
vs->ioc = QIO_CHANNEL(wioc);
|
|
|
|
qio_channel_websock_handshake(wioc,
|
|
vncws_handshake_done,
|
|
vs,
|
|
NULL);
|
|
|
|
return TRUE;
|
|
}
|