pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-02 18:13:12 +02:00
Code Activity

Use the native versions of inet_ntop/inet_pton on Windows.

Browse Source
This commit is contained in:
Sadie Powell
2022-12-17 12:40:58 +00:00
parent f6e5e6a2b4
commit 8a8fb7725b
2 changed files with 0 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/win32/socket.cpp
-81
View File
@@ -48,87 +48,6 @@ int windows_accept(int fd, struct sockaddr *addr, int *addrlen)
return i;
}
/** This is inet_pton, but it works on Windows
* @param af The protocol type, AF_INET or AF_INET6
* @param src The address
* @param dst Struct to put results in
* @return 1 on success, -1 on error
*/
int windows_inet_pton(int af, const char *src, void *dst)
{
int address_length;
sockaddr_storage sa;
sockaddr_in *sin = reinterpret_cast<sockaddr_in *>(&sa);
sockaddr_in6 *sin6 = reinterpret_cast<sockaddr_in6 *>(&sa);
switch (af)
{
case AF_INET:
address_length = sizeof(sockaddr_in);
break;
case AF_INET6:
address_length = sizeof(sockaddr_in6);
break;
default:
return -1;
}
if (!WSAStringToAddress(static_cast<LPSTR>(const_cast<char *>(src)), af, NULL, reinterpret_cast<LPSOCKADDR>(&sa), &address_length))
{
switch (af)
{
case AF_INET:
memcpy(dst, &sin->sin_addr, sizeof(in_addr));
break;
case AF_INET6:
memcpy(dst, &sin6->sin6_addr, sizeof(in6_addr));
break;
}
return 1;
}
return 0;
}
/** This is inet_ntop, but it works on Windows
* @param af The protocol type, AF_INET or AF_INET6
* @param src Network address structure
* @param dst After converting put it here
* @param size sizeof the dest
* @return dst
*/
const char *windows_inet_ntop(int af, const void *src, char *dst, size_t size)
{
int address_length;
DWORD string_length = size;
sockaddr_storage sa;
sockaddr_in *sin = reinterpret_cast<sockaddr_in *>(&sa);
sockaddr_in6 *sin6 = reinterpret_cast<sockaddr_in6 *>(&sa);
memset(&sa, 0, sizeof(sa));
switch (af)
{
case AF_INET:
address_length = sizeof(sockaddr_in);
sin->sin_family = af;
memcpy(&sin->sin_addr, src, sizeof(in_addr));
break;
case AF_INET6:
address_length = sizeof(sockaddr_in6);
sin6->sin6_family = af;
memcpy(&sin6->sin6_addr, src, sizeof(in6_addr));
break;
default:
return NULL;
}
if (!WSAAddressToString(reinterpret_cast<LPSOCKADDR>(&sa), address_length, NULL, dst, &string_length))
return dst;
return NULL;
}
int fcntl(int fd, int cmd, int arg)
{
if (cmd == F_GETFL)