Commit 2e425fd5 authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Eric Blake
Browse files

nbd/server: add nbd_opt_invalid helper 



NBD_REP_ERR_INVALID is often parameter to nbd_opt_drop and it would
be used more in following patches. So, let's add a helper.

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <20180312152126.286890-2-vsementsov@virtuozzo.com>
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent 44a8174e

nbd/server.c

+36 −14
Original line number Diff line number Diff line
@@ -218,19 +218,43 @@ nbd_negotiate_send_rep_err(NBDClient *client, uint32_t type, 
/* Drop remainder of the current option, and send a reply with the

 * given error type and message. Return -errno on read or write

 * failure; or 0 if connection is still live. */

static int GCC_FMT_ATTR(4, 0)

nbd_opt_vdrop(NBDClient *client, uint32_t type, Error **errp,

              const char *fmt, va_list va)

{

    int ret = nbd_drop(client->ioc, client->optlen, errp);



    client->optlen = 0;

    if (!ret) {

        ret = nbd_negotiate_send_rep_verr(client, type, errp, fmt, va);

    }

    return ret;

}



static int GCC_FMT_ATTR(4, 5)

nbd_opt_drop(NBDClient *client, uint32_t type, Error **errp,

             const char *fmt, ...)

{

    int ret = nbd_drop(client->ioc, client->optlen, errp);

    int ret;

    va_list va;



    client->optlen = 0;

    if (!ret) {

    va_start(va, fmt);

        ret = nbd_negotiate_send_rep_verr(client, type, errp, fmt, va);

    ret = nbd_opt_vdrop(client, type, errp, fmt, va);

    va_end(va);



    return ret;

}



static int GCC_FMT_ATTR(3, 4)

nbd_opt_invalid(NBDClient *client, Error **errp, const char *fmt, ...)

{

    int ret;

    va_list va;



    va_start(va, fmt);

    ret = nbd_opt_vdrop(client, NBD_REP_ERR_INVALID, errp, fmt, va);

    va_end(va);



    return ret;

}
@@ -241,7 +265,7 @@ static int nbd_opt_read(NBDClient *client, void *buffer, size_t size, 
                        Error **errp)

{

    if (size > client->optlen) {

        return nbd_opt_drop(client, NBD_REP_ERR_INVALID, errp,

        return nbd_opt_invalid(client, errp,

                               "Inconsistent lengths in option %s",

                               nbd_opt_lookup(client->opt));

    }
@@ -398,8 +422,7 @@ static int nbd_reject_length(NBDClient *client, bool fatal, Error **errp) 
    int ret;



    assert(client->optlen);

    ret = nbd_opt_drop(client, NBD_REP_ERR_INVALID, errp,

                       "option '%s' has unexpected length",

    ret = nbd_opt_invalid(client, errp, "option '%s' has unexpected length",

                          nbd_opt_lookup(client->opt));

    if (fatal && !ret) {

        error_setg(errp, "option '%s' has unexpected length",
@@ -438,8 +461,7 @@ static int nbd_negotiate_handle_info(NBDClient *client, uint16_t myflags, 
    }

    be32_to_cpus(&namelen);

    if (namelen >= sizeof(name)) {

        return nbd_opt_drop(client, NBD_REP_ERR_INVALID, errp,

                            "name too long for qemu");

        return nbd_opt_invalid(client, errp, "name too long for qemu");

    }

    rc = nbd_opt_read(client, name, namelen, errp);

    if (rc <= 0) {