Commit dfd100f2 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

sockets: Rename SocketAddress to SocketAddressLegacy 



The next commit will rename SocketAddressFlat to SocketAddress, and
the commit after that will replace most uses of SocketAddressLegacy by
SocketAddress, replacing most of this commit's renames right back.

Note that checkpatch emits a few "line over 80 characters" warnings.
The long lines are all temporary; the SocketAddressLegacy replacement
will shorten them again.

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

block/nbd.c

+2 −2
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ NBDClientSession *nbd_get_client_session(BlockDriverState *bs) 
static QIOChannelSocket *nbd_establish_connection(SocketAddressFlat *saddr_flat,

                                                  Error **errp)

{

    SocketAddress *saddr = socket_address_crumple(saddr_flat);

    SocketAddressLegacy *saddr = socket_address_crumple(saddr_flat);

    QIOChannelSocket *sioc;

    Error *local_err = NULL;
@@ -319,7 +319,7 @@ static QIOChannelSocket *nbd_establish_connection(SocketAddressFlat *saddr_flat, 
    qio_channel_socket_connect_sync(sioc,

                                    saddr,

                                    &local_err);

    qapi_free_SocketAddress(saddr);

    qapi_free_SocketAddressLegacy(saddr);

    if (local_err) {

        object_unref(OBJECT(sioc));

        error_propagate(errp, local_err);

block/sheepdog.c

+9 −9
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ struct BDRVSheepdogState { 
    uint32_t cache_flags;

    bool discard_supported;



    SocketAddress *addr;

    SocketAddressLegacy *addr;

    int fd;



    CoMutex lock;
@@ -530,17 +530,17 @@ static void sd_aio_setup(SheepdogAIOCB *acb, BDRVSheepdogState *s, 
    QLIST_INSERT_HEAD(&s->inflight_aiocb_head, acb, aiocb_siblings);

}



static SocketAddress *sd_socket_address(const char *path,

static SocketAddressLegacy *sd_socket_address(const char *path,

                                        const char *host, const char *port)

{

    SocketAddress *addr = g_new0(SocketAddress, 1);

    SocketAddressLegacy *addr = g_new0(SocketAddressLegacy, 1);



    if (path) {

        addr->type = SOCKET_ADDRESS_KIND_UNIX;

        addr->type = SOCKET_ADDRESS_LEGACY_KIND_UNIX;

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

        addr->u.q_unix.data->path = g_strdup(path);

    } else {

        addr->type = SOCKET_ADDRESS_KIND_INET;

        addr->type = SOCKET_ADDRESS_LEGACY_KIND_INET;

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

        addr->u.inet.data->host = g_strdup(host ?: SD_DEFAULT_ADDR);

        addr->u.inet.data->port = g_strdup(port ?: stringify(SD_DEFAULT_PORT));
@@ -549,13 +549,13 @@ static SocketAddress *sd_socket_address(const char *path, 
    return addr;

}



static SocketAddress *sd_server_config(QDict *options, Error **errp)

static SocketAddressLegacy *sd_server_config(QDict *options, Error **errp)

{

    QDict *server = NULL;

    QObject *crumpled_server = NULL;

    Visitor *iv = NULL;

    SocketAddressFlat *saddr_flat = NULL;

    SocketAddress *saddr = NULL;

    SocketAddressLegacy *saddr = NULL;

    Error *local_err = NULL;



    qdict_extract_subqdict(options, &server, "server.");
@@ -597,7 +597,7 @@ static int connect_to_sdog(BDRVSheepdogState *s, Error **errp) 


    fd = socket_connect(s->addr, NULL, NULL, errp);



    if (s->addr->type == SOCKET_ADDRESS_KIND_INET && fd >= 0) {

    if (s->addr->type == SOCKET_ADDRESS_LEGACY_KIND_INET && fd >= 0) {

        int ret = socket_set_nodelay(fd);

        if (ret < 0) {

            error_report("%s", strerror(errno));
@@ -2149,7 +2149,7 @@ static void sd_close(BlockDriverState *bs) 
    aio_set_fd_handler(bdrv_get_aio_context(bs), s->fd,

                       false, NULL, NULL, NULL, NULL);

    closesocket(s->fd);

    qapi_free_SocketAddress(s->addr);

    qapi_free_SocketAddressLegacy(s->addr);

}



static int64_t sd_getlength(BlockDriverState *bs)

blockdev-nbd.c

+3 −3
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static QCryptoTLSCreds *nbd_get_tls_creds(const char *id, Error **errp) 
}





void qmp_nbd_server_start(SocketAddress *addr,

void qmp_nbd_server_start(SocketAddressLegacy *addr,

                          bool has_tls_creds, const char *tls_creds,

                          Error **errp)

{
@@ -124,8 +124,8 @@ void qmp_nbd_server_start(SocketAddress *addr, 
            goto error;

        }



        /* TODO SOCKET_ADDRESS_KIND_FD where fd has AF_INET or AF_INET6 */

        if (addr->type != SOCKET_ADDRESS_KIND_INET) {

        /* TODO SOCKET_ADDRESS_LEGACY_KIND_FD where fd has AF_INET or AF_INET6 */

        if (addr->type != SOCKET_ADDRESS_LEGACY_KIND_INET) {

            error_setg(errp, "TLS is only supported with IPv4/IPv6");

            goto error;

        }

chardev/char-socket.c

+17 −17
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ typedef struct { 
    int *write_msgfds;

    size_t write_msgfds_num;



    SocketAddress *addr;

    SocketAddressLegacy *addr;

    bool is_listen;

    bool is_telnet;

    bool is_tn3270;
@@ -356,27 +356,27 @@ static void tcp_chr_free_connection(Chardev *chr) 
    s->connected = 0;

}



static char *SocketAddress_to_str(const char *prefix, SocketAddress *addr,

static char *SocketAddress_to_str(const char *prefix, SocketAddressLegacy *addr,

                                  bool is_listen, bool is_telnet)

{

    switch (addr->type) {

    case SOCKET_ADDRESS_KIND_INET:

    case SOCKET_ADDRESS_LEGACY_KIND_INET:

        return g_strdup_printf("%s%s:%s:%s%s", prefix,

                               is_telnet ? "telnet" : "tcp",

                               addr->u.inet.data->host,

                               addr->u.inet.data->port,

                               is_listen ? ",server" : "");

        break;

    case SOCKET_ADDRESS_KIND_UNIX:

    case SOCKET_ADDRESS_LEGACY_KIND_UNIX:

        return g_strdup_printf("%sunix:%s%s", prefix,

                               addr->u.q_unix.data->path,

                               is_listen ? ",server" : "");

        break;

    case SOCKET_ADDRESS_KIND_FD:

    case SOCKET_ADDRESS_LEGACY_KIND_FD:

        return g_strdup_printf("%sfd:%s%s", prefix, addr->u.fd.data->str,

                               is_listen ? ",server" : "");

        break;

    case SOCKET_ADDRESS_KIND_VSOCK:

    case SOCKET_ADDRESS_LEGACY_KIND_VSOCK:

        return g_strdup_printf("%svsock:%s:%s", prefix,

                               addr->u.vsock.data->cid,

                               addr->u.vsock.data->port);
@@ -796,7 +796,7 @@ static void char_socket_finalize(Object *obj) 
        g_source_remove(s->reconnect_timer);

        s->reconnect_timer = 0;

    }

    qapi_free_SocketAddress(s->addr);

    qapi_free_SocketAddressLegacy(s->addr);

    if (s->listen_tag) {

        g_source_remove(s->listen_tag);

        s->listen_tag = 0;
@@ -859,7 +859,7 @@ static void qmp_chardev_open_socket(Chardev *chr, 
{

    SocketChardev *s = SOCKET_CHARDEV(chr);

    ChardevSocket *sock = backend->u.socket.data;

    SocketAddress *addr = sock->addr;

    SocketAddressLegacy *addr = sock->addr;

    bool do_nodelay     = sock->has_nodelay ? sock->nodelay : false;

    bool is_listen      = sock->has_server  ? sock->server  : true;

    bool is_telnet      = sock->has_telnet  ? sock->telnet  : false;
@@ -905,11 +905,11 @@ static void qmp_chardev_open_socket(Chardev *chr, 
        }

    }



    s->addr = QAPI_CLONE(SocketAddress, sock->addr);

    s->addr = QAPI_CLONE(SocketAddressLegacy, sock->addr);



    qemu_chr_set_feature(chr, QEMU_CHAR_FEATURE_RECONNECTABLE);

    /* TODO SOCKET_ADDRESS_FD where fd has AF_UNIX */

    if (addr->type == SOCKET_ADDRESS_KIND_UNIX) {

    if (addr->type == SOCKET_ADDRESS_LEGACY_KIND_UNIX) {

        qemu_chr_set_feature(chr, QEMU_CHAR_FEATURE_FD_PASS);

    }
@@ -945,7 +945,7 @@ static void qmp_chardev_open_socket(Chardev *chr, 
                goto error;

            }



            qapi_free_SocketAddress(s->addr);

            qapi_free_SocketAddressLegacy(s->addr);

            s->addr = socket_local_address(sioc->fd, errp);

            update_disconnected_filename(s);
@@ -985,7 +985,7 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, 
    const char *host = qemu_opt_get(opts, "host");

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

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

    SocketAddress *addr;

    SocketAddressLegacy *addr;

    ChardevSocket *sock;



    backend->type = CHARDEV_BACKEND_KIND_SOCKET;
@@ -1022,14 +1022,14 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, 
    sock->reconnect = reconnect;

    sock->tls_creds = g_strdup(tls_creds);



    addr = g_new0(SocketAddress, 1);

    addr = g_new0(SocketAddressLegacy, 1);

    if (path) {

        UnixSocketAddress *q_unix;

        addr->type = SOCKET_ADDRESS_KIND_UNIX;

        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 {

        addr->type = SOCKET_ADDRESS_KIND_INET;

        addr->type = SOCKET_ADDRESS_LEGACY_KIND_INET;

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

        *addr->u.inet.data = (InetSocketAddress) {

            .host = g_strdup(host),
@@ -1051,7 +1051,7 @@ char_socket_get_addr(Object *obj, Visitor *v, const char *name, 
{

    SocketChardev *s = SOCKET_CHARDEV(obj);



    visit_type_SocketAddress(v, name, &s->addr, errp);

    visit_type_SocketAddressLegacy(v, name, &s->addr, errp);

}



static bool
@@ -1078,7 +1078,7 @@ static void char_socket_class_init(ObjectClass *oc, void *data) 
    cc->chr_add_watch = tcp_chr_add_watch;

    cc->chr_update_read_handler = tcp_chr_update_read_handler;



    object_class_property_add(oc, "addr", "SocketAddress",

    object_class_property_add(oc, "addr", "SocketAddressLegacy",

                              char_socket_get_addr, NULL,

                              NULL, NULL, &error_abort);

chardev/char-udp.c

+5 −5
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static void qemu_chr_parse_udp(QemuOpts *opts, ChardevBackend *backend, 
    const char *localaddr = qemu_opt_get(opts, "localaddr");

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

    bool has_local = false;

    SocketAddress *addr;

    SocketAddressLegacy *addr;

    ChardevUdp *udp;



    backend->type = CHARDEV_BACKEND_KIND_UDP;
@@ -159,8 +159,8 @@ static void qemu_chr_parse_udp(QemuOpts *opts, ChardevBackend *backend, 
    udp = backend->u.udp.data = g_new0(ChardevUdp, 1);

    qemu_chr_parse_common(opts, qapi_ChardevUdp_base(udp));



    addr = g_new0(SocketAddress, 1);

    addr->type = SOCKET_ADDRESS_KIND_INET;

    addr = g_new0(SocketAddressLegacy, 1);

    addr->type = SOCKET_ADDRESS_LEGACY_KIND_INET;

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

    *addr->u.inet.data = (InetSocketAddress) {

        .host = g_strdup(host),
@@ -174,8 +174,8 @@ static void qemu_chr_parse_udp(QemuOpts *opts, ChardevBackend *backend, 


    if (has_local) {

        udp->has_local = true;

        addr = g_new0(SocketAddress, 1);

        addr->type = SOCKET_ADDRESS_KIND_INET;

        addr = g_new0(SocketAddressLegacy, 1);

        addr->type = SOCKET_ADDRESS_LEGACY_KIND_INET;

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

        *addr->u.inet.data = (InetSocketAddress) {

            .host = g_strdup(localaddr),