SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vnc: switch to inet_listen_opts

Browse Source 
Use inet_listen_opts instead of inet_listen.  Allows us to drop some
pointless indirection:  Format strings just to parse them again later on.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Tested-by: Gonglei <arei.gonglei@huawei.com>
Reviewed-by: Gonglei <arei.gonglei@huawei.com>
This commit is contained in:
Gerd Hoffmann 2015-02-19 11:31:44 +01:00
parent fc5c3ff751
commit e556032960
1 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
ui/vnc.c
View File

@ -3322,13 +3322,14 @@ void vnc_display_open(const char *id, Error **errp)
{ {
VncDisplay *vs = vnc_display_find(id); VncDisplay *vs = vnc_display_find(id);
QemuOpts *opts = qemu_opts_find(&qemu_vnc_opts, id); QemuOpts *opts = qemu_opts_find(&qemu_vnc_opts, id);
QemuOpts *sopts, *wsopts;
const char *share, *device_id; const char *share, *device_id;
QemuConsole *con; QemuConsole *con;
bool password = false; bool password = false;
bool reverse = false; bool reverse = false;
const char *vnc; const char *vnc;
const char *has_to; const char *has_to;
char *display, *ws_display = NULL, *to = NULL; char *h;
bool has_ipv4 = false; bool has_ipv4 = false;
bool has_ipv6 = false; bool has_ipv6 = false;
#ifdef CONFIG_VNC_WS #ifdef CONFIG_VNC_WS
@ -3361,16 +3362,36 @@ void vnc_display_open(const char *id, Error **errp)
return; return;
} }
has_to = qemu_opt_get(opts, "to"); sopts = qemu_opts_create(&socket_optslist, NULL, 0, &error_abort);
if (has_to) { wsopts = qemu_opts_create(&socket_optslist, NULL, 0, &error_abort);
to = g_strdup_printf(",to=%s", has_to);
h = strrchr(vnc, ':');
if (h) {
char *host = g_strndup(vnc, h - vnc);
qemu_opt_set(sopts, "host", host, &error_abort);
qemu_opt_set(wsopts, "host", host, &error_abort);
qemu_opt_set(sopts, "port", h+1, &error_abort);
g_free(host);
} else {
error_setg(errp, "no vnc port specified");
goto fail;
} }
has_to = qemu_opt_get(opts, "to");
has_ipv4 = qemu_opt_get_bool(opts, "ipv4", false); has_ipv4 = qemu_opt_get_bool(opts, "ipv4", false);
has_ipv6 = qemu_opt_get_bool(opts, "ipv6", false); has_ipv6 = qemu_opt_get_bool(opts, "ipv6", false);
display = g_strdup_printf("%s%s%s%s", vnc, if (has_to) {
has_to ? to : "", qemu_opt_set(sopts, "to", has_to, &error_abort);
has_ipv4 ? ",ipv4" : "", qemu_opt_set(wsopts, "to", has_to, &error_abort);
has_ipv6 ? ",ipv6" : ""); }
if (has_ipv4) {
qemu_opt_set(sopts, "ipv4", "on", &error_abort);
qemu_opt_set(wsopts, "ipv4", "on", &error_abort);
}
if (has_ipv6) {
qemu_opt_set(sopts, "ipv6", "on", &error_abort);
qemu_opt_set(wsopts, "ipv6", "on", &error_abort);
}
password = qemu_opt_get_bool(opts, "password", false); password = qemu_opt_get_bool(opts, "password", false);
if (password && fips_get_state()) { if (password && fips_get_state()) {
@ -3423,19 +3444,9 @@ void vnc_display_open(const char *id, Error **errp)
#ifdef CONFIG_VNC_WS #ifdef CONFIG_VNC_WS
websocket = qemu_opt_get(opts, "websocket"); websocket = qemu_opt_get(opts, "websocket");
if (websocket) { if (websocket) {
/* extract the host specification from display */
char *host = NULL, *host_end = NULL;
vs->ws_enabled = true; vs->ws_enabled = true;
qemu_opt_set(wsopts, "port", websocket, &error_abort);
/* ipv6 hosts have colons */
host_end = strrchr(display, ':');
if (host_end) {
host = g_strndup(display, host_end - display + 1);
} else {
host = g_strdup(":");
}
ws_display = g_strconcat(host, websocket, NULL);
g_free(host);
} }
#endif /* CONFIG_VNC_WS */ #endif /* CONFIG_VNC_WS */
@ -3605,10 +3616,10 @@ void vnc_display_open(const char *id, Error **errp)
#ifdef CONFIG_VNC_WS #ifdef CONFIG_VNC_WS
vs->lwebsock = -1; vs->lwebsock = -1;
#endif #endif
if (strncmp(display, "unix:", 5) == 0) { if (strncmp(vnc, "unix:", 5) == 0) {
csock = unix_connect(display+5, errp); csock = unix_connect(vnc+5, errp);
} else { } else {
csock = inet_connect(display, errp); csock = inet_connect(vnc, errp);
} }
if (csock < 0) { if (csock < 0) {
goto fail; goto fail;
@ -3616,19 +3627,17 @@ void vnc_display_open(const char *id, Error **errp)
vnc_connect(vs, csock, false, false); vnc_connect(vs, csock, false, false);
} else { } else {
/* listen for connects */ /* listen for connects */
if (strncmp(display, "unix:", 5) == 0) { if (strncmp(vnc, "unix:", 5) == 0) {
vs->lsock = unix_listen(display+5, NULL, 0, errp); vs->lsock = unix_listen(vnc+5, NULL, 0, errp);
vs->is_unix = true; vs->is_unix = true;
} else { } else {
vs->lsock = inet_listen(display, NULL, 0, vs->lsock = inet_listen_opts(sopts, 5900, errp);
SOCK_STREAM, 5900, errp);
if (vs->lsock < 0) { if (vs->lsock < 0) {
goto fail; goto fail;
} }
#ifdef CONFIG_VNC_WS #ifdef CONFIG_VNC_WS
if (vs->ws_enabled) { if (vs->ws_enabled) {
vs->lwebsock = inet_listen(ws_display, NULL, 0, vs->lwebsock = inet_listen_opts(wsopts, 0, errp);
SOCK_STREAM, 0, errp);
if (vs->lwebsock < 0) { if (vs->lwebsock < 0) {
if (vs->lsock) { if (vs->lsock) {
close(vs->lsock); close(vs->lsock);
@ -3639,27 +3648,25 @@ void vnc_display_open(const char *id, Error **errp)
} }
#endif /* CONFIG_VNC_WS */ #endif /* CONFIG_VNC_WS */
} }
g_free(to);
g_free(display);
vs->enabled = true; vs->enabled = true;
qemu_set_fd_handler2(vs->lsock, NULL, qemu_set_fd_handler2(vs->lsock, NULL,
vnc_listen_regular_read, NULL, vs); vnc_listen_regular_read, NULL, vs);
#ifdef CONFIG_VNC_WS #ifdef CONFIG_VNC_WS
g_free(ws_display);
if (vs->ws_enabled) { if (vs->ws_enabled) {
qemu_set_fd_handler2(vs->lwebsock, NULL, qemu_set_fd_handler2(vs->lwebsock, NULL,
vnc_listen_websocket_read, NULL, vs); vnc_listen_websocket_read, NULL, vs);
} }
#endif /* CONFIG_VNC_WS */ #endif /* CONFIG_VNC_WS */
} }
qemu_opts_del(sopts);
qemu_opts_del(wsopts);
return; return;
fail: fail:
g_free(to); qemu_opts_del(sopts);
g_free(display); qemu_opts_del(wsopts);
vs->enabled = false; vs->enabled = false;
#ifdef CONFIG_VNC_WS #ifdef CONFIG_VNC_WS
g_free(ws_display);
vs->ws_enabled = false; vs->ws_enabled = false;
#endif /* CONFIG_VNC_WS */ #endif /* CONFIG_VNC_WS */
} }