alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-25 19:28:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

backport bugfix lwip for v4.0

Browse Source
This commit is contained in:
xueyunfei
2020-11-20 16:08:03 +08:00
parent d31a127db5
commit df23bbe8e1
6 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/protocols/sockets/tcp_server/main/tcp_server.c
View File

@@ -77,7 +77,7 @@ static void tcp_server_task(void *pvParameters)
}
ESP_LOGI(TAG, "Socket listening");
struct sockaddr_in6 source_addr; // Large enough for both IPv4 or IPv6
struct sockaddr_storage source_addr; // Large enough for both IPv4 or IPv6
uint addr_len = sizeof(source_addr);
int sock = accept(listen_sock, (struct sockaddr *)&source_addr, &addr_len);
if (sock < 0) {
@@ -101,10 +101,10 @@ static void tcp_server_task(void *pvParameters)
// Data received
else {
// Get the sender's ip address as string
if (source_addr.sin6_family == PF_INET) {
inet_ntoa_r(((struct sockaddr_in *)&source_addr)->sin_addr.s_addr, addr_str, sizeof(addr_str) - 1);
} else if (source_addr.sin6_family == PF_INET6) {
inet6_ntoa_r(source_addr.sin6_addr, addr_str, sizeof(addr_str) - 1);
if (source_addr.ss_family == PF_INET) {
inet_ntoa_r(((struct sockaddr_in *)&source_addr)->sin_addr, addr_str, sizeof(addr_str) - 1);
} else if (source_addr.ss_family == PF_INET6) {
inet6_ntoa_r(((struct sockaddr_in6 *)&source_addr)->sin6_addr, addr_str, sizeof(addr_str) - 1);
}
rx_buffer[len] = 0; // Null-terminate whatever we received and treat like a string