Commit 58888f8c authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/berrange/tags/socket-next-pull-request' into staging 



# gpg: Signature made Tue 13 Mar 2018 18:12:14 GMT
# gpg:                using RSA key BE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF

* remotes/berrange/tags/socket-next-pull-request:
  char: allow passing pre-opened socket file descriptor at startup
  char: refactor parsing of socket address information
  sockets: allow SocketAddress 'fd' to reference numeric file descriptors
  sockets: check that the named file descriptor is a socket
  sockets: move fd_is_socket() into common sockets code
  sockets: strengthen test suite IP protocol availability checks
  sockets: pull code for testing IP availability out of specific test
  cutils: add qemu_strtoi & qemu_strtoui parsers for int/unsigned int types
  char: don't silently skip tn3270 protocol init when TLS is enabled

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 55901900 0935700f

chardev/char-socket.c

+25 −9
Original line number Diff line number Diff line
@@ -663,8 +663,7 @@ static void tcp_chr_tls_handshake(QIOTask *task, 
    if (qio_task_propagate_error(task, NULL)) {

        tcp_chr_disconnect(chr);

    } else {

        /* tn3270 does not support TLS yet */

        if (s->do_telnetopt && !s->is_tn3270) {

        if (s->do_telnetopt) {

            tcp_chr_telnet_init(chr);

        } else {

            tcp_chr_connect(chr);
@@ -1009,25 +1008,36 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, 
    const char *path = qemu_opt_get(opts, "path");

    const char *host = qemu_opt_get(opts, "host");

    const char *port = qemu_opt_get(opts, "port");

    const char *fd = qemu_opt_get(opts, "fd");

    const char *tls_creds = qemu_opt_get(opts, "tls-creds");

    SocketAddressLegacy *addr;

    ChardevSocket *sock;



    if ((!!path + !!fd + !!host) != 1) {

        error_setg(errp,

                   "Exactly one of 'path', 'fd' or 'host' required");

        return;

    }



    backend->type = CHARDEV_BACKEND_KIND_SOCKET;

    if (!path) {

        if (!host) {

            error_setg(errp, "chardev: socket: no host given");

    if (path) {

        if (tls_creds) {

            error_setg(errp, "TLS can only be used over TCP socket");

            return;

        }

    } else if (host) {

        if (!port) {

            error_setg(errp, "chardev: socket: no port given");

            return;

        }

    } else {

        if (tls_creds) {

            error_setg(errp, "TLS can only be used over TCP socket");

    } else if (fd) {

        /* We don't know what host to validate against when in client mode */

        if (tls_creds && !is_listen) {

            error_setg(errp, "TLS can not be used with pre-opened client FD");

            return;

        }

    } else {

        g_assert_not_reached();

    }



    sock = backend->u.socket.data = g_new0(ChardevSocket, 1);
@@ -1053,7 +1063,7 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, 
        addr->type = SOCKET_ADDRESS_LEGACY_KIND_UNIX;

        q_unix = addr->u.q_unix.data = g_new0(UnixSocketAddress, 1);

        q_unix->path = g_strdup(path);

    } else {

    } else if (host) {

        addr->type = SOCKET_ADDRESS_LEGACY_KIND_INET;

        addr->u.inet.data = g_new(InetSocketAddress, 1);

        *addr->u.inet.data = (InetSocketAddress) {
@@ -1066,6 +1076,12 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, 
            .has_ipv6 = qemu_opt_get(opts, "ipv6"),

            .ipv6 = qemu_opt_get_bool(opts, "ipv6", 0),

        };

    } else if (fd) {

        addr->type = SOCKET_ADDRESS_LEGACY_KIND_FD;

        addr->u.fd.data = g_new(String, 1);

        addr->u.fd.data->str = g_strdup(fd);

    } else {

        g_assert_not_reached();

    }

    sock->addr = addr;

}

chardev/char.c

+3 −0
Original line number Diff line number Diff line
@@ -807,6 +807,9 @@ QemuOptsList qemu_chardev_opts = { 
        },{

            .name = "port",

            .type = QEMU_OPT_STRING,

        },{

            .name = "fd",

            .type = QEMU_OPT_STRING,

        },{

            .name = "localaddr",

            .type = QEMU_OPT_STRING,

include/qemu/cutils.h

+4 −0
Original line number Diff line number Diff line
@@ -126,6 +126,10 @@ time_t mktimegm(struct tm *tm); 
int qemu_fdatasync(int fd);

int fcntl_setfl(int fd, int flag);

int qemu_parse_fd(const char *param);

int qemu_strtoi(const char *nptr, const char **endptr, int base,

                int *result);

int qemu_strtoui(const char *nptr, const char **endptr, int base,

                 unsigned int *result);

int qemu_strtol(const char *nptr, const char **endptr, int base,

                long *result);

int qemu_strtoul(const char *nptr, const char **endptr, int base,

include/qemu/sockets.h

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ int inet_aton(const char *cp, struct in_addr *ia); 
#include "qapi/qapi-types-sockets.h"



/* misc helpers */

bool fd_is_socket(int fd);

int qemu_socket(int domain, int type, int protocol);

int qemu_accept(int s, struct sockaddr *addr, socklen_t *addrlen);

int socket_set_cork(int fd, int v);

io/channel-util.c

+0 −13
Original line number Diff line number Diff line
@@ -24,19 +24,6 @@ 
#include "io/channel-socket.h"





static bool fd_is_socket(int fd)

{

    int optval;

    socklen_t optlen;

    optlen = sizeof(optval);

    return qemu_getsockopt(fd,

                           SOL_SOCKET,

                           SO_TYPE,

                           (char *)&optval,

                           &optlen) == 0;

}





QIOChannel *qio_channel_new_fd(int fd,

                               Error **errp)

{