mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chardev: convert the socket server to QIONetListener

Browse Source 
Instead of creating a QIOChannelSocket directly for the chardev
server socket, use a QIONetListener. This provides the ability
to listen on multiple sockets at the same time, so enables
full support for IPv4/IPv6 dual stack.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <20171218135417.28301-2-berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Daniel P. Berrange 2017-12-18 13:54:17 +00:00 committed by Paolo Bonzini
parent e4849c1d7c
commit 194b7f0d44
1 changed files with 30 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
chardev/char-socket.c
View File

@ -25,6 +25,7 @@
#include "chardev/char.h" #include "chardev/char.h"
#include "io/channel-socket.h" #include "io/channel-socket.h"
#include "io/channel-tls.h" #include "io/channel-tls.h"
#include "io/net-listener.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/clone-visitor.h" #include "qapi/clone-visitor.h"
@ -40,8 +41,7 @@ typedef struct {
Chardev parent; Chardev parent;
QIOChannel *ioc; /* Client I/O channel */ QIOChannel *ioc; /* Client I/O channel */
QIOChannelSocket *sioc; /* Client master channel */ QIOChannelSocket *sioc; /* Client master channel */
QIOChannelSocket *listen_ioc; QIONetListener *listener;
guint listen_tag;
QCryptoTLSCreds *tls_creds; QCryptoTLSCreds *tls_creds;
int connected; int connected;
int max_size; int max_size;
@ -93,9 +93,9 @@ static void check_report_connect_error(Chardev *chr,
qemu_chr_socket_restart_timer(chr); qemu_chr_socket_restart_timer(chr);
} }
static gboolean tcp_chr_accept(QIOChannel *chan, static void tcp_chr_accept(QIONetListener *listener,
GIOCondition cond, QIOChannelSocket *cioc,
void *opaque); void *opaque);
static int tcp_chr_read_poll(void *opaque); static int tcp_chr_read_poll(void *opaque);
static void tcp_chr_disconnect(Chardev *chr); static void tcp_chr_disconnect(Chardev *chr);
@ -401,9 +401,9 @@ static void tcp_chr_disconnect(Chardev *chr)
tcp_chr_free_connection(chr); tcp_chr_free_connection(chr);
if (s->listen_ioc && s->listen_tag == 0) { if (s->listener) {
s->listen_tag = qio_channel_add_watch( qio_net_listener_set_client_func(s->listener, tcp_chr_accept,
QIO_CHANNEL(s->listen_ioc), G_IO_IN, tcp_chr_accept, chr, NULL); chr, NULL);
} }
update_disconnected_filename(s); update_disconnected_filename(s);
if (emit_close) { if (emit_close) {
@ -702,9 +702,8 @@ static int tcp_chr_new_client(Chardev *chr, QIOChannelSocket *sioc)
if (s->do_nodelay) { if (s->do_nodelay) {
qio_channel_set_delay(s->ioc, false); qio_channel_set_delay(s->ioc, false);
} }
if (s->listen_tag) { if (s->listener) {
g_source_remove(s->listen_tag); qio_net_listener_set_client_func(s->listener, NULL, NULL, NULL);
s->listen_tag = 0;
} }
if (s->tls_creds) { if (s->tls_creds) {
@ -736,24 +735,14 @@ static int tcp_chr_add_client(Chardev *chr, int fd)
return ret; return ret;
} }
static gboolean tcp_chr_accept(QIOChannel *channel, static void tcp_chr_accept(QIONetListener *listener,
GIOCondition cond, QIOChannelSocket *cioc,
void *opaque) void *opaque)
{ {
Chardev *chr = CHARDEV(opaque); Chardev *chr = CHARDEV(opaque);
QIOChannelSocket *sioc;
sioc = qio_channel_socket_accept(QIO_CHANNEL_SOCKET(channel), tcp_chr_set_client_ioc_name(chr, cioc);
NULL); tcp_chr_new_client(chr, cioc);
if (!sioc) {
return TRUE;
}
tcp_chr_new_client(chr, sioc);
object_unref(OBJECT(sioc));
return TRUE;
} }
static int tcp_chr_wait_connected(Chardev *chr, Error **errp) static int tcp_chr_wait_connected(Chardev *chr, Error **errp)
@ -767,9 +756,10 @@ static int tcp_chr_wait_connected(Chardev *chr, Error **errp)
if (s->is_listen) { if (s->is_listen) {
info_report("QEMU waiting for connection on: %s", info_report("QEMU waiting for connection on: %s",
chr->filename); chr->filename);
qio_channel_set_blocking(QIO_CHANNEL(s->listen_ioc), true, NULL); sioc = qio_net_listener_wait_client(s->listener);
tcp_chr_accept(QIO_CHANNEL(s->listen_ioc), G_IO_IN, chr); tcp_chr_set_client_ioc_name(chr, sioc);
qio_channel_set_blocking(QIO_CHANNEL(s->listen_ioc), false, NULL); tcp_chr_new_client(chr, sioc);
object_unref(OBJECT(sioc));
} else { } else {
sioc = qio_channel_socket_new(); sioc = qio_channel_socket_new();
tcp_chr_set_client_ioc_name(chr, sioc); tcp_chr_set_client_ioc_name(chr, sioc);
@ -797,12 +787,9 @@ static void char_socket_finalize(Object *obj)
s->reconnect_timer = 0; s->reconnect_timer = 0;
} }
qapi_free_SocketAddress(s->addr); qapi_free_SocketAddress(s->addr);
if (s->listen_tag) { if (s->listener) {
g_source_remove(s->listen_tag); qio_net_listener_set_client_func(s->listener, NULL, NULL, NULL);
s->listen_tag = 0; object_unref(OBJECT(s->listener));
}
if (s->listen_ioc) {
object_unref(OBJECT(s->listen_ioc));
} }
if (s->tls_creds) { if (s->tls_creds) {
object_unref(OBJECT(s->tls_creds)); object_unref(OBJECT(s->tls_creds));
@ -935,29 +922,29 @@ static void qmp_chardev_open_socket(Chardev *chr,
} else { } else {
if (s->is_listen) { if (s->is_listen) {
char *name; char *name;
sioc = qio_channel_socket_new(); s->listener = qio_net_listener_new();
name = g_strdup_printf("chardev-tcp-listener-%s", chr->label); name = g_strdup_printf("chardev-tcp-listener-%s", chr->label);
qio_channel_set_name(QIO_CHANNEL(sioc), name); qio_net_listener_set_name(s->listener, name);
g_free(name); g_free(name);
if (qio_channel_socket_listen_sync(sioc, s->addr, errp) < 0) { if (qio_net_listener_open_sync(s->listener, s->addr, errp) < 0) {
object_unref(OBJECT(s->listener));
s->listener = NULL;
goto error; goto error;
} }
qapi_free_SocketAddress(s->addr); qapi_free_SocketAddress(s->addr);
s->addr = socket_local_address(sioc->fd, errp); s->addr = socket_local_address(s->listener->sioc[0]->fd, errp);
update_disconnected_filename(s); update_disconnected_filename(s);
s->listen_ioc = sioc;
if (is_waitconnect && if (is_waitconnect &&
qemu_chr_wait_connected(chr, errp) < 0) { qemu_chr_wait_connected(chr, errp) < 0) {
return; return;
} }
if (!s->ioc) { if (!s->ioc) {
s->listen_tag = qio_channel_add_watch( qio_net_listener_set_client_func(s->listener, tcp_chr_accept,
QIO_CHANNEL(s->listen_ioc), G_IO_IN, chr, NULL);
tcp_chr_accept, chr, NULL);
} }
} else if (qemu_chr_wait_connected(chr, errp) < 0) { } else if (qemu_chr_wait_connected(chr, errp) < 0) {
goto error; goto error;