Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

options/posix: Add support for IPv6 addresses in inet_pton #1202

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

options/posix: Add support for IPv6 addresses in inet_pton #1202

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 84 additions & 3 deletions options/posix/generic/arpa-inet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ const char *inet_ntop(int af, const void *__restrict src, char *__restrict dst,
errno = ENOSPC;
return NULL;
}

int inet_pton(int af, const char *__restrict src, void *__restrict dst) {
switch (af) {
case AF_INET: {
Expand All @@ -200,9 +201,89 @@ int inet_pton(int af, const char *__restrict src, void *__restrict dst) {
addr->s_addr = htonl(ip);
break;
}
case AF_INET6:
mlibc::infoLogger() << "inet_pton: ipv6 is not implemented!" << frg::endlog;
/* fallthrough */
case AF_INET6: {
if(strchr(src, '.') != nullptr) {
mlibc::infoLogger() << "inet_pton: ipv4 in ipv6 address is not supported" << frg::endlog;
return 0;
}

const char *orig_src = src;
char *abbrev = strstr(src, "::");
if(abbrev && strstr(abbrev + 2, "::") != nullptr) {
return 0;
}

uint16_t addr[8] = {};
int len = abbrev ? abbrev - src : strlen(src);

int addr_len = 0;
while(*src && (src - orig_src) < len) {
char *end;
long int value = strtol(src, &end, 16);

if(value > 0xffff) {
return 0;
}
if(*end != '\0' && *end != ':') {
return 0;
}

src = end + 1;

if(addr_len >= 8) {
return 0;
}

addr[addr_len++] = htons(value);
}

if(abbrev) {
uint16_t array[8] = {};
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems broken, the array this block writes into goes out of scope before we can write it into the user provided argument.

int array_len = 0;

src = abbrev + 2;
while(*src) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this case basically copy pasted from the above one? Can they not be merged?

char *end;
long int value = strtol(src, &end, 16);

if(value > 0xffff) {
return 0;
}
if(*end != '\0' && *end != ':') {
return 0;
}

src = end + 1;

if(*end && !*src) {
return 0;
}
if(addr_len + array_len >= 8) {
return 0;
}

array[array_len++] = htons(value);
}

for(int i = 0; i < array_len; i++) {
addr[8 - array_len + i] = array[i];
}
} else if(addr_len != 8) {
return 0;
}

if(*src) {
return 0;
}

auto addr6 = reinterpret_cast<struct in6_addr*>(dst);

for(int i = 0; i < 8; i++) {
addr6->s6_addr16[i] = addr[i];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we not just work directly into this array?

}

break;
}
default:
errno = EAFNOSUPPORT;
return -1;
Expand Down
Loading