Merge pull request #1141 from SaberUK/master+windows-purge

Purge code for Windows XP and MSVC pre-2015.

diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index 752a0d7a5997a14ba39845295f7cf6bf3886612b..b2b9c30ffd165d6fb19a9672a40c60d142915a1f 100644 (file)
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -88,7 +88,7 @@ class DNSBLResolver : public DNS::Request
                bool match = false;
                in_addr resultip;
 
-               inet_aton(ans_record->rdata.c_str(), &resultip);
+               inet_pton(AF_INET, ans_record->rdata.c_str(), &resultip);
 
                switch (ConfEntry->type)
                {

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 6bf9e8044436c7584d66539dfb17b64846e074b5..321ed99b839552b50c1d392c899227bf0c081031 100644 (file)
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -209,7 +209,7 @@ void ModuleSpanningTree::ConnectServer(Link* x, Autoconnect* y)
        else
        {
                in_addr n;
-               if (inet_aton(x->IPAddr.c_str(),&n) < 1)
+               if (inet_pton(AF_INET, x->IPAddr.c_str(),&n) < 1)
                        ipvalid = false;
        }
 

diff --git a/src/socket.cpp b/src/socket.cpp
index 17f13bb8a22c22a47fc7e752a30b406b39bcce41..018e0b0db754c22d4d9574fa895946bee30754c5 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -146,13 +146,13 @@ std::string irc::sockets::sockaddrs::addr() const
        char addrv[INET6_ADDRSTRLEN+1];
        if (sa.sa_family == AF_INET)
        {
-               if (!inet_ntop(AF_INET, &in4.sin_addr, addrv, sizeof(addrv)))
+               if (!inet_ntop(AF_INET, (void*)&in4.sin_addr, addrv, sizeof(addrv)))
                        return "";
                return addrv;
        }
        else if (sa.sa_family == AF_INET6)
        {
-               if (!inet_ntop(AF_INET6, &in6.sin6_addr, addrv, sizeof(addrv)))
+               if (!inet_ntop(AF_INET6, (void*)&in6.sin6_addr, addrv, sizeof(addrv)))
                        return "";
                return addrv;
        }
@@ -171,14 +171,14 @@ std::string irc::sockets::sockaddrs::str() const
        if (sa.sa_family == AF_INET)
        {
                char ipaddr[INET_ADDRSTRLEN];
-               inet_ntop(AF_INET, &in4.sin_addr, ipaddr, sizeof(ipaddr));
+               inet_ntop(AF_INET, (void*)&in4.sin_addr, ipaddr, sizeof(ipaddr));
                return InspIRCd::Format("%s:%u", ipaddr, ntohs(in4.sin_port));
        }
 
        if (sa.sa_family == AF_INET6)
        {
                char ipaddr[INET6_ADDRSTRLEN];
-               inet_ntop(AF_INET6, &in6.sin6_addr, ipaddr, sizeof(ipaddr));
+               inet_ntop(AF_INET6, (void*)&in6.sin6_addr, ipaddr, sizeof(ipaddr));
                return InspIRCd::Format("[%s]:%u", ipaddr, ntohs(in6.sin6_port));
        }
 

diff --git a/win/README.txt b/win/README.txt
index 908cd39202595be1a6b7aa29b1672ef1fd9bde98..f5b2d8c83f7df9bceab39daf7bfc155f734617f3 100644 (file)
--- a/win/README.txt
+++ b/win/README.txt
@@ -1,7 +1,7 @@
 Building InspIRCd for Windows:\r
 \r
 Prerequisites:\r
-       Visual Studio 2010 or newer (http://www.microsoft.com/visualstudio/eng/products/visual-studio-express-products)\r
+       Visual Studio 2015 or newer (https://www.visualstudio.com/)\r
        CMake 2.8 or newer (http://www.cmake.org/)\r
        If building the installer, NSIS http://nsis.sourceforge.net/\r
 \r

diff --git a/win/inspircd_win32wrapper.cpp b/win/inspircd_win32wrapper.cpp
index 3e0a264a58366764d93a07f05b00da711323ba9a..fc739f9bd17916ecb8c083d097efa3dec461094d 100644 (file)
--- a/win/inspircd_win32wrapper.cpp
+++ b/win/inspircd_win32wrapper.cpp
@@ -30,66 +30,6 @@
 #include <errno.h>
 #include <assert.h>
 
-CoreExport const char *insp_inet_ntop(int af, const void *src, char *dst, socklen_t cnt)
-{
-
-       if (af == AF_INET)
-       {
-               struct sockaddr_in in;
-               memset(&in, 0, sizeof(in));
-               in.sin_family = AF_INET;
-               memcpy(&in.sin_addr, src, sizeof(struct in_addr));
-               if (getnameinfo((struct sockaddr *)&in, sizeof(struct sockaddr_in), dst, cnt, NULL, 0, NI_NUMERICHOST) == 0)
-                       return dst;
-       }
-       else if (af == AF_INET6)
-       {
-               struct sockaddr_in6 in;
-               memset(&in, 0, sizeof(in));
-               in.sin6_family = AF_INET6;
-               memcpy(&in.sin6_addr, src, sizeof(struct in_addr6));
-               if (getnameinfo((struct sockaddr *)&in, sizeof(struct sockaddr_in6), dst, cnt, NULL, 0, NI_NUMERICHOST) == 0)
-                       return dst;
-       }
-       return NULL;
-}
-
-CoreExport int insp_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;
-}
-
 CoreExport DIR * opendir(const char * path)
 {
        std::string search_path = std::string(path) + "\\*.*";

diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h
index d65d4eb92f84a61486131d1fe52fc238ffd3939d..8b418928d28be458e1441502ba9920e41a0e1ca9 100644 (file)
--- a/win/inspircd_win32wrapper.h
+++ b/win/inspircd_win32wrapper.h
@@ -87,43 +87,10 @@
 
 typedef int ssize_t;
 
-/* Convert formatted (xxx.xxx.xxx.xxx) string to in_addr struct */
-CoreExport int insp_inet_pton(int af, const char * src, void * dst);
-
-/* Convert struct to formatted (xxx.xxx.xxx.xxx) string */
-CoreExport const char * insp_inet_ntop(int af, const void * src, char * dst, socklen_t cnt);
-
-/* inet_pton/ntop require at least NT 6.0 */
-#define inet_pton insp_inet_pton
-#define inet_ntop insp_inet_ntop
-
-/* Safe printf functions aren't defined in VC++ releases older than v14 */
-#if _MSC_VER <= 1800
-#define snprintf _snprintf
-#define vsnprintf _vsnprintf
-#endif
-
-#ifndef va_copy
-#define va_copy(dest, src) (dest = src)
-#endif
-
-/* Unix-style sleep (argument is in seconds) */
-__inline void sleep(int seconds) { Sleep(seconds * 1000); }
-
 /* _popen, _pclose */
 #define popen _popen
 #define pclose _pclose
 
-/* _access */
-#define access _access
-
-/* IPV4 only convert string to address struct */
-__inline int inet_aton(const char *cp, struct in_addr *addr)
-{
-       addr->s_addr = inet_addr(cp);
-       return (addr->s_addr == INADDR_NONE) ? 0 : 1;
-};
-
 /* getopt() wrapper */
 #define no_argument            0
 #define required_argument      1
@@ -152,14 +119,6 @@ struct DIR
        bool first;
 };
 
-#if _MSC_VER <= 1800
-struct timespec
-{
-       time_t tv_sec;
-       long tv_nsec;
-};
-#endif
-
 CoreExport DIR * opendir(const char * path);
 CoreExport dirent * readdir(DIR * handle);
 CoreExport void closedir(DIR * handle);
@@ -194,12 +153,6 @@ CoreExport void closedir(DIR * handle);
 // warning C4706: assignment within conditional expression
 #pragma warning(disable:4706)
 
-// warning C4355: 'this' : used in base member initializer list
-// This warning is disabled by default since VC2012
-#if _MSC_VER < 1700
-#pragma warning(disable:4355)
-#endif
-
 /* Shared memory allocation functions */
 void * ::operator new(size_t iSize);
 void ::operator delete(void * ptr);