falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nbd/server: nbd_negotiate: return 1 on NBD_OPT_ABORT 

Separate the case when a client sends NBD_OPT_ABORT from all other
errors. It will be needed for the following patch, where errors will be
reported.
This particular case is not actually an error - it honestly follows the
NBD protocol. Therefore it should not be reported like an error.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20170707152918.23086-2-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2017-07-07 18:29:09 +03:00 committed by Eric Blake
parent 99c62e70aa
commit 1e120ffead
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nbd/server.c
View File

@ -349,9 +349,13 @@ static QIOChannel *nbd_negotiate_handle_starttls(NBDClient *client,
return QIO_CHANNEL(tioc); return QIO_CHANNEL(tioc);
} }
/* nbd_negotiate_options
/* Process all NBD_OPT_* client option commands. * Process all NBD_OPT_* client option commands.
* Return -errno on error, 0 on success. */ * Return:
* -errno on error
* 0 on successful negotiation
* 1 if client sent NBD_OPT_ABORT, i.e. on valid disconnect
*/
static int nbd_negotiate_options(NBDClient *client) static int nbd_negotiate_options(NBDClient *client)
{ {
uint32_t flags; uint32_t flags;
@ -459,7 +463,7 @@ static int nbd_negotiate_options(NBDClient *client)
} }
/* Let the client keep trying, unless they asked to quit */ /* Let the client keep trying, unless they asked to quit */
if (clientflags == NBD_OPT_ABORT) { if (clientflags == NBD_OPT_ABORT) {
return -EINVAL; return 1;
} }
break; break;
} }
@ -477,7 +481,7 @@ static int nbd_negotiate_options(NBDClient *client)
* disconnecting, but that we must also tolerate * disconnecting, but that we must also tolerate
* guests that don't wait for our reply. */ * guests that don't wait for our reply. */
nbd_negotiate_send_rep(client->ioc, NBD_REP_ACK, clientflags); nbd_negotiate_send_rep(client->ioc, NBD_REP_ACK, clientflags);
return -EINVAL; return 1;
case NBD_OPT_EXPORT_NAME: case NBD_OPT_EXPORT_NAME:
return nbd_negotiate_handle_export_name(client, length); return nbd_negotiate_handle_export_name(client, length);
@ -533,6 +537,12 @@ static int nbd_negotiate_options(NBDClient *client)
} }
} }
/* nbd_negotiate
* Return:
* -errno on error
* 0 on successful negotiation
* 1 if client sent NBD_OPT_ABORT, i.e. on valid disconnect
*/
static coroutine_fn int nbd_negotiate(NBDClient *client) static coroutine_fn int nbd_negotiate(NBDClient *client)
{ {
char buf[8 + 8 + 8 + 128]; char buf[8 + 8 + 8 + 128];