You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2020/03/30 07:12:14 UTC
[incubator-nuttx-apps] 02/03: tcpblaster: Fix build on macOS
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 7e6e19d80ca148e975a5b550a5ab756081dd0299
Author: YAMAMOTO Takashi <ya...@midokura.com>
AuthorDate: Mon Mar 30 14:56:01 2020 +0900
tcpblaster: Fix build on macOS
s6_addr is in standard. s6_addr16 is not.
See RFC 2553.
---
examples/tcpblaster/tcpblaster_client.c | 3 +--
examples/tcpblaster/tcpblaster_server.c | 20 ++++++++++++--------
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/examples/tcpblaster/tcpblaster_client.c b/examples/tcpblaster/tcpblaster_client.c
index 85d6dd9..8092124 100644
--- a/examples/tcpblaster/tcpblaster_client.c
+++ b/examples/tcpblaster/tcpblaster_client.c
@@ -104,8 +104,7 @@ void tcpblaster_client(void)
#ifdef CONFIG_EXAMPLES_TCPBLASTER_IPv6
server.sin6_family = AF_INET6;
server.sin6_port = HTONS(CONFIG_EXAMPLES_TCPBLASTER_SERVER_PORTNO);
- memcpy(server.sin6_addr.s6_addr16,
- g_tcpblasterserver_ipv6, 8 * sizeof(uint16_t));
+ memcpy(server.sin6_addr.s6_addr, g_tcpblasterserver_ipv6, 16);
addrlen = sizeof(struct sockaddr_in6);
printf("Connecting to IPv6 Address: "
diff --git a/examples/tcpblaster/tcpblaster_server.c b/examples/tcpblaster/tcpblaster_server.c
index 8f5e20e..1233ea1 100644
--- a/examples/tcpblaster/tcpblaster_server.c
+++ b/examples/tcpblaster/tcpblaster_server.c
@@ -118,19 +118,23 @@ void tcpblaster_server(void)
myaddr.sin6_family = AF_INET6;
myaddr.sin6_port = HTONS(CONFIG_EXAMPLES_TCPBLASTER_SERVER_PORTNO);
#if defined(CONFIG_EXAMPLES_TCPBLASTER_LOOPBACK) && !defined(CONFIG_NET_LOOPBACK)
- memcpy(myaddr.sin6_addr.s6_addr16,
- g_tcpblasterserver_ipv6, 8 * sizeof(uint16_t));
+ memcpy(myaddr.sin6_addr.s6_addr, g_tcpblasterserver_ipv6, 16);
#else
- memset(myaddr.sin6_addr.s6_addr16, 0, 8 * sizeof(uint16_t));
+ memset(myaddr.sin6_addr.s6_addr, 0, 16);
#endif
addrlen = sizeof(struct sockaddr_in6);
printf("Binding to IPv6 Address: "
- "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
- myaddr.sin6_addr.s6_addr16[0], myaddr.sin6_addr.s6_addr16[1],
- myaddr.sin6_addr.s6_addr16[2], myaddr.sin6_addr.s6_addr16[3],
- myaddr.sin6_addr.s6_addr16[4], myaddr.sin6_addr.s6_addr16[5],
- myaddr.sin6_addr.s6_addr16[6], myaddr.sin6_addr.s6_addr16[7]);
+ "%02x%02x:%02x%02x:%02x%02x:%02x%02x:"
+ "%02x%02x:%02x%02x:%02x%02x:%02x%02x\n",
+ myaddr.sin6_addr.s6_addr[0], myaddr.sin6_addr.s6_addr[1],
+ myaddr.sin6_addr.s6_addr[2], myaddr.sin6_addr.s6_addr[3],
+ myaddr.sin6_addr.s6_addr[4], myaddr.sin6_addr.s6_addr[5],
+ myaddr.sin6_addr.s6_addr[6], myaddr.sin6_addr.s6_addr[7],
+ myaddr.sin6_addr.s6_addr[8], myaddr.sin6_addr.s6_addr[9],
+ myaddr.sin6_addr.s6_addr[10], myaddr.sin6_addr.s6_addr[11],
+ myaddr.sin6_addr.s6_addr[12], myaddr.sin6_addr.s6_addr[13],
+ myaddr.sin6_addr.s6_addr[14], myaddr.sin6_addr.s6_addr[15]);
#else
myaddr.sin_family = AF_INET;
myaddr.sin_port = HTONS(CONFIG_EXAMPLES_TCPBLASTER_SERVER_PORTNO);