summaryrefslogtreecommitdiff
path: root/win/inspircd_win32wrapper.cpp
diff options
context:
space:
mode:
authorattilamolnar <attilamolnar@hush.com>2013-06-04 21:43:29 +0200
committerattilamolnar <attilamolnar@hush.com>2013-06-04 21:43:29 +0200
commitfc198fffe16fed4d9c8863e0571c5f314aaa5147 (patch)
tree176f156399b057c2623cfac778d0ab2feba7cfe0 /win/inspircd_win32wrapper.cpp
parent9b08c60495603920baf3ab14607c702e1411bce6 (diff)
Fix inet_pton on Windows with IPv6 addresses
Code from Anope win32/socket.cpp by @Adam-
Diffstat (limited to 'win/inspircd_win32wrapper.cpp')
-rw-r--r--win/inspircd_win32wrapper.cpp40
1 files changed, 30 insertions, 10 deletions
diff --git a/win/inspircd_win32wrapper.cpp b/win/inspircd_win32wrapper.cpp
index ebc498529..4592aa5d1 100644
--- a/win/inspircd_win32wrapper.cpp
+++ b/win/inspircd_win32wrapper.cpp
@@ -55,18 +55,38 @@ CoreExport const char *insp_inet_ntop(int af, const void *src, char *dst, sockle
CoreExport int insp_inet_pton(int af, const char *src, void *dst)
{
- sockaddr_in sa;
- int len = sizeof(SOCKADDR);
- int rv = WSAStringToAddressA((LPSTR)src, af, NULL, (LPSOCKADDR)&sa, &len);
- if(rv >= 0)
+ int address_length;
+ sockaddr_storage sa;
+ sockaddr_in* sin = reinterpret_cast<sockaddr_in*>(&sa);
+ sockaddr_in6* sin6 = reinterpret_cast<sockaddr_in6*>(&sa);
+
+ switch (af)
{
- if(WSAGetLastError() == WSAEINVAL)
- rv = 0;
- else
- rv = 1;
+ 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;
}
- memcpy(dst, &sa.sin_addr, sizeof(struct in_addr));
- return rv;
+
+ return 0;
}
CoreExport DIR * opendir(const char * path)