Skip to content

Commit 332dfd3

Browse files
authored
feat(networking): removed local maco definition in favor of IDF one
1 parent 1f12ddb commit 332dfd3

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

libraries/Network/src/NetworkClient.cpp

+7-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@
2323
#include <lwip/netdb.h>
2424
#include <errno.h>
2525

26-
#define _IN6_IS_ADDR_V4MAPPED(a) ((((__const uint32_t *)(a))[0] == 0) && (((__const uint32_t *)(a))[1] == 0) && (((__const uint32_t *)(a))[2] == htonl(0xffff)))
26+
// It is already defined in IDF as:
27+
//#define IN6_IS_ADDR_V4MAPPED(a) ip6_addr_isipv4mappedipv6((ip6_addr_t*)(a))
28+
//#define ip6_addr_isipv4mappedipv6(ip6addr) (((ip6addr)->addr[0] == 0) && ((ip6addr)->addr[1] == 0) && (((ip6addr)->addr[2]) == PP_HTONL(0x0000FFFFUL)))
29+
// Keeping as a memory of the change.
30+
//#define _IN6_IS_ADDR_V4MAPPED(a) ((((__const uint32_t *)(a))[0] == 0) && (((__const uint32_t *)(a))[1] == 0) && (((__const uint32_t *)(a))[2] == htonl(0xffff)))
2731

2832
#define WIFI_CLIENT_DEF_CONN_TIMEOUT_MS (3000)
2933
#define WIFI_CLIENT_MAX_WRITE_RETRY (10)
@@ -598,7 +602,7 @@ IPAddress NetworkClient::remoteIP(int fd) const {
598602
// IPv6, but it might be IPv4 mapped address
599603
if (((struct sockaddr *)&addr)->sa_family == AF_INET6) {
600604
struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *)&addr;
601-
if (_IN6_IS_ADDR_V4MAPPED(saddr6->sin6_addr.un.u32_addr)) {
605+
if (IN6_IS_ADDR_V4MAPPED(saddr6->sin6_addr.un.u32_addr)) {
602606
return IPAddress(IPv4, (uint8_t *)saddr6->sin6_addr.s6_addr + IPADDRESS_V4_BYTES_INDEX);
603607
} else {
604608
return IPAddress(IPv6, (uint8_t *)(saddr6->sin6_addr.s6_addr), saddr6->sin6_scope_id);
@@ -640,7 +644,7 @@ IPAddress NetworkClient::localIP(int fd) const {
640644
// IPv6, but it might be IPv4 mapped address
641645
if (((struct sockaddr *)&addr)->sa_family == AF_INET6) {
642646
struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *)&addr;
643-
if (_IN6_IS_ADDR_V4MAPPED(saddr6->sin6_addr.un.u32_addr)) {
647+
if (IN6_IS_ADDR_V4MAPPED(saddr6->sin6_addr.un.u32_addr)) {
644648
return IPAddress(IPv4, (uint8_t *)saddr6->sin6_addr.s6_addr + IPADDRESS_V4_BYTES_INDEX);
645649
} else {
646650
return IPAddress(IPv6, (uint8_t *)(saddr6->sin6_addr.s6_addr), saddr6->sin6_scope_id);

0 commit comments

Comments
 (0)