This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
commit 908ed8ac6783b9c5d2d5c47abdc37cf41b7501d0 Author: Yongrong Wang <[email protected]> AuthorDate: Thu Mar 27 14:30:00 2025 +0800 examples/vsock: add a vsock test client and server Add "vsock", a test for AF_VSOCK sockets. "-t data" runs a server that echoes what it receives, or a client (with "-c <cid>") that sends "-n" buffers of "-i" bytes to port "-p" and checks the echo. The same source also builds on Linux against <linux/vm_sockets.h>, so a Linux peer can be tested against NuttX. Signed-off-by: Bowen Wang <[email protected]> Signed-off-by: Yongrong Wang <[email protected]> --- examples/vsock/CMakeLists.txt | 31 ++++ examples/vsock/Kconfig | 24 ++++ examples/vsock/Make.defs | 23 +++ examples/vsock/Makefile | 34 +++++ examples/vsock/vsock_main.c | 322 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 434 insertions(+) diff --git a/examples/vsock/CMakeLists.txt b/examples/vsock/CMakeLists.txt new file mode 100644 index 000000000..cdfd72b17 --- /dev/null +++ b/examples/vsock/CMakeLists.txt @@ -0,0 +1,31 @@ +# ############################################################################## +# apps/examples/vsock/CMakeLists.txt +# +# Licensed to the Apache Software Foundation (ASF) under one or more contributor +# license agreements. See the NOTICE file distributed with this work for +# additional information regarding copyright ownership. The ASF licenses this +# file to you under the Apache License, Version 2.0 (the "License"); you may not +# use this file except in compliance with the License. You may obtain a copy of +# the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations under +# the License. +# +# ############################################################################## + +if(CONFIG_EXAMPLES_VSOCK) + nuttx_add_application( + NAME + ${CONFIG_EXAMPLES_VSOCK_PROGNAME} + SRCS + vsock_main.c + STACKSIZE + ${CONFIG_EXAMPLES_VSOCK_STACKSIZE} + PRIORITY + ${CONFIG_EXAMPLES_VSOCK_PRIORITY}) +endif() diff --git a/examples/vsock/Kconfig b/examples/vsock/Kconfig new file mode 100644 index 000000000..6d1553058 --- /dev/null +++ b/examples/vsock/Kconfig @@ -0,0 +1,24 @@ +# +# For a description of the syntax of this configuration file, +# see the file kconfig-language.txt in the NuttX tools repository. +# + +config EXAMPLES_VSOCK + tristate "\"Vsocket\" example" + default n + +if EXAMPLES_VSOCK + +config EXAMPLES_VSOCK_PROGNAME + string "Program name" + default "vsock" + +config EXAMPLES_VSOCK_PRIORITY + int "Vsock task priority" + default 100 + +config EXAMPLES_VSOCK_STACKSIZE + int "Vsock stack size" + default DEFAULT_TASK_STACKSIZE + +endif diff --git a/examples/vsock/Make.defs b/examples/vsock/Make.defs new file mode 100644 index 000000000..bfffae82d --- /dev/null +++ b/examples/vsock/Make.defs @@ -0,0 +1,23 @@ +############################################################################ +# apps/examples/vsock/Make.defs +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + +ifneq ($(CONFIG_EXAMPLES_VSOCK),) +CONFIGURED_APPS += $(APPDIR)/examples/vsock +endif diff --git a/examples/vsock/Makefile b/examples/vsock/Makefile new file mode 100644 index 000000000..8c329f3b6 --- /dev/null +++ b/examples/vsock/Makefile @@ -0,0 +1,34 @@ +############################################################################ +# apps/examples/vsock/Make.defs +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + +include $(APPDIR)/Make.defs + +# Vsocket built-in application info + +PROGNAME = $(CONFIG_EXAMPLES_VSOCK_PROGNAME) +PRIORITY = $(CONFIG_EXAMPLES_VSOCK_PRIORITY) +STACKSIZE = $(CONFIG_EXAMPLES_VSOCK_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_VSOCK) + +# Vsocket Example + +MAINSRC = vsock_main.c + +include $(APPDIR)/Application.mk diff --git a/examples/vsock/vsock_main.c b/examples/vsock/vsock_main.c new file mode 100644 index 000000000..9ebc9a041 --- /dev/null +++ b/examples/vsock/vsock_main.c @@ -0,0 +1,322 @@ +/**************************************************************************** + * apps/examples/vsock/vsock_main.c + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <assert.h> +#include <errno.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <sys/socket.h> +#include <unistd.h> + +#ifdef __NuttX__ +#include <nuttx/config.h> +#include <sys/vm_sockets.h> +#else +#include <linux/vm_sockets.h> +#endif + +#define vsockdbg(fmt, ...) + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +static int check_buf(char *buf, size_t size) +{ + ssize_t i; + + for (i = 0; i < size; i++) + { + if (buf[i] != (i & 0xff)) + { + printf("Error at %zu buf=%x exp=%lx\n", i, buf[i], i & 0xff); + return -1; + } + } + + return 0; +} + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +static int vsock_client(unsigned int port, size_t size, + size_t count, int cid) +{ + struct sockaddr_vm addr; + size_t sendlen = 0; + ssize_t ret; + ssize_t i; + char *buf; + int s; + + printf("Vsock client test, port=%u, size=%zu, count=%zu, cid=%u\n", + port, size, count, cid); + s = socket(AF_VSOCK, SOCK_STREAM, 0); + if (s < 0) + { + printf("Create socket failed, s=%d, err=%d\n", s, errno); + return -errno; + } + + memset(&addr, 0, sizeof(struct sockaddr_vm)); + addr.svm_family = AF_VSOCK; + addr.svm_port = port; + addr.svm_cid = cid; + + printf("Connect, s=%d\n", s); + ret = connect(s, (const struct sockaddr *)&addr, + sizeof(struct sockaddr_vm)); + if (ret < 0) + { + ret = -errno; + printf("Connect failed, ret=%zu\n", ret); + goto out; + } + + buf = malloc(size); + if (!buf) + { + printf("Malloc failed\n"); + ret = -ENOMEM; + goto out; + } + + printf("Send\n"); + for (i = 0; i < size; i++) + { + buf[i] = i & 0xff; + } + + while (count-- > 0) + { + ret = send(s, buf, size, 0); + if (ret < 0) + { + ret = -errno; + printf("Send failed, ret=%zu\n", ret); + goto err; + } + + vsockdbg("Round %zu send=%zu\n", count, ret); + sendlen += ret; + + ret = recv(s, buf, size, 0); + if (ret < 0) + { + ret = -errno; + printf("Recv failed, ret=%zu\n", ret); + goto err; + } + + ret = check_buf(buf, ret); + assert(ret == 0); + } + + printf("Send finish, sendlen=%zd\n", sendlen); + +err: + free(buf); +out: + printf("Close\n"); + close(s); + return ret; +} + +static int vsock_server(unsigned int port, size_t size, int cid) +{ + struct sockaddr_vm peer_addr; + struct sockaddr_vm addr; + socklen_t peer_addr_size; + size_t received = 0; + ssize_t ret; + char *buf; + int peer_fd; + int s; + + printf("Vsock server test, port=%u, size=%zu, cid=%u\n", port, size, cid); + s = socket(AF_VSOCK, SOCK_STREAM, 0); + if (s < 0) + { + printf("Create socket failed, s=%d, err=%d\n", s, errno); + return -errno; + } + + memset(&addr, 0, sizeof(struct sockaddr_vm)); + addr.svm_family = AF_VSOCK; + addr.svm_port = port; + addr.svm_cid = cid; + + ret = bind(s, (struct sockaddr *)&addr, sizeof(struct sockaddr_vm)); + if (ret < 0) + { + ret = -errno; + printf("Bind failed, ret=%zu\n", ret); + goto out; + } + + ret = listen(s, 8); + if (ret < 0) + { + ret = -errno; + printf("Listen failed, ret=%zu\n", ret); + goto out; + } + + peer_addr_size = sizeof(struct sockaddr_vm); + peer_fd = accept(s, (struct sockaddr *)&peer_addr, &peer_addr_size); + if (peer_fd < 0) + { + ret = -errno; + printf("Accept failed, ret=%zu\n", ret); + goto out; + } + + printf("Accept peer_fd=%d\n", peer_fd); + + buf = malloc(size); + if (!buf) + { + printf("Malloc failed\n"); + ret = -ENOMEM; + goto out; + } + + while ((ret = recv(peer_fd, buf, size, 0)) > 0) + { + received += ret; + ret = check_buf(buf, ret); + assert(ret == 0); + vsockdbg("Recv=%zd Received=%zu\n", ret, received); + + ret = send(peer_fd, buf, size, 0); + if (ret < 0) + { + ret = -errno; + printf("Send failed, ret=%zu\n", ret); + goto err; + } + } + + printf("Received finish, received=%zd\n", received); + +err: + free(buf); +out: + printf("Close\n"); + close(s); + return ret; +} + +/**************************************************************************** + * vsock_main + ****************************************************************************/ + +int main(int argc, char *argv[]) +{ + int cid = VMADDR_CID_ANY; + unsigned int port = 9999; + const char *type = NULL; + size_t count = 100; + size_t size = 64; + int is_server = 1; + int ret = -EINVAL; + int opt; + + if (argc < 4) + { + printf("Usage: vsock [-c <cid>] [-t <data/conn>] [-p <port>] " + "[-i <size>] [-n <count>]\n\n" + " -c: means client, else is server\n" + " -t: means test type, data or conn\n" + " data: means test the data transfer process\n" + " conn: means test the connection establish and " + "disconnect process\n" + " -p: PORT -- the port number to listen or connect\n" + " -i: SIZE -- the size of the data to send\n" + " -n: COUNT -- the number of the data to send\n" + ); + + return -EINVAL; + } + + optind = 0; + while ((opt = getopt(argc, argv, "c:t:p:i:n:?")) != -1) + { + switch (opt) + { + case 'c': + is_server = 0; + cid = strtoul(optarg, NULL, 0); + break; + + case 't': + type = optarg; + break; + + case 'p': + port = strtoul(optarg, NULL, 0); + break; + + case 'i': + size = strtoul(optarg, NULL, 0); + break; + + case 'n': + count = strtoul(optarg, NULL, 0); + break; + + default: + printf("Unknown option: %c\n", opt); + break; + } + } + + if (is_server) + { + if (strcmp(type, "data") == 0) + { + ret = vsock_server(port, size, cid); + } + else if (strcmp(type, "conn") == 0) + { + printf("Not support yet\n"); + } + } + else + { + if (strcmp(type, "data") == 0) + { + ret = vsock_client(port, size, count, cid); + } + else if (strcmp(type, "conn") == 0) + { + printf("Not support yet\n"); + } + } + + return ret; +}
