From: Thomas Huth <thuth@redhat.com>
To: Laurent Vivier <lvivier@redhat.com>, qemu-devel@nongnu.org
Cc: "Jason Wang" <jasowang@redhat.com>, "Greg Kurz" <groug@kaod.org>,
"David Gibson" <david@gibson.dropbear.id.au>,
"Eric Blake" <eblake@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>
Subject: Re: [PATCH v9 15/16] tests/qtest: netdev: test stream and dgram backends
Date: Tue, 27 Sep 2022 12:01:42 +0200 [thread overview]
Message-ID: <3bbd4122-4004-a351-bcaf-badb841c1121@redhat.com> (raw)
In-Reply-To: <20220926195048.487915-16-lvivier@redhat.com>
On 26/09/2022 21.50, Laurent Vivier wrote:
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> ---
> tests/qtest/meson.build | 1 +
> tests/qtest/netdev-socket.c | 391 ++++++++++++++++++++++++++++++++++++
> 2 files changed, 392 insertions(+)
> create mode 100644 tests/qtest/netdev-socket.c
>
> diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
> index e910cb32ca15..38ee8b7a2d56 100644
> --- a/tests/qtest/meson.build
> +++ b/tests/qtest/meson.build
> @@ -27,6 +27,7 @@ qtests_generic = [
> 'test-hmp',
> 'qos-test',
> 'readconfig-test',
> + 'netdev-socket',
> ]
> if config_host.has_key('CONFIG_MODULES')
> qtests_generic += [ 'modules-test' ]
> diff --git a/tests/qtest/netdev-socket.c b/tests/qtest/netdev-socket.c
> new file mode 100644
> index 000000000000..55e0c07f18ec
> --- /dev/null
> +++ b/tests/qtest/netdev-socket.c
> @@ -0,0 +1,391 @@
> +/*
> + * QTest testcase for netdev stream and dgram
> + *
> + * Copyright (c) 2022 Red Hat, Inc.
> + *
> + * SPDX-License-Identifier: GPL-2.0-or-later
> + */
> +
> +#include "qemu/osdep.h"
> +#include <glib.h>
glib.h is already included via osdep.h, so you don't need to include it here
again.
> +#include "libqtest.h"
> +
> +#define CONNECTION_TIMEOUT 5
> +
> +#define EXPECT_STATE(q, e, t) \
> +do { \
> + char *resp = qtest_hmp(q, "info network"); \
> + if (t) { \
> + strrchr(resp, t)[0] = 0; \
> + } \
> + g_test_timer_start(); \
> + while (g_test_timer_elapsed() < CONNECTION_TIMEOUT) { \
> + if (strcmp(resp, e) == 0) { \
> + break; \
> + } \
> + g_free(resp); \
> + resp = qtest_hmp(q, "info network"); \
> + if (t) { \
> + strrchr(resp, t)[0] = 0; \
> + } \
> + } \
> + g_assert_cmpstr(resp, ==, e); \
> + g_free(resp); \
> +} while (0)
> +
> +static int inet_get_free_port(void)
> +{
> + int sock;
> + struct sockaddr_in addr;
> + socklen_t len;
> + int port;
> +
> + sock = socket(AF_INET, SOCK_STREAM, 0);
> + if (sock < 0) {
> + return -1;
> + }
> +
> + memset(&addr, 0, sizeof(addr));
> + addr.sin_family = AF_INET;
> + addr.sin_addr.s_addr = INADDR_ANY;
> + addr.sin_port = 0;
> + if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
close(sock) ?
> + return -1;
> + }
> +
> + len = sizeof(addr);
> + if (getsockname(sock, (struct sockaddr *)&addr, &len) < 0) {
> + return -1;
> + }
> +
> + port = ntohs(addr.sin_port);
> +
> + close(sock);
> +
> + return port;
> +}
> +
> +static void test_stream_inet_ipv4(void)
> +{
> + QTestState *qts0, *qts1;
> + char *expect;
> + int port;
> +
> + port = inet_get_free_port();
> + qts0 = qtest_initf("-nodefaults "
> + "-netdev stream,id=st0,addr.type=inet,"
> + "addr.ipv4=on,addr.ipv6=off,"
> + "addr.host=localhost,addr.port=%d", port);
> +
> + EXPECT_STATE(qts0, "st0: index=0,type=stream,\r\n", 0);
> +
> + qts1 = qtest_initf("-nodefaults "
> + "-netdev stream,server=false,id=st0,addr.type=inet,"
> + "addr.ipv4=on,addr.ipv6=off,"
> + "addr.host=localhost,addr.port=%d", port);
> +
> + expect = g_strdup_printf("st0: index=0,type=stream,tcp:127.0.0.1:%d\r\n",
> + port);
> + EXPECT_STATE(qts1, expect, 0);
> + g_free(expect);
> +
> + /* the port is unknown, check only the address */
> + EXPECT_STATE(qts0, "st0: index=0,type=stream,tcp:127.0.0.1", ':');
> +
> + qtest_quit(qts1);
> + qtest_quit(qts0);
> +}
> +
> +static void test_stream_inet_ipv6(void)
> +{
> + QTestState *qts0, *qts1;
> + char *expect;
> + int port;
> +
> + port = inet_get_free_port();
> + qts0 = qtest_initf("-nodefaults "
> + "-netdev stream,id=st0,addr.type=inet,"
> + "addr.ipv4=off,addr.ipv6=on,"
> + "addr.host=localhost,addr.port=%d", port);
> +
> + EXPECT_STATE(qts0, "st0: index=0,type=stream,\r\n", 0);
> +
> + qts1 = qtest_initf("-nodefaults "
> + "-netdev stream,server=false,id=st0,addr.type=inet,"
> + "addr.ipv4=off,addr.ipv6=on,"
> + "addr.host=localhost,addr.port=%d", port);
> +
> + expect = g_strdup_printf("st0: index=0,type=stream,tcp:::1:%d\r\n",
> + port);
> + EXPECT_STATE(qts1, expect, 0);
> + g_free(expect);
> +
> + /* the port is unknown, check only the address */
> + EXPECT_STATE(qts0, "st0: index=0,type=stream,tcp:::1", ':');
> +
> + qtest_quit(qts1);
> + qtest_quit(qts0);
> +}
> +
> +static void test_stream_unix(void)
> +{
> + QTestState *qts0, *qts1;
> + char *expect;
> + gchar *path;
> + int ret;
> +
> + ret = g_file_open_tmp("netdev-XXXXXX", &path, NULL);
> + g_assert_true(ret >= 0);
> + close(ret);
> +
> + qts0 = qtest_initf("-nodefaults "
> + "-netdev stream,id=st0,addr.type=unix,addr.path=%s,",
> + path);
> +
> + EXPECT_STATE(qts0, "st0: index=0,type=stream,\r\n", 0);
> +
> + qts1 = qtest_initf("-nodefaults "
> + "-netdev stream,id=st0,server=false,"
> + "addr.type=unix,addr.path=%s",
> + path);
> +
> + expect = g_strdup_printf("st0: index=0,type=stream,unix:%s\r\n", path);
> + EXPECT_STATE(qts1, expect, 0);
> + EXPECT_STATE(qts0, expect, 0);
> + g_free(expect);
Do you have to unlink(path) here?
> + g_free(path);
> +
> + qtest_quit(qts1);
> + qtest_quit(qts0);
> +}
> +
> +static void test_stream_unix_abstract(void)
> +{
> + QTestState *qts0, *qts1;
> + char *expect;
> + gchar *path;
> + int ret;
> +
> + ret = g_file_open_tmp("netdev-XXXXXX", &path, NULL);
> + g_assert_true(ret >= 0);
> + close(ret);
> +
> + qts0 = qtest_initf("-nodefaults "
> + "-netdev stream,id=st0,addr.type=unix,addr.path=%s,"
> + "addr.abstract=on",
> + path);
> +
> + EXPECT_STATE(qts0, "st0: index=0,type=stream,\r\n", 0);
> +
> + qts1 = qtest_initf("-nodefaults "
> + "-netdev stream,id=st0,server=false,"
> + "addr.type=unix,addr.path=%s,addr.abstract=on",
> + path);
> +
> + expect = g_strdup_printf("st0: index=0,type=stream,unix:%s\r\n", path);
> + EXPECT_STATE(qts1, expect, 0);
> + EXPECT_STATE(qts0, expect, 0);
> + g_free(expect);
unlink(path) ?
> + g_free(path);
> +
> + qtest_quit(qts1);
> + qtest_quit(qts0);
> +}
> +
> +static void test_stream_fd(void)
> +{
> + QTestState *qts0, *qts1;
> + char *expect;
> + int ret, sock0, sock1;
> + struct sockaddr_un addr;
> + gchar *path;
> +
> + ret = g_file_open_tmp("netdev-XXXXXX", &path, NULL);
> + g_assert_true(ret >= 0);
> + close(ret);
> + addr.sun_family = AF_UNIX;
> + strcpy(addr.sun_path, path);
> +
> + unlink(addr.sun_path);
> + sock0 = socket(AF_LOCAL, SOCK_STREAM, 0);
> + g_assert_cmpint(sock0, !=, -1);
> +
> + ret = bind(sock0, (struct sockaddr *)&addr, sizeof(addr));
> + g_assert_cmpint(ret, !=, -1);
> +
> + qts0 = qtest_initf("-nodefaults "
> + "-netdev stream,id=st0,addr.type=fd,addr.str=%d",
> + sock0);
> +
> + EXPECT_STATE(qts0, "st0: index=0,type=stream,\r\n", 0);
> +
> + sock1 = socket(AF_LOCAL, SOCK_STREAM, 0);
> + g_assert_cmpint(sock1, !=, -1);
> +
> + ret = connect(sock1, (struct sockaddr *)&addr, sizeof(addr));
> + g_assert_cmpint(ret, !=, -1);
> +
> + qts1 = qtest_initf("-nodefaults "
> + "-netdev stream,id=st0,server=off,addr.type=fd,addr.str=%d",
> + sock1);
> +
> +
> + expect = g_strdup_printf("st0: index=0,type=stream,unix:%s\r\n", path);
> + EXPECT_STATE(qts1, expect, 0);
> + EXPECT_STATE(qts0, expect, 0);
> + g_free(expect);
> +
> + qtest_quit(qts1);
> + qtest_quit(qts0);
> +
> + closesocket(sock0);
> + closesocket(sock1);
> +
> + g_free(path);
> +}
> +
> +static void test_dgram_inet(void)
> +{
> + QTestState *qts0, *qts1;
> + char *expect;
> + int port0, port1;
> +
> + port0 = inet_get_free_port();
> + port1 = inet_get_free_port();
Could it happen that port0 is the same as port1 ? Would it be a problem?
> + qts0 = qtest_initf("-nodefaults "
> + "-netdev dgram,id=st0,"
> + "local.type=inet,local.host=localhost,local.port=%d,"
> + "remote.type=inet,remote.host=localhost,remote.port=%d",
> + port0, port1);
> +
> + expect = g_strdup_printf("st0: index=0,type=dgram,"
> + "udp=127.0.0.1:%d/127.0.0.1:%d\r\n", port0, port1);
> + EXPECT_STATE(qts0, expect, 0);
> + g_free(expect);
> +
> + qts1 = qtest_initf("-nodefaults "
> + "-netdev dgram,id=st0,"
> + "local.type=inet,local.host=localhost,local.port=%d,"
> + "remote.type=inet,remote.host=localhost,remote.port=%d",
> + port1, port0);
> +
> + expect = g_strdup_printf("st0: index=0,type=dgram,"
> + "udp=127.0.0.1:%d/127.0.0.1:%d\r\n", port1, port0);
> + EXPECT_STATE(qts1, expect, 0);
> + g_free(expect);
> +
> + qtest_quit(qts1);
> + qtest_quit(qts0);
> +}
> +
> +static void test_dgram_mcast(void)
> +{
> + QTestState *qts;
> +
> + qts = qtest_initf("-nodefaults "
> + "-netdev dgram,id=st0,"
> + "remote.type=inet,remote.host=230.0.0.1,remote.port=1234");
> +
> + EXPECT_STATE(qts, "st0: index=0,type=dgram,mcast=230.0.0.1:1234\r\n", 0);
> +
> + qtest_quit(qts);
> +}
> +
> +static void test_dgram_unix(void)
> +{
> + QTestState *qts0, *qts1;
> + char *expect;
> + gchar *path0, *path1;
> + int ret;
> +
> + ret = g_file_open_tmp("netdev-XXXXXX", &path0, NULL);
> + g_assert_true(ret >= 0);
> + close(ret);
> +
> + ret = g_file_open_tmp("netdev-XXXXXX", &path1, NULL);
> + g_assert_true(ret >= 0);
> + close(ret);
> +
> + qts0 = qtest_initf("-nodefaults "
> + "-netdev dgram,id=st0,local.type=unix,local.path=%s,"
> + "remote.type=unix,remote.path=%s",
> + path0, path1);
> +
> + expect = g_strdup_printf("st0: index=0,type=dgram,udp=%s:%s\r\n",
> + path0, path1);
> + EXPECT_STATE(qts0, expect, 0);
> + g_free(expect);
> +
> + qts1 = qtest_initf("-nodefaults "
> + "-netdev dgram,id=st0,local.type=unix,local.path=%s,"
> + "remote.type=unix,remote.path=%s",
> + path1, path0);
> +
> +
> + expect = g_strdup_printf("st0: index=0,type=dgram,udp=%s:%s\r\n",
> + path1, path0);
> + EXPECT_STATE(qts1, expect, 0);
> + g_free(expect);
unlink ?
> + g_free(path0);
> + g_free(path1);
> +
> + qtest_quit(qts1);
> + qtest_quit(qts0);
> +}
Thomas
next prev parent reply other threads:[~2022-09-27 10:11 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-26 19:50 [PATCH v9 00/16] qapi: net: add unix socket type support to netdev backend Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 01/16] net: introduce convert_host_port() Laurent Vivier
2022-09-28 4:55 ` David Gibson
2022-09-26 19:50 ` [PATCH v9 02/16] net: remove the @errp argument of net_client_inits() Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 03/16] net: simplify net_client_parse() error management Laurent Vivier
2022-09-28 4:56 ` David Gibson
2022-09-26 19:50 ` [PATCH v9 04/16] qapi: net: introduce a way to bypass qemu_opts_parse_noisily() Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 05/16] qapi: net: add stream and dgram netdevs Laurent Vivier
2022-09-27 9:18 ` Markus Armbruster
2022-09-28 5:55 ` David Gibson
2022-10-05 10:08 ` Laurent Vivier
2022-10-06 0:37 ` David Gibson
2022-09-26 19:50 ` [PATCH v9 06/16] net: socket: Don't ignore EINVAL on netdev socket connection Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 07/16] net: stream: " Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 08/16] net: stream: add unix socket Laurent Vivier
2022-09-28 6:12 ` David Gibson
2022-10-05 13:38 ` Laurent Vivier
2022-10-06 0:39 ` David Gibson
2022-09-26 19:50 ` [PATCH v9 09/16] net: dgram: make dgram_dst generic Laurent Vivier
2022-09-28 6:17 ` David Gibson
2022-09-26 19:50 ` [PATCH v9 10/16] net: dgram: move mcast specific code from net_socket_fd_init_dgram() Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 11/16] net: dgram: add unix socket Laurent Vivier
2022-09-28 6:22 ` David Gibson
2022-09-26 19:50 ` [PATCH v9 12/16] qemu-sockets: move and rename SocketAddress_to_str() Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 13/16] qemu-sockets: update socket_uri() and socket_parse() to be consistent Laurent Vivier
2022-09-28 6:23 ` David Gibson
2022-09-26 19:50 ` [PATCH v9 14/16] net: stream: move to QIO to enable additional parameters Laurent Vivier
2022-09-26 19:50 ` [PATCH v9 15/16] tests/qtest: netdev: test stream and dgram backends Laurent Vivier
2022-09-27 10:01 ` Thomas Huth [this message]
2022-09-26 19:50 ` [PATCH v9 16/16] net: stream: add QAPI events to report connection state Laurent Vivier
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=3bbd4122-4004-a351-bcaf-badb841c1121@redhat.com \
--to=thuth@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=dgilbert@redhat.com \
--cc=eblake@redhat.com \
--cc=groug@kaod.org \
--cc=jasowang@redhat.com \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--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).