From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0Wsn-0003xg-T6 for qemu-devel@nongnu.org; Fri, 27 Jun 2014 10:12:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X0Wsg-0006s6-SX for qemu-devel@nongnu.org; Fri, 27 Jun 2014 10:12:05 -0400 Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 27 Jun 2014 16:11:44 +0200 Message-Id: <1403878306-22683-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1403878306-22683-1-git-send-email-pbonzini@redhat.com> References: <1403878306-22683-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 3/5] nbd: Shutdown socket before closing. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Hani Benhabiles From: Hani Benhabiles This forces finishing data sending to client before closing the socket like in exports listing or replying with NBD_REP_ERR_UNSUP cases. Signed-off-by: Hani Benhabiles Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- blockdev-nbd.c | 1 + qemu-nbd.c | 1 + 2 files changed, 2 insertions(+) diff --git a/blockdev-nbd.c b/blockdev-nbd.c index 18dc528..69adf26 100644 --- a/blockdev-nbd.c +++ b/blockdev-nbd.c @@ -28,6 +28,7 @@ static void nbd_accept(void *opaque) int fd = accept(server_fd, (struct sockaddr *)&addr, &addr_len); if (fd >= 0 && !nbd_client_new(NULL, fd, nbd_client_put)) { + shutdown(fd, SHUT_RDWR); close(fd); } } diff --git a/qemu-nbd.c b/qemu-nbd.c index ba60436..bf42861 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -372,6 +372,7 @@ static void nbd_accept(void *opaque) if (nbd_client_new(exp, fd, nbd_client_closed)) { nb_fds++; } else { + shutdown(fd, SHUT_RDWR); close(fd); } } -- 1.8.3.1