]> git.proxmox.com Git - qemu.git/blobdiff - nbd.c
vnc: tight: Fix crash after 2GB of output
[qemu.git] / nbd.c
diff --git a/nbd.c b/nbd.c
index c138d362ef18573a1d8ca946a2996a3ee55d370a..d8ebc4298fc0f5bd85b7ea1ff7eafd1cdb723af8 100644 (file)
--- a/nbd.c
+++ b/nbd.c
@@ -1,4 +1,4 @@
-/*\
+/*
  *  Copyright (C) 2005  Anthony Liguori <anthony@codemonkey.ws>
  *
  *  Network Block Device
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-\*/
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
 
 #include "nbd.h"
 
 #include <errno.h>
 #include <string.h>
+#ifndef _WIN32
 #include <sys/ioctl.h>
+#endif
+#if defined(__sun__) || defined(__HAIKU__)
+#include <sys/ioccom.h>
+#endif
 #include <ctype.h>
 #include <inttypes.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <netdb.h>
 
-extern int verbose;
+#include "qemu_socket.h"
+
+//#define DEBUG_NBD
+
+#ifdef DEBUG_NBD
+#define TRACE(msg, ...) do { \
+    LOG(msg, ## __VA_ARGS__); \
+} while(0)
+#else
+#define TRACE(msg, ...) \
+    do { } while (0)
+#endif
 
 #define LOG(msg, ...) do { \
     fprintf(stderr, "%s:%s():L%d: " msg "\n", \
             __FILE__, __FUNCTION__, __LINE__, ## __VA_ARGS__); \
 } while(0)
 
-#define TRACE(msg, ...) do { \
-    if (verbose) LOG(msg, ## __VA_ARGS__); \
-} while(0)
-
 /* This is all part of the "official" NBD API */
 
+#define NBD_REPLY_SIZE         (4 + 4 + 8)
 #define NBD_REQUEST_MAGIC       0x25609513
 #define NBD_REPLY_MAGIC         0x67446698
 
@@ -56,12 +63,14 @@ extern int verbose;
 #define NBD_SET_SIZE_BLOCKS    _IO(0xab, 7)
 #define NBD_DISCONNECT          _IO(0xab, 8)
 
+#define NBD_OPT_EXPORT_NAME    (1 << 0)
+
 /* That's all folks */
 
-#define read_sync(fd, buffer, size) wr_sync(fd, buffer, size, true)
-#define write_sync(fd, buffer, size) wr_sync(fd, buffer, size, false)
+#define read_sync(fd, buffer, size) nbd_wr_sync(fd, buffer, size, true)
+#define write_sync(fd, buffer, size) nbd_wr_sync(fd, buffer, size, false)
 
-static size_t wr_sync(int fd, void *buffer, size_t size, bool do_read)
+size_t nbd_wr_sync(int fd, void *buffer, size_t size, bool do_read)
 {
     size_t offset = 0;
 
@@ -69,13 +78,16 @@ static size_t wr_sync(int fd, void *buffer, size_t size, bool do_read)
         ssize_t len;
 
         if (do_read) {
-            len = read(fd, buffer + offset, size - offset);
+            len = recv(fd, buffer + offset, size - offset, 0);
         } else {
-            len = write(fd, buffer + offset, size - offset);
+            len = send(fd, buffer + offset, size - offset, 0);
         }
 
+        if (len == -1)
+            errno = socket_error();
+
         /* recoverable error */
-        if (len == -1 && errno == EAGAIN) {
+        if (len == -1 && (errno == EAGAIN || errno == EINTR)) {
             continue;
         }
 
@@ -95,12 +107,11 @@ static size_t wr_sync(int fd, void *buffer, size_t size, bool do_read)
     return offset;
 }
 
-static int tcp_socket_outgoing(const char *address, uint16_t port)
+int tcp_socket_outgoing(const char *address, uint16_t port)
 {
     int s;
     struct in_addr in;
     struct sockaddr_in addr;
-    int serrno;
 
     s = socket(PF_INET, SOCK_STREAM, 0);
     if (s == -1) {
@@ -128,9 +139,7 @@ static int tcp_socket_outgoing(const char *address, uint16_t port)
 
     return s;
 error:
-    serrno = errno;
-    close(s);
-    errno = serrno;
+    closesocket(s);
     return -1;
 }
 
@@ -139,7 +148,6 @@ int tcp_socket_incoming(const char *address, uint16_t port)
     int s;
     struct in_addr in;
     struct sockaddr_in addr;
-    int serrno;
     int opt;
 
     s = socket(PF_INET, SOCK_STREAM, 0);
@@ -163,7 +171,8 @@ int tcp_socket_incoming(const char *address, uint16_t port)
     memcpy(&addr.sin_addr.s_addr, &in, sizeof(in));
 
     opt = 1;
-    if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) == -1) {
+    if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
+                   (const void *) &opt, sizeof(opt)) == -1) {
         goto error;
     }
 
@@ -177,12 +186,77 @@ int tcp_socket_incoming(const char *address, uint16_t port)
 
     return s;
 error:
-    serrno = errno;
-    close(s);
-    errno = serrno;
+    closesocket(s);
+    return -1;
+}
+
+#ifndef _WIN32
+int unix_socket_incoming(const char *path)
+{
+    int s;
+    struct sockaddr_un addr;
+
+    s = socket(PF_UNIX, SOCK_STREAM, 0);
+    if (s == -1) {
+        return -1;
+    }
+
+    memset(&addr, 0, sizeof(addr));
+    addr.sun_family = AF_UNIX;
+    pstrcpy(addr.sun_path, sizeof(addr.sun_path), path);
+
+    if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
+        goto error;
+    }
+
+    if (listen(s, 128) == -1) {
+        goto error;
+    }
+
+    return s;
+error:
+    closesocket(s);
+    return -1;
+}
+
+int unix_socket_outgoing(const char *path)
+{
+    int s;
+    struct sockaddr_un addr;
+
+    s = socket(PF_UNIX, SOCK_STREAM, 0);
+    if (s == -1) {
+        return -1;
+    }
+
+    memset(&addr, 0, sizeof(addr));
+    addr.sun_family = AF_UNIX;
+    pstrcpy(addr.sun_path, sizeof(addr.sun_path), path);
+
+    if (connect(s, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
+        goto error;
+    }
+
+    return s;
+error:
+    closesocket(s);
+    return -1;
+}
+#else
+int unix_socket_incoming(const char *path)
+{
+    errno = ENOTSUP;
     return -1;
 }
 
+int unix_socket_outgoing(const char *path)
+{
+    errno = ENOTSUP;
+    return -1;
+}
+#endif
+
+
 /* Basic flow
 
    Server         Client
@@ -197,7 +271,7 @@ error:
                   Request (type == 2)
 */
 
-int nbd_negotiate(BlockDriverState *bs, int csock, off_t size)
+int nbd_negotiate(int csock, off_t size)
 {
        char buf[8 + 8 + 8 + 128];
 
@@ -225,36 +299,37 @@ int nbd_negotiate(BlockDriverState *bs, int csock, off_t size)
        return 0;
 }
 
-int nbd_receive_negotiate(int fd, int csock)
+int nbd_receive_negotiate(int csock, const char *name, uint32_t *flags,
+                          off_t *size, size_t *blocksize)
 {
-       char buf[8 + 8 + 8 + 128];
-       uint64_t magic;
-       off_t size;
-       size_t blocksize;
+       char buf[256];
+       uint64_t magic, s;
+       uint16_t tmp;
 
        TRACE("Receiving negotation.");
 
-       if (read_sync(csock, buf, sizeof(buf)) != sizeof(buf)) {
+       if (read_sync(csock, buf, 8) != 8) {
                LOG("read failed");
                errno = EINVAL;
                return -1;
        }
 
-       magic = be64_to_cpup((uint64_t*)(buf + 8));
-       size = be64_to_cpup((uint64_t*)(buf + 16));
-       blocksize = 1024;
+       buf[8] = '\0';
+       if (strlen(buf) == 0) {
+               LOG("server connection closed");
+               errno = EINVAL;
+               return -1;
+       }
 
        TRACE("Magic is %c%c%c%c%c%c%c%c",
-             isprint(buf[0]) ? buf[0] : '.',
-             isprint(buf[1]) ? buf[1] : '.',
-             isprint(buf[2]) ? buf[2] : '.',
-             isprint(buf[3]) ? buf[3] : '.',
-             isprint(buf[4]) ? buf[4] : '.',
-             isprint(buf[5]) ? buf[5] : '.',
-             isprint(buf[6]) ? buf[6] : '.',
-             isprint(buf[7]) ? buf[7] : '.');
-       TRACE("Magic is 0x%" PRIx64, magic);
-       TRACE("Size is %" PRIu64, size);
+             qemu_isprint(buf[0]) ? buf[0] : '.',
+             qemu_isprint(buf[1]) ? buf[1] : '.',
+             qemu_isprint(buf[2]) ? buf[2] : '.',
+             qemu_isprint(buf[3]) ? buf[3] : '.',
+             qemu_isprint(buf[4]) ? buf[4] : '.',
+             qemu_isprint(buf[5]) ? buf[5] : '.',
+             qemu_isprint(buf[6]) ? buf[6] : '.',
+             qemu_isprint(buf[7]) ? buf[7] : '.');
 
        if (memcmp(buf, "NBDMAGIC", 8) != 0) {
                LOG("Invalid magic received");
@@ -262,14 +337,108 @@ int nbd_receive_negotiate(int fd, int csock)
                return -1;
        }
 
-       TRACE("Checking magic");
+       if (read_sync(csock, &magic, sizeof(magic)) != sizeof(magic)) {
+               LOG("read failed");
+               errno = EINVAL;
+               return -1;
+       }
+       magic = be64_to_cpu(magic);
+       TRACE("Magic is 0x%" PRIx64, magic);
+
+       if (name) {
+               uint32_t reserved = 0;
+               uint32_t opt;
+               uint32_t namesize;
 
-       if (magic != 0x00420281861253LL) {
-               LOG("Bad magic received");
+               TRACE("Checking magic (opts_magic)");
+               if (magic != 0x49484156454F5054LL) {
+                       LOG("Bad magic received");
+                       errno = EINVAL;
+                       return -1;
+               }
+               if (read_sync(csock, &tmp, sizeof(tmp)) != sizeof(tmp)) {
+                       LOG("flags read failed");
+                       errno = EINVAL;
+                       return -1;
+               }
+               *flags = be16_to_cpu(tmp) << 16;
+               /* reserved for future use */
+               if (write_sync(csock, &reserved, sizeof(reserved)) !=
+                   sizeof(reserved)) {
+                       LOG("write failed (reserved)");
+                       errno = EINVAL;
+                       return -1;
+               }
+               /* write the export name */
+               magic = cpu_to_be64(magic);
+               if (write_sync(csock, &magic, sizeof(magic)) != sizeof(magic)) {
+                       LOG("write failed (magic)");
+                       errno = EINVAL;
+                       return -1;
+               }
+               opt = cpu_to_be32(NBD_OPT_EXPORT_NAME);
+               if (write_sync(csock, &opt, sizeof(opt)) != sizeof(opt)) {
+                       LOG("write failed (opt)");
+                       errno = EINVAL;
+                       return -1;
+               }
+               namesize = cpu_to_be32(strlen(name));
+               if (write_sync(csock, &namesize, sizeof(namesize)) !=
+                   sizeof(namesize)) {
+                       LOG("write failed (namesize)");
+                       errno = EINVAL;
+                       return -1;
+               }
+               if (write_sync(csock, (char*)name, strlen(name)) != strlen(name)) {
+                       LOG("write failed (name)");
+                       errno = EINVAL;
+                       return -1;
+               }
+       } else {
+               TRACE("Checking magic (cli_magic)");
+
+               if (magic != 0x00420281861253LL) {
+                       LOG("Bad magic received");
+                       errno = EINVAL;
+                       return -1;
+               }
+       }
+
+       if (read_sync(csock, &s, sizeof(s)) != sizeof(s)) {
+               LOG("read failed");
                errno = EINVAL;
                return -1;
        }
+       *size = be64_to_cpu(s);
+       *blocksize = 1024;
+       TRACE("Size is %" PRIu64, *size);
 
+       if (!name) {
+               if (read_sync(csock, flags, sizeof(*flags)) != sizeof(*flags)) {
+                       LOG("read failed (flags)");
+                       errno = EINVAL;
+                       return -1;
+               }
+               *flags = be32_to_cpup(flags);
+       } else {
+               if (read_sync(csock, &tmp, sizeof(tmp)) != sizeof(tmp)) {
+                       LOG("read failed (tmp)");
+                       errno = EINVAL;
+                       return -1;
+               }
+               *flags |= be32_to_cpu(tmp);
+       }
+       if (read_sync(csock, &buf, 124) != 124) {
+               LOG("read failed (buf)");
+               errno = EINVAL;
+               return -1;
+       }
+        return 0;
+}
+
+#ifndef _WIN32
+int nbd_init(int fd, int csock, off_t size, size_t blocksize)
+{
        TRACE("Setting block size to %lu", (unsigned long)blocksize);
 
        if (ioctl(fd, NBD_SET_BLKSIZE, blocksize) == -1) {
@@ -279,8 +448,7 @@ int nbd_receive_negotiate(int fd, int csock)
                return -1;
        }
 
-       TRACE("Setting size to %llu block(s)",
-             (unsigned long long)(size / blocksize));
+        TRACE("Setting size to %zd block(s)", (size_t)(size / blocksize));
 
        if (ioctl(fd, NBD_SET_SIZE_BLOCKS, size / blocksize) == -1) {
                int serrno = errno;
@@ -320,7 +488,7 @@ int nbd_disconnect(int fd)
        return 0;
 }
 
-int nbd_client(int fd, int csock)
+int nbd_client(int fd)
 {
        int ret;
        int serrno;
@@ -341,21 +509,51 @@ int nbd_client(int fd, int csock)
        errno = serrno;
        return ret;
 }
+#else
+int nbd_init(int fd, int csock, off_t size, size_t blocksize)
+{
+    errno = ENOTSUP;
+    return -1;
+}
 
-int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, off_t *offset, bool readonly)
+int nbd_disconnect(int fd)
 {
-#ifndef _REENTRANT
-       static uint8_t data[1024 * 1024]; // keep this off of the stack
-#else
-       uint8_t data[1024 * 1024];
+    errno = ENOTSUP;
+    return -1;
+}
+
+int nbd_client(int fd)
+{
+    errno = ENOTSUP;
+    return -1;
+}
 #endif
+
+int nbd_send_request(int csock, struct nbd_request *request)
+{
        uint8_t buf[4 + 4 + 8 + 8 + 4];
-       uint32_t magic;
-       uint32_t type;
-       uint64_t from;
-       uint32_t len;
 
-       TRACE("Reading request.");
+       cpu_to_be32w((uint32_t*)buf, NBD_REQUEST_MAGIC);
+       cpu_to_be32w((uint32_t*)(buf + 4), request->type);
+       cpu_to_be64w((uint64_t*)(buf + 8), request->handle);
+       cpu_to_be64w((uint64_t*)(buf + 16), request->from);
+       cpu_to_be32w((uint32_t*)(buf + 24), request->len);
+
+       TRACE("Sending request to client");
+
+       if (write_sync(csock, buf, sizeof(buf)) != sizeof(buf)) {
+               LOG("writing to socket failed");
+               errno = EINVAL;
+               return -1;
+       }
+       return 0;
+}
+
+
+static int nbd_receive_request(int csock, struct nbd_request *request)
+{
+       uint8_t buf[4 + 4 + 8 + 8 + 4];
+       uint32_t magic;
 
        if (read_sync(csock, buf, sizeof(buf)) != sizeof(buf)) {
                LOG("read failed");
@@ -364,97 +562,169 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, o
        }
 
        /* Request
-         [ 0 ..  3]   magic   (NBD_REQUEST_MAGIC)
-         [ 4 ..  7]   type    (0 == READ, 1 == WRITE)
-         [ 8 .. 15]   handle
-         [16 .. 23]   from
-         [24 .. 27]   len
+          [ 0 ..  3]   magic   (NBD_REQUEST_MAGIC)
+          [ 4 ..  7]   type    (0 == READ, 1 == WRITE)
+          [ 8 .. 15]   handle
+          [16 .. 23]   from
+          [24 .. 27]   len
         */
 
        magic = be32_to_cpup((uint32_t*)buf);
-       type  = be32_to_cpup((uint32_t*)(buf + 4));
-       from  = be64_to_cpup((uint64_t*)(buf + 16));
-       len   = be32_to_cpup((uint32_t*)(buf + 24));
+       request->type  = be32_to_cpup((uint32_t*)(buf + 4));
+       request->handle = be64_to_cpup((uint64_t*)(buf + 8));
+       request->from  = be64_to_cpup((uint64_t*)(buf + 16));
+       request->len   = be32_to_cpup((uint32_t*)(buf + 24));
 
        TRACE("Got request: "
              "{ magic = 0x%x, .type = %d, from = %" PRIu64" , len = %u }",
-             magic, type, from, len);
-
+             magic, request->type, request->from, request->len);
 
        if (magic != NBD_REQUEST_MAGIC) {
                LOG("invalid magic (got 0x%x)", magic);
                errno = EINVAL;
                return -1;
        }
+       return 0;
+}
+
+int nbd_receive_reply(int csock, struct nbd_reply *reply)
+{
+       uint8_t buf[NBD_REPLY_SIZE];
+       uint32_t magic;
+
+       memset(buf, 0xAA, sizeof(buf));
 
-       if (len > sizeof(data)) {
-               LOG("len (%u) is larger than max len (%lu)",
-                   len, (unsigned long)sizeof(data));
+       if (read_sync(csock, buf, sizeof(buf)) != sizeof(buf)) {
+               LOG("read failed");
                errno = EINVAL;
                return -1;
        }
 
-       if ((from + len) < from) {
+       /* Reply
+          [ 0 ..  3]    magic   (NBD_REPLY_MAGIC)
+          [ 4 ..  7]    error   (0 == no error)
+          [ 7 .. 15]    handle
+        */
+
+       magic = be32_to_cpup((uint32_t*)buf);
+       reply->error  = be32_to_cpup((uint32_t*)(buf + 4));
+       reply->handle = be64_to_cpup((uint64_t*)(buf + 8));
+
+       TRACE("Got reply: "
+             "{ magic = 0x%x, .error = %d, handle = %" PRIu64" }",
+             magic, reply->error, reply->handle);
+
+       if (magic != NBD_REPLY_MAGIC) {
+               LOG("invalid magic (got 0x%x)", magic);
+               errno = EINVAL;
+               return -1;
+       }
+       return 0;
+}
+
+static int nbd_send_reply(int csock, struct nbd_reply *reply)
+{
+       uint8_t buf[4 + 4 + 8];
+
+       /* Reply
+          [ 0 ..  3]    magic   (NBD_REPLY_MAGIC)
+          [ 4 ..  7]    error   (0 == no error)
+          [ 7 .. 15]    handle
+        */
+       cpu_to_be32w((uint32_t*)buf, NBD_REPLY_MAGIC);
+       cpu_to_be32w((uint32_t*)(buf + 4), reply->error);
+       cpu_to_be64w((uint64_t*)(buf + 8), reply->handle);
+
+       TRACE("Sending response to client");
+
+       if (write_sync(csock, buf, sizeof(buf)) != sizeof(buf)) {
+               LOG("writing to socket failed");
+               errno = EINVAL;
+               return -1;
+       }
+       return 0;
+}
+
+int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset,
+             off_t *offset, bool readonly, uint8_t *data, int data_size)
+{
+       struct nbd_request request;
+       struct nbd_reply reply;
+
+       TRACE("Reading request.");
+
+       if (nbd_receive_request(csock, &request) == -1)
+               return -1;
+
+       if (request.len + NBD_REPLY_SIZE > data_size) {
+               LOG("len (%u) is larger than max len (%u)",
+                   request.len + NBD_REPLY_SIZE, data_size);
+               errno = EINVAL;
+               return -1;
+       }
+
+       if ((request.from + request.len) < request.from) {
                LOG("integer overflow detected! "
                    "you're probably being attacked");
                errno = EINVAL;
                return -1;
        }
 
-       if ((from + len) > size) {
+       if ((request.from + request.len) > size) {
                LOG("From: %" PRIu64 ", Len: %u, Size: %" PRIu64
                    ", Offset: %" PRIu64 "\n",
-                    from, len, size, dev_offset);
+                    request.from, request.len, (uint64_t)size, dev_offset);
                LOG("requested operation past EOF--bad client?");
                errno = EINVAL;
                return -1;
        }
 
-       /* Reply
-        [ 0 ..  3]    magic   (NBD_REPLY_MAGIC)
-        [ 4 ..  7]    error   (0 == no error)
-         [ 7 .. 15]    handle
-        */
-       cpu_to_be32w((uint32_t*)buf, NBD_REPLY_MAGIC);
-       cpu_to_be32w((uint32_t*)(buf + 4), 0);
-
        TRACE("Decoding type");
 
-       switch (type) {
-       case 0:
+       reply.handle = request.handle;
+       reply.error = 0;
+
+       switch (request.type) {
+       case NBD_CMD_READ:
                TRACE("Request type is READ");
 
-               if (bdrv_read(bs, (from + dev_offset) / 512, data, len / 512) == -1) {
+               if (bdrv_read(bs, (request.from + dev_offset) / 512,
+                             data + NBD_REPLY_SIZE,
+                             request.len / 512) == -1) {
                        LOG("reading from file failed");
                        errno = EINVAL;
                        return -1;
                }
-               *offset += len;
+               *offset += request.len;
 
-               TRACE("Read %u byte(s)", len);
+               TRACE("Read %u byte(s)", request.len);
 
-               TRACE("Sending OK response");
+               /* Reply
+                  [ 0 ..  3]    magic   (NBD_REPLY_MAGIC)
+                  [ 4 ..  7]    error   (0 == no error)
+                  [ 7 .. 15]    handle
+                */
 
-               if (write_sync(csock, buf, 16) != 16) {
-                       LOG("writing to socket failed");
-                       errno = EINVAL;
-                       return -1;
-               }
+               cpu_to_be32w((uint32_t*)data, NBD_REPLY_MAGIC);
+               cpu_to_be32w((uint32_t*)(data + 4), reply.error);
+               cpu_to_be64w((uint64_t*)(data + 8), reply.handle);
 
                TRACE("Sending data to client");
 
-               if (write_sync(csock, data, len) != len) {
+               if (write_sync(csock, data,
+                              request.len + NBD_REPLY_SIZE) !=
+                              request.len + NBD_REPLY_SIZE) {
                        LOG("writing to socket failed");
                        errno = EINVAL;
                        return -1;
                }
                break;
-       case 1:
+       case NBD_CMD_WRITE:
                TRACE("Request type is WRITE");
 
-               TRACE("Reading %u byte(s)", len);
+               TRACE("Reading %u byte(s)", request.len);
 
-               if (read_sync(csock, data, len) != len) {
+               if (read_sync(csock, data, request.len) != request.len) {
                        LOG("reading from socket failed");
                        errno = EINVAL;
                        return -1;
@@ -462,34 +732,29 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, o
 
                if (readonly) {
                        TRACE("Server is read-only, return error");
-
-                       cpu_to_be32w((uint32_t*)(buf + 4), 1);
+                       reply.error = 1;
                } else {
                        TRACE("Writing to device");
 
-                       if (bdrv_write(bs, (from + dev_offset) / 512, data, len / 512) == -1) {
+                       if (bdrv_write(bs, (request.from + dev_offset) / 512,
+                                      data, request.len / 512) == -1) {
                                LOG("writing to file failed");
                                errno = EINVAL;
                                return -1;
                        }
 
-                       *offset += len;
+                       *offset += request.len;
                }
 
-               TRACE("Sending response to client");
-
-               if (write_sync(csock, buf, 16) != 16) {
-                       LOG("writing to socket failed");
-                       errno = EINVAL;
+               if (nbd_send_reply(csock, &reply) == -1)
                        return -1;
-               }
                break;
-       case 2:
+       case NBD_CMD_DISC:
                TRACE("Request type is DISCONNECT");
                errno = 0;
                return 1;
        default:
-               LOG("invalid request type (%u) received", type);
+               LOG("invalid request type (%u) received", request.type);
                errno = EINVAL;
                return -1;
        }