Commit 216411b8 authored by Markus Armbruster's avatar Markus Armbruster Committed by Max Reitz
Browse files

sockets: New helper socket_address_crumple() 



SocketAddress is a simple union, and simple unions are awkward: they
have their variant members wrapped in a "data" object on the wire, and
require additional indirections in C.  I intend to limit its use to
existing external interfaces.  New ones should use SocketAddressFlat.
I further intend to convert all internal interfaces to
SocketAddressFlat.  This helper should go away then.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-id: 1490895797-29094-8-git-send-email-armbru@redhat.com
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 8bc0673f

include/qemu/sockets.h

+11 −0
Original line number Diff line number Diff line
@@ -119,4 +119,15 @@ SocketAddress *socket_remote_address(int fd, Error **errp); 
 */

char *socket_address_to_string(struct SocketAddress *addr, Error **errp);



/**

 * socket_address_crumple:

 * @addr_flat: the socket address to crumple

 *

 * Convert SocketAddressFlat to SocketAddress.  Caller is responsible

 * for freeing with qapi_free_SocketAddress().

 *

 * Returns: the argument converted to SocketAddress.

 */

SocketAddress *socket_address_crumple(SocketAddressFlat *addr_flat);



#endif /* QEMU_SOCKETS_H */

util/qemu-sockets.c

+32 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "qapi/error.h"

#include "qemu/sockets.h"

#include "qemu/main-loop.h"

#include "qapi/clone-visitor.h"

#include "qapi/qobject-input-visitor.h"

#include "qapi/qobject-output-visitor.h"

#include "qapi-visit.h"
@@ -1341,3 +1342,34 @@ char *socket_address_to_string(struct SocketAddress *addr, Error **errp) 
    }

    return buf;

}



SocketAddress *socket_address_crumple(SocketAddressFlat *addr_flat)

{

    SocketAddress *addr = g_new(SocketAddress, 1);



    switch (addr_flat->type) {

    case SOCKET_ADDRESS_FLAT_TYPE_INET:

        addr->type = SOCKET_ADDRESS_KIND_INET;

        addr->u.inet.data = QAPI_CLONE(InetSocketAddress,

                                       &addr_flat->u.inet);

        break;

    case SOCKET_ADDRESS_FLAT_TYPE_UNIX:

        addr->type = SOCKET_ADDRESS_KIND_UNIX;

        addr->u.q_unix.data = QAPI_CLONE(UnixSocketAddress,

                                         &addr_flat->u.q_unix);

        break;

    case SOCKET_ADDRESS_FLAT_TYPE_VSOCK:

        addr->type = SOCKET_ADDRESS_KIND_VSOCK;

        addr->u.vsock.data = QAPI_CLONE(VsockSocketAddress,

                                        &addr_flat->u.vsock);

        break;

    case SOCKET_ADDRESS_FLAT_TYPE_FD:

        addr->type = SOCKET_ADDRESS_KIND_FD;

        addr->u.fd.data = QAPI_CLONE(String, &addr_flat->u.fd);

        break;

    default:

        abort();

    }



    return addr;

}