qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Daniel P. Berrange" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Felipe Franciosi <felipe@nutanix.com>,
	"Daniel P . Berrange" <berrange@redhat.com>
Subject: [Qemu-devel] [PULL v1 04/10] io: Add a QIOChannelSocket cleanup test
Date: Thu, 20 Oct 2016 14:48:00 +0100	[thread overview]
Message-ID: <1476971286-10612-5-git-send-email-berrange@redhat.com> (raw)
In-Reply-To: <1476971286-10612-1-git-send-email-berrange@redhat.com>

From: Felipe Franciosi <felipe@nutanix.com>

This patch adds a test to verify that the QIOChannel framework will not
unlink a filesystem unix socket unless the _FEATURE_LISTEN bit is set.

Due to a bug introduced in 74b6ce43, the framework would unlink the
entry if the _FEATURE_SHUTDOWN bit was set, regardless of the presence
of _FEATURE_LISTEN.

Signed-off-by: Felipe Franciosi <felipe@nutanix.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 tests/test-io-channel-socket.c | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/tests/test-io-channel-socket.c b/tests/test-io-channel-socket.c
index f73e063..aa88c3c 100644
--- a/tests/test-io-channel-socket.c
+++ b/tests/test-io-channel-socket.c
@@ -491,6 +491,37 @@ static void test_io_channel_unix_fd_pass(void)
     }
     g_free(fdrecv);
 }
+
+static void test_io_channel_unix_listen_cleanup(void)
+{
+    QIOChannelSocket *ioc;
+    struct sockaddr_un un;
+    int sock;
+
+#define TEST_SOCKET "test-io-channel-socket.sock"
+
+    ioc = qio_channel_socket_new();
+
+    /* Manually bind ioc without calling the qio api to avoid setting
+     * the LISTEN feature */
+    sock = qemu_socket(PF_UNIX, SOCK_STREAM, 0);
+    memset(&un, 0, sizeof(un));
+    un.sun_family = AF_UNIX;
+    snprintf(un.sun_path, sizeof(un.sun_path), "%s", TEST_SOCKET);
+    unlink(TEST_SOCKET);
+    bind(sock, (struct sockaddr *)&un, sizeof(un));
+    ioc->fd = sock;
+    ioc->localAddrLen = sizeof(ioc->localAddr);
+    getsockname(sock, (struct sockaddr *)&ioc->localAddr,
+                &ioc->localAddrLen);
+
+    g_assert(g_file_test(TEST_SOCKET, G_FILE_TEST_EXISTS));
+    object_unref(OBJECT(ioc));
+    g_assert(g_file_test(TEST_SOCKET, G_FILE_TEST_EXISTS));
+
+    unlink(TEST_SOCKET);
+}
+
 #endif /* _WIN32 */
 
 
@@ -562,6 +593,8 @@ int main(int argc, char **argv)
                     test_io_channel_unix_async);
     g_test_add_func("/io/channel/socket/unix-fd-pass",
                     test_io_channel_unix_fd_pass);
+    g_test_add_func("/io/channel/socket/unix-listen-cleanup",
+                    test_io_channel_unix_listen_cleanup);
 #endif /* _WIN32 */
 
     return g_test_run();
-- 
2.7.4

  parent reply	other threads:[~2016-10-20 13:48 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-20 13:47 [Qemu-devel] [PULL v1 00/10] Merge qio 2016/10/20 Daniel P. Berrange
2016-10-20 13:47 ` [Qemu-devel] [PULL v1 01/10] io: Fix double shift usages on QIOChannel features Daniel P. Berrange
2016-10-20 13:47 ` [Qemu-devel] [PULL v1 02/10] io: Use qio_channel_has_feature() where applicable Daniel P. Berrange
2016-10-20 13:47 ` [Qemu-devel] [PULL v1 03/10] io: Introduce a qio_channel_set_feature() helper Daniel P. Berrange
2016-10-20 13:48 ` Daniel P. Berrange [this message]
2016-10-20 13:48 ` [Qemu-devel] [PULL v1 05/10] io: add ability to set a name for IO channels Daniel P. Berrange
2016-10-20 13:48 ` [Qemu-devel] [PULL v1 06/10] nbd: set name for all I/O channels created Daniel P. Berrange
2016-10-20 13:48 ` [Qemu-devel] [PULL v1 07/10] char: " Daniel P. Berrange
2016-10-20 13:48 ` [Qemu-devel] [PULL v1 08/10] migration: " Daniel P. Berrange
2016-10-20 13:48 ` [Qemu-devel] [PULL v1 09/10] vnc: " Daniel P. Berrange
2016-10-20 13:48 ` [Qemu-devel] [PULL v1 10/10] main: set names for main loop sources created Daniel P. Berrange
2016-10-20 14:55 ` [Qemu-devel] [PULL v1 00/10] Merge qio 2016/10/20 Eric Blake
2016-10-20 15:05   ` Daniel P. Berrange
2016-10-20 15:16     ` Eric Blake
2016-10-20 16:11 ` Peter Maydell
2016-10-21 10:28   ` Daniel P. Berrange
2016-10-21 10:35     ` Peter Maydell
2016-10-21 10:41       ` Daniel P. Berrange
2016-10-21 10:52         ` Daniel P. Berrange
  -- strict thread matches above, loose matches on Subject: below --
2016-10-19 11:17 [Qemu-devel] [PULL v1 00/10] Merge qio 2016/10/19 Daniel P. Berrange
2016-10-19 11:17 ` [Qemu-devel] [PULL v1 04/10] io: Add a QIOChannelSocket cleanup test Daniel P. Berrange

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1476971286-10612-5-git-send-email-berrange@redhat.com \
    --to=berrange@redhat.com \
    --cc=felipe@nutanix.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).