Skip to content

Update InetNtop usage on windows #50

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

Closed
wants to merge 1 commit into from
Closed

Update InetNtop usage on windows #50

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
28 changes: 7 additions & 21 deletions src/socket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,27 +117,6 @@ void socket_set_verbose(int level)

const char *socket_addr_to_string(struct sockaddr *addr, char *addr_out, size_t addr_out_size)
{
#ifdef _WIN32
DWORD addr_out_len = addr_out_size;
DWORD addrlen = 0;

if (addr->sa_family == AF_INET) {
addrlen = sizeof(struct sockaddr_in);
}
#ifdef AF_INET6
else if (addr->sa_family == AF_INET6) {
addrlen = sizeof(struct sockaddr_in6);
}
#endif
else {
errno = EAFNOSUPPORT;
return NULL;
}

if (WSAAddressToString(addr, addrlen, NULL, addr_out, &addr_out_len) == 0) {
return addr_out;
}
#else
const void *addrdata = NULL;

if (addr->sa_family == AF_INET) {
Expand All @@ -153,6 +132,13 @@ const char *socket_addr_to_string(struct sockaddr *addr, char *addr_out, size_t
return NULL;
}

#ifdef _WIN32
//on windonws SDK inet_ntop translates to InetNtop https://learn.microsoft.com/en-us/windows/win32/api/ws2tcpip/nf-ws2tcpip-inet_ntop
//using ANSI function version, to avoid buffer conversion for UNICODE compilation
if (InetNtopA(addr->sa_family, addrdata, addr_out, addr_out_size)) {
return addr_out;
}
#else
if (inet_ntop(addr->sa_family, addrdata, addr_out, addr_out_size)) {
return addr_out;
}
Expand Down
Loading