mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-11-19 23:12:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

ip6addr_ntoa_r: correctly generate ipv4 mapped addresses

Browse Source
This commit is contained in:
Simon Goldschmidt 2018-06-14 12:29:40 +02:00
parent 7c03f4cf46
commit 313664c59c
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/ipv6/ip6_addr.c
View File

@ -47,6 +47,8 @@
#include "lwip/ip_addr.h" #include "lwip/ip_addr.h"
#include "lwip/def.h" #include "lwip/def.h"
#include <string.h>
#if LWIP_IPV4 #if LWIP_IPV4
#include "lwip/ip4_addr.h" /* for ip6addr_aton to handle IPv4-mapped addresses */ #include "lwip/ip4_addr.h" /* for ip6addr_aton to handle IPv4-mapped addresses */
#endif /* LWIP_IPV4 */ #endif /* LWIP_IPV4 */
@ -223,6 +225,26 @@ ip6addr_ntoa_r(const ip6_addr_t *addr, char *buf, int buflen)
s32_t i; s32_t i;
u8_t zero_flag, empty_block_flag; u8_t zero_flag, empty_block_flag;
#if LWIP_IPV4
if (ip6_addr_isipv4mappedipv6(addr)) {
/* This is an IPv4 mapped address */
ip4_addr_t addr4;
char *ret;
#define IP4MAPPED_HEADER "::FFFF:"
char *buf_ip4 = buf + sizeof(IP4MAPPED_HEADER) - 1;
int buflen_ip4 = buflen - sizeof(IP4MAPPED_HEADER) + 1;
if (buflen < sizeof(IP4MAPPED_HEADER)) {
return NULL;
}
memcpy(buf, IP4MAPPED_HEADER, sizeof(IP4MAPPED_HEADER));
addr4.addr = addr->addr[3];
ret = ip4addr_ntoa_r(&addr4, buf_ip4, buflen_ip4);
if (ret != buf_ip4) {
return NULL;
}
return buf;
}
#endif /* LWIP_IPV4 */
i = 0; i = 0;
empty_block_flag = 0; /* used to indicate a zero chain for "::' */ empty_block_flag = 0; /* used to indicate a zero chain for "::' */