Commit 4db5c619 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

sockets: Prepare vsock_parse() for flattened SocketAddress 



I'm going to flatten SocketAddress: rename SocketAddress to
SocketAddressLegacy, SocketAddressFlat to SocketAddress, eliminate
SocketAddressLegacy except in external interfaces.

vsock_parse() returns a newly allocated VsockSocketAddress.  Lift the
allocation from vsock_parse() into its caller socket_parse() to
prepare for flattening SocketAddress.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <1493192202-3184-2-git-send-email-armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent 5229564b

util/qemu-sockets.c

+10 −10
Original line number Diff line number Diff line
@@ -793,26 +793,25 @@ static int vsock_listen_saddr(VsockSocketAddress *vaddr, 
    return slisten;

}



static VsockSocketAddress *vsock_parse(const char *str, Error **errp)

static int vsock_parse(VsockSocketAddress *addr, const char *str,

                       Error **errp)

{

    VsockSocketAddress *addr = NULL;

    char cid[33];

    char port[33];

    int n;



    if (sscanf(str, "%32[^:]:%32[^,]%n", cid, port, &n) != 2) {

        error_setg(errp, "error parsing address '%s'", str);

        return NULL;

        return -1;

    }

    if (str[n] != '\0') {

        error_setg(errp, "trailing characters in address '%s'", str);

        return NULL;

        return -1;

    }



    addr = g_new0(VsockSocketAddress, 1);

    addr->cid = g_strdup(cid);

    addr->port = g_strdup(port);

    return addr;

    return 0;

}

#else

static void vsock_unsupported(Error **errp)
@@ -835,10 +834,11 @@ static int vsock_listen_saddr(VsockSocketAddress *vaddr, 
    return -1;

}



static VsockSocketAddress *vsock_parse(const char *str, Error **errp)

static int vsock_parse(VsockSocketAddress *addr, const char *str,

                        Error **errp)

{

    vsock_unsupported(errp);

    return NULL;

    return -1;

}

#endif /* CONFIG_AF_VSOCK */
@@ -1060,8 +1060,8 @@ SocketAddress *socket_parse(const char *str, Error **errp) 
        }

    } else if (strstart(str, "vsock:", NULL)) {

        addr->type = SOCKET_ADDRESS_KIND_VSOCK;

        addr->u.vsock.data = vsock_parse(str + strlen("vsock:"), errp);

        if (addr->u.vsock.data == NULL) {

        addr->u.vsock.data = g_new(VsockSocketAddress, 1);

        if (vsock_parse(addr->u.vsock.data, str + strlen("vsock:"), errp)) {

            goto fail;

        }

    } else {