mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-02 12:52:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

more broken test cases for ipv6

Browse Source
This commit is contained in:
William Skellenger 2024-06-07 15:40:31 -04:00
parent 2a29247081
commit 748cd807c7
2 changed files with 56 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,6 +57,8 @@
/* used by IP6_ADDR_ANY(6) in ip6_addr.h */
const ip_addr_t ip6_addr_any = IPADDR6_INIT(0ul, 0ul, 0ul, 0ul);
#define SMALLEST_POSSIBLE_IPV6_STRLEN 2 //"::" is the smallest possible
#define lwip_xchar(i) ((char)((i) < 10 ? '0' + (i) : 'A' + (i) - 10))
/**
@ -71,19 +73,40 @@ const ip_addr_t ip6_addr_any = IPADDR6_INIT(0ul, 0ul, 0ul, 0ul);
int
ip6addr_aton(const char *cp, ip6_addr_t *addr)
{
u32_t addr_index, zero_blocks, current_block_index, current_block_value;
u32_t addr_index, current_block_index, current_block_value, double_colon_found;
s32_t zero_blocks;
size_t len;
const char *s;
int block_length;
#if LWIP_IPV4
int check_ipv4_mapped = 0;
#endif /* LWIP_IPV4 */
if (!cp) {
return 0;
}
len = strlen(cp);
if (len < SMALLEST_POSSIBLE_IPV6_STRLEN) {
return 0;
}
//if last character is a colon but not a double colon, invalid
if ((cp[len-1] == ':') && (cp[len-2] != ':')) {
return 0;
}
/* Count the number of colons, to count the number of blocks in a "::" sequence
zero_blocks may be 1 even if there are no :: sequences */
zero_blocks = 8;
double_colon_found = 0;
for (s = cp; *s != 0; s++) {
if (*s == ':') {
zero_blocks--;
if (s[1] == ':') {
double_colon_found = 1;
}
#if LWIP_IPV4
} else if (*s == '.') {
if ((zero_blocks == 5) ||(zero_blocks == 2)) {
@ -101,6 +124,11 @@ ip6addr_aton(const char *cp, ip6_addr_t *addr)
}
}
/* we found a double colon but it is impossible to populate it */
if (double_colon_found && zero_blocks <= 0) {
return 0;
}
/* parse each block */
addr_index = 0;
current_block_index = 0;
@ -109,7 +137,7 @@ ip6addr_aton(const char *cp, ip6_addr_t *addr)
for (s = cp; *s != 0; s++) {
if (*s == ':') {
if (block_length > 4) {
return 0; //invalid block length
return 0; /* invalid block length */
}
if (addr) {
if (current_block_index & 0x1) {
@ -167,7 +195,7 @@ ip6addr_aton(const char *cp, ip6_addr_t *addr)
}
} else if (lwip_isxdigit(*s)) {
if (block_length == 4) {
return 0; //invalid block length
return 0; /* invalid block length */
}
block_length++;
/* add current digit */
@ -181,7 +209,7 @@ ip6addr_aton(const char *cp, ip6_addr_t *addr)
}
if (block_length > 4) {
return 0; //invalid block length
return 0; /* invalid block length */
}
if (addr) {

27
test/unit/ip6/test_ip6.c
View File

@ -204,6 +204,10 @@ START_TEST(test_ip6_aton_ipv4mapped)
const char *shortened_ipv4_mapped_addr = "::FFFF:212.204.101.210";
const char *bogus_ipv4_mapped_addr = "::FFFF:212.204.101.2101";
const char *ipv6_block_too_long = "1234:5678:9aBc:acDef:1122:3344:5566:7788";
const char *ipv6_trailing_single_colon = "fE80::1:";
const char *ipv6_impossible_compression1 = "1234:5678:9aBc::cDef:1122:3344:5566:7788";
const char *ipv6_impossible_compression2 = "1234:5678:9aBc:cDef:1122:3344:5566:7788::";
const char *ipv6_valid_compression = "fE80::1:1";
LWIP_UNUSED_ARG(_i);
@ -269,9 +273,26 @@ START_TEST(test_ip6_aton_ipv4mapped)
memset(&addr6, 0, sizeof(addr6));
ret = ip6addr_aton(ipv6_block_too_long, &addr6);
fail_unless(ret == 0);
memset(&addr, 0, sizeof(addr));
ret = ipaddr_aton(ipv6_block_too_long, &addr);
fail_unless(ret == 0);
/* trailing single colon, invalid */
memset(&addr6, 0, sizeof(addr6));
ret = ip6addr_aton(ipv6_trailing_single_colon, &addr6);
fail_unless(ret == 0)
/* impossible to support compression, already enough blocks, invalid */
memset(&addr6, 0, sizeof(addr6));
ret = ip6addr_aton(ipv6_impossible_compression1, &addr6);
fail_unless(ret == 0)
/* impossible to support compression at the end of the address, already enough blocks, invalid */
memset(&addr6, 0, sizeof(addr6));
ret = ip6addr_aton(ipv6_impossible_compression2, &addr6);
fail_unless(ret == 0)
/* valid ipv6 with compression */
memset(&addr6, 0, sizeof(addr6));
ret = ip6addr_aton(ipv6_valid_compression, &addr6);
fail_unless(ret == 1)
}
END_TEST