From 62ee71911e0ab179af1bc97781c1fab9a9813f56 Mon Sep 17 00:00:00 2001 From: David Cermak Date: Tue, 8 Oct 2024 21:27:11 +0200 Subject: [PATCH] feat(sockutls): Add initial support for socket helpers --- .pre-commit-config.yaml | 2 +- components/sock_utils/.cz.yaml | 8 + components/sock_utils/CHANGELOG.md | 1 + components/sock_utils/CMakeLists.txt | 4 + components/sock_utils/LICENSE | 201 ++++++++++++++++++ components/sock_utils/README.md | 3 + .../sock_utils/examples/simple/CMakeLists.txt | 8 + .../sock_utils/examples/simple/README.md | 30 +++ .../examples/simple/main/CMakeLists.txt | 2 + .../sock_utils/examples/simple/main/app.c | 119 +++++++++++ .../examples/simple/main/idf_component.yml | 8 + components/sock_utils/idf_component.yml | 6 + components/sock_utils/include/ifaddrs.h | 27 +++ components/sock_utils/include/poll.h | 0 components/sock_utils/src/getnameinfo.c | 128 +++++++++++ components/sock_utils/src/ifaddrs.c | 79 +++++++ 16 files changed, 625 insertions(+), 1 deletion(-) create mode 100644 components/sock_utils/.cz.yaml create mode 100644 components/sock_utils/CHANGELOG.md create mode 100644 components/sock_utils/CMakeLists.txt create mode 100644 components/sock_utils/LICENSE create mode 100644 components/sock_utils/README.md create mode 100644 components/sock_utils/examples/simple/CMakeLists.txt create mode 100644 components/sock_utils/examples/simple/README.md create mode 100644 components/sock_utils/examples/simple/main/CMakeLists.txt create mode 100644 components/sock_utils/examples/simple/main/app.c create mode 100644 components/sock_utils/examples/simple/main/idf_component.yml create mode 100644 components/sock_utils/idf_component.yml create mode 100644 components/sock_utils/include/ifaddrs.h create mode 100644 components/sock_utils/include/poll.h create mode 100644 components/sock_utils/src/getnameinfo.c create mode 100644 components/sock_utils/src/ifaddrs.c diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8b985ab9957..181da085cde 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -62,7 +62,7 @@ repos: hooks: - id: commit message scopes name: "commit message must be scoped with: mdns, modem, websocket, asio, mqtt_cxx, console, common, eppp, wifi_remote, tls_cxx" - entry: '\A(?!(feat|fix|ci|bump|test|docs)\((mdns|modem|common|console|websocket|asio|mqtt_cxx|examples|eppp|wifi_remote|tls_cxx|mosq)\)\:)' + entry: '\A(?!(feat|fix|ci|bump|test|docs)\((mdns|modem|common|console|websocket|asio|mqtt_cxx|examples|eppp|wifi_remote|tls_cxx|mosq|sockutls)\)\:)' language: pygrep args: [--multiline] stages: [commit-msg] diff --git a/components/sock_utils/.cz.yaml b/components/sock_utils/.cz.yaml new file mode 100644 index 00000000000..f2260e5f9a9 --- /dev/null +++ b/components/sock_utils/.cz.yaml @@ -0,0 +1,8 @@ +--- +commitizen: + bump_message: 'bump(sockutls): $current_version -> $new_version' + pre_bump_hooks: python ../../ci/changelog.py sock_utils + tag_format: sock_utils-v$version + version: 0.1.0 + version_files: + - idf_component.yml diff --git a/components/sock_utils/CHANGELOG.md b/components/sock_utils/CHANGELOG.md new file mode 100644 index 00000000000..825c32f0d03 --- /dev/null +++ b/components/sock_utils/CHANGELOG.md @@ -0,0 +1 @@ +# Changelog diff --git a/components/sock_utils/CMakeLists.txt b/components/sock_utils/CMakeLists.txt new file mode 100644 index 00000000000..d6020f3cc05 --- /dev/null +++ b/components/sock_utils/CMakeLists.txt @@ -0,0 +1,4 @@ +idf_component_register(SRCS "src/getnameinfo.c" + "src/ifaddrs.c" + INCLUDE_DIRS "include" + PRIV_REQUIRES lwip esp_netif) diff --git a/components/sock_utils/LICENSE b/components/sock_utils/LICENSE new file mode 100644 index 00000000000..261eeb9e9f8 --- /dev/null +++ b/components/sock_utils/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. diff --git a/components/sock_utils/README.md b/components/sock_utils/README.md new file mode 100644 index 00000000000..9394e95c4a0 --- /dev/null +++ b/components/sock_utils/README.md @@ -0,0 +1,3 @@ +# Socket utilities + +This component contains simplified implementation of various socket utilities using lwip or esp_netif components. diff --git a/components/sock_utils/examples/simple/CMakeLists.txt b/components/sock_utils/examples/simple/CMakeLists.txt new file mode 100644 index 00000000000..9aa8b81b934 --- /dev/null +++ b/components/sock_utils/examples/simple/CMakeLists.txt @@ -0,0 +1,8 @@ +# For more information about build system see +# https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/build-system.html +# The following five lines of boilerplate have to be in your project's +# CMakeLists in this exact order for cmake to work correctly +cmake_minimum_required(VERSION 3.16) + +include($ENV{IDF_PATH}/tools/cmake/project.cmake) +project(console_basic) diff --git a/components/sock_utils/examples/simple/README.md b/components/sock_utils/examples/simple/README.md new file mode 100644 index 00000000000..4de95164fcd --- /dev/null +++ b/components/sock_utils/examples/simple/README.md @@ -0,0 +1,30 @@ +# Simple example + +This example demonstrates using socket helpers on ESP_PLATFORM + +The functionality of this example is meant to be very generic, so the application is compilable on linux without any IDF dependencies: +```bash +gcc main/app.c -lpthread +``` + +## Example output on ESP_PLATFORM + +``` +I (8073) esp_netif_handlers: example_netif_sta ip: 192.168.0.32, mask: 255.255.255.0, gw: 192.168.0.1 +I (8073) example_connect: Got IPv4 event: Interface "example_netif_sta" address: 192.168.0.32 +I (8073) example_common: Connected to example_netif_sta +I (8083) example_common: - IPv4 address: 192.168.0.32, +I (8093) example_common: - IPv6 address: fe80:0000:0000:0000:XXXX, type: ESP_IP6_ADDR_IS_LINK_LOCAL +I (8103) sock_utils_example: Received signal: IP4 +I (8103) sock_utils_example: IPv4 address of interface "sta": 192.168.0.32 +I (8113) main_task: Returned from app_main() +``` + +## Example output on linux platform + +``` +I[sock_utils_example]: Received signal: IP4 +I[sock_utils_example]: IPv4 address of interface "lo": 127.0.0.1 +I[sock_utils_example]: IPv4 address of interface "en0": 192.168.0.28 +I[sock_utils_example]: IPv4 address of interface "docker0": 172.17.0.1 +``` diff --git a/components/sock_utils/examples/simple/main/CMakeLists.txt b/components/sock_utils/examples/simple/main/CMakeLists.txt new file mode 100644 index 00000000000..1975c93631b --- /dev/null +++ b/components/sock_utils/examples/simple/main/CMakeLists.txt @@ -0,0 +1,2 @@ +idf_component_register(SRCS "app.c" + INCLUDE_DIRS ".") diff --git a/components/sock_utils/examples/simple/main/app.c b/components/sock_utils/examples/simple/main/app.c new file mode 100644 index 00000000000..410e4dcec20 --- /dev/null +++ b/components/sock_utils/examples/simple/main/app.c @@ -0,0 +1,119 @@ +/* + * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Unlicense OR CC0-1.0 + */ +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef ESP_PLATFORM +#include "nvs_flash.h" +#include "esp_event.h" +#include "esp_netif.h" +#include "esp_log.h" +#include "protocol_examples_common.h" +#else +// Provides simplified support for building on linux (whithout official IDF linux target) +// in order to check with the actual host functionality +// use `gcc main/app.c -lpthread` +#define SIMPLE_LOG( lev, tag, format, ... ) do { printf("%s[%s]: ", lev, tag); printf(format, ##__VA_ARGS__); printf("\n"); } while(0) +#define ESP_LOGE(tag, format, ... ) SIMPLE_LOG("E", tag, format, ##__VA_ARGS__) +#define ESP_LOGI(tag, format, ... ) SIMPLE_LOG("I", tag, format, ##__VA_ARGS__) +#define ESP_ERROR_CHECK(action) action +static void example_connect(void) { } +#endif + +static const char *TAG = "sock_utils_example"; + +static void *reader_thread(void *arg) +{ + int *pipe_fds = (int *)arg; + char buffer[64]; + int len; + while ((len = read(pipe_fds[0], buffer, sizeof(buffer))) < 0) { + if (errno != EAGAIN) { + ESP_LOGE(TAG, "Failed reading from pipe: %d", errno); + return NULL; + } + usleep(0); + } + buffer[len] = '\0'; + ESP_LOGI(TAG, "Received signal: %s", buffer); + if (strcmp(buffer, "IP4") != 0) { + ESP_LOGE(TAG, "Unknown signal"); + return NULL; + } + + struct ifaddrs *addresses, *addr; + if (getifaddrs(&addresses) == -1) { + ESP_LOGE(TAG, "getifaddrs() failed"); + return NULL; + } + addr = addresses; + + while (addr) { + if (addr->ifa_addr && addr->ifa_addr->sa_family == AF_INET) { // look for IP4 addresses + struct sockaddr_in *sock_addr = (struct sockaddr_in *) addr->ifa_addr; + if (getnameinfo((struct sockaddr *)sock_addr, sizeof(*sock_addr), + buffer, sizeof(buffer), NULL, 0, NI_NUMERICHOST) != 0) { + ESP_LOGE(TAG, "getnameinfo() failed"); + freeifaddrs(addresses); + return NULL; + } + ESP_LOGI(TAG, "IPv4 address of interface \"%s\": %s", addr->ifa_name, buffer); + } + addr = addr->ifa_next; + } + freeifaddrs(addresses); + return NULL; +} + +static void simple_pipe_example(void) +{ + int pipe_fds[2]; + if (pipe(pipe_fds) == -1) { + ESP_LOGE(TAG, "Failed to create pipe"); + return; + } + + // creates reader thread to wait for a pipe signal + // and print out our IPv4 addresses + pthread_t reader; + pthread_create(&reader, NULL, reader_thread, pipe_fds); + + /* This helper function configures Wi-Fi or Ethernet, as selected in menuconfig. + * Read "Establishing Wi-Fi or Ethernet Connection" section in + * examples/protocols/README.md for more information about this function. + */ + ESP_ERROR_CHECK(example_connect()); + + // at this point we should have received an IP address -> send signal to the reader thread + const char signal[] = "IP4"; + write(pipe_fds[1], signal, sizeof(signal)); + pthread_join(reader, NULL); + + // Close pipe file descriptors + close(pipe_fds[0]); + close(pipe_fds[1]); +} + +#ifdef ESP_PLATFORM +void app_main(void) +{ + ESP_ERROR_CHECK(nvs_flash_init()); + ESP_ERROR_CHECK(esp_netif_init()); + ESP_ERROR_CHECK(esp_event_loop_create_default()); + simple_pipe_example(); +} +#else +int main(void) +{ + simple_pipe_example(); +} +#endif diff --git a/components/sock_utils/examples/simple/main/idf_component.yml b/components/sock_utils/examples/simple/main/idf_component.yml new file mode 100644 index 00000000000..630a4ffee12 --- /dev/null +++ b/components/sock_utils/examples/simple/main/idf_component.yml @@ -0,0 +1,8 @@ +dependencies: + idf: + version: ">=5.0" + sock_utils: + version: "*" + override_path: '../../../' + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/components/sock_utils/idf_component.yml b/components/sock_utils/idf_component.yml new file mode 100644 index 00000000000..c063f0955c7 --- /dev/null +++ b/components/sock_utils/idf_component.yml @@ -0,0 +1,6 @@ +version: 0.1.0 +description: The component provides helper implementation of common system/socket utilities +url: https://github.com/espressif/esp-protocols/tree/master/components/sock_utils +dependencies: + idf: + version: '>=5.0' diff --git a/components/sock_utils/include/ifaddrs.h b/components/sock_utils/include/ifaddrs.h new file mode 100644 index 00000000000..e8a0a01f743 --- /dev/null +++ b/components/sock_utils/include/ifaddrs.h @@ -0,0 +1,27 @@ +/* + * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ +#ifndef NI_NUMERICHOST +#define NI_NUMERICHOST 0x1 +#endif + +#ifndef IFF_UP +#define IFF_UP 0x1 +#endif + +#ifndef IFF_LOOPBACK +#define IFF_LOOPBACK 0x8 +#endif + +struct ifaddrs { + struct ifaddrs *ifa_next; /* Next item in list */ + char *ifa_name; /* Name of interface */ + struct sockaddr *ifa_addr; /* Address of interface */ + int ifa_flags; +}; + +int getifaddrs(struct ifaddrs **ifap); + +void freeifaddrs(struct ifaddrs *ifa); diff --git a/components/sock_utils/include/poll.h b/components/sock_utils/include/poll.h new file mode 100644 index 00000000000..e69de29bb2d diff --git a/components/sock_utils/src/getnameinfo.c b/components/sock_utils/src/getnameinfo.c new file mode 100644 index 00000000000..044f97acf0b --- /dev/null +++ b/components/sock_utils/src/getnameinfo.c @@ -0,0 +1,128 @@ +/* + * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ +#include +#include +#include +#include "net/if.h" +#include "ifaddrs.h" +#include "esp_check.h" + +int getnameinfo(const struct sockaddr *addr, socklen_t addrlen, + char *host, socklen_t hostlen, + char *serv, socklen_t servlen, int flags) +{ + // Validate flags to ensure only allowed flags are passed. + if (flags & ~(NI_NUMERICHOST | NI_NUMERICSERV | NI_DGRAM)) { + return EAI_BADFLAGS; + } + + const struct sockaddr_in *sinp = (const struct sockaddr_in *) addr; + + switch (addr->sa_family) { + case AF_INET: + // Handle numeric host address + if (flags & NI_NUMERICHOST) { + if (inet_ntop(AF_INET, &sinp->sin_addr, host, hostlen) == NULL) { + return EOVERFLOW; // Error if address couldn't be converted + } + } + + // Handle numeric service (port) + if (flags & NI_NUMERICSERV) { + // Print the port number, but for UDP services (if NI_DGRAM), we treat it the same way + int port = ntohs(sinp->sin_port); // Convert port from network byte order + if (snprintf(serv, servlen, "%d", port) < 0) { + return EOVERFLOW; // Error if snprintf failed + } + } + + break; + + default: + return EAI_FAMILY; // Unsupported address family + } + + return 0; +} + +#define INVALID_SOCKET (-1) + +static const char *TAG = "socket_helpers"; + +static int set_nonblocking(int sock) +{ + int opt; + opt = fcntl(sock, F_GETFL, 0); + if (opt == -1) { + return -1; + } + if (fcntl(sock, F_SETFL, opt | O_NONBLOCK) == -1) { + return -1; + } + return 0; +} + +int socketpair(int domain, int type, int protocol, int sv[2]) +{ + struct sockaddr_storage ss; + struct sockaddr_in *sa = (struct sockaddr_in *)&ss; + socklen_t ss_len = sizeof(struct sockaddr_in); + int fd1 = INVALID_SOCKET; + int fd2 = INVALID_SOCKET; + int listenfd = INVALID_SOCKET; + int ret = 0; // Success + + sa->sin_family = AF_INET; + sa->sin_addr.s_addr = htonl(INADDR_LOOPBACK); + sa->sin_port = 0; + listenfd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ESP_GOTO_ON_FALSE(listenfd != INVALID_SOCKET, -1, err, TAG, "Cannot create listening socket"); + ESP_GOTO_ON_FALSE(listen(listenfd, 1) == 0, -1, err, TAG, "Failed to listen"); + + memset(&ss, 0, sizeof(ss)); + ss_len = sizeof(ss); + ESP_GOTO_ON_FALSE(getsockname(listenfd, (struct sockaddr *)&ss, &ss_len) >= 0, -1, err, TAG, "getsockname failed"); + + sa->sin_family = AF_INET; + sa->sin_addr.s_addr = htonl(INADDR_LOOPBACK); + + fd1 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ESP_GOTO_ON_FALSE(fd1 != INVALID_SOCKET, -1, err, TAG, "Cannot create read side socket"); + ESP_GOTO_ON_FALSE(set_nonblocking(fd1) == 0, -1, err, TAG, "Failed to set socket to nonblocking mode"); + if (connect(fd1, (struct sockaddr *)&ss, ss_len) < 0) { + ESP_GOTO_ON_FALSE(errno == EINPROGRESS || errno == EWOULDBLOCK, -1, err, TAG, "Failed to connect fd1"); + } + fd2 = accept(listenfd, NULL, 0); + if (fd2 == -1) { + ESP_GOTO_ON_FALSE(errno == EINPROGRESS || errno == EWOULDBLOCK, -1, err, TAG, "Failed to accept fd2"); + } + ESP_GOTO_ON_FALSE(set_nonblocking(fd2) == 0, -1, err, TAG, "Failed to set socket to nonblocking mode"); + + close(listenfd); + sv[0] = fd1; + sv[1] = fd2; + return ret; + +err: + if (listenfd != INVALID_SOCKET) { + close(listenfd); + } + if (fd1 != INVALID_SOCKET) { + close(fd1); + } + if (fd2 != INVALID_SOCKET) { + close(fd2); + } + return ret; +} + +int pipe(int pipefd[2]) +{ + if (socketpair(AF_UNIX, SOCK_STREAM, 0, pipefd) == -1) { + return -1; + } + return 0; +} diff --git a/components/sock_utils/src/ifaddrs.c b/components/sock_utils/src/ifaddrs.c new file mode 100644 index 00000000000..a109ce6f5fa --- /dev/null +++ b/components/sock_utils/src/ifaddrs.c @@ -0,0 +1,79 @@ +/* + * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ +#include +#include +#include "esp_netif.h" +#include +#include "ifaddrs.h" + +int getifaddrs(struct ifaddrs **ifap) +{ + if (ifap == NULL) { + return -1; // Invalid argument + } + + // Allocate memory for a single ifaddrs structure + struct ifaddrs *ifaddr = (struct ifaddrs *)calloc(1, sizeof(struct ifaddrs)); + if (ifaddr == NULL) { + return -1; // Memory allocation failure + } + + // Allocate memory for the interface name + ifaddr->ifa_name = strdup("sta"); // Replace with actual interface name if known + if (ifaddr->ifa_name == NULL) { + free(ifaddr); + return -1; + } + + // Allocate memory for the sockaddr structure + struct sockaddr_in *addr_in = (struct sockaddr_in *)calloc(1, sizeof(struct sockaddr_in)); + if (addr_in == NULL) { + free(ifaddr->ifa_name); + free(ifaddr); + return -1; + } + + // Retrieve IP information from the ESP netif + esp_netif_ip_info_t ip; + esp_netif_t *netif = esp_netif_get_handle_from_ifkey("WIFI_STA_DEF"); + if (netif == NULL) { + free(ifaddr->ifa_name); + free(ifaddr); + return -1; + } + if (esp_netif_get_ip_info(netif, &ip) != ESP_OK) { + free(addr_in); + free(ifaddr->ifa_name); + free(ifaddr); + return -1; + } + + // Set up the sockaddr_in structure + addr_in->sin_family = AF_INET; + addr_in->sin_addr.s_addr = ip.ip.addr; + + // Link the sockaddr to ifaddrs + ifaddr->ifa_addr = (struct sockaddr *)addr_in; + ifaddr->ifa_flags = IFF_UP; // Mark the interface as UP, add more flags as needed + + *ifap = ifaddr; // Return the linked list + return 0; // Success +} + +void freeifaddrs(struct ifaddrs *ifa) +{ + while (ifa != NULL) { + struct ifaddrs *next = ifa->ifa_next; + if (ifa->ifa_name) { + free(ifa->ifa_name); + } + if (ifa->ifa_addr) { + free(ifa->ifa_addr); + } + free(ifa); + ifa = next; + } +}