X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Finspircd_win32wrapper.h;h=b2ca05229692f9b1f8add017a4148664749dc6c0;hb=c05f81cac83e80c7727594e3929e0709eccca689;hp=a19bdf857a2f18d09ced8235d449a3f8d0cf14c1;hpb=f62654a6859998f9d63eb22702c572d5ebcff15c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h index a19bdf857..b2ca05229 100644 --- a/win/inspircd_win32wrapper.h +++ b/win/inspircd_win32wrapper.h @@ -1,9 +1,17 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2007 Dennis Friis - * Copyright (C) 2007 Craig Edwards - * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2020 Matt Schatz + * Copyright (C) 2013-2015 Attila Molnar + * Copyright (C) 2013, 2015, 2018-2019, 2021 Sadie Powell + * Copyright (C) 2012-2013 ChrisTX + * Copyright (C) 2012 Robby + * Copyright (C) 2011, 2014, 2019 Adam + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2007-2009 Robin Burchell + * Copyright (C) 2007-2008 Craig Edwards + * Copyright (C) 2007, 2009 Dennis Friis + * Copyright (C) 2007 burlex * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public @@ -43,7 +51,7 @@ #define VC_EXTRALEAN #define WIN32_LEAN_AND_MEAN -/* Macros for exporting symbols - dependant on what is being compiled */ +/* Macros for exporting symbols - dependent on what is being compiled */ #ifdef DLL_BUILD #define CoreExport __declspec(dllimport) @@ -53,11 +61,20 @@ #define DllExport __declspec(dllimport) #endif +// File numbers for standard streams. +#define STDIN_FILENO 0 +#define STDOUT_FILENO 1 +#define STDERR_FILENO 2 + /* Redirect main() through a different method in win32service.cpp, to intercept service startup */ #define ENTRYPOINT CoreExport int smain(int argc, char** argv) /* Disable the deprecation warnings.. it spams :P */ #define _CRT_SECURE_NO_DEPRECATE +#define _WINSOCK_DEPRECATED_NO_WARNINGS + +// Windows doesn't support getopt_long so we use ya_getopt instead. +#include "ya_getopt.h" /* Normal windows (platform-specific) includes */ #include @@ -84,80 +101,14 @@ #define strcasecmp _stricmp #define strncasecmp _strnicmp -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++ */ -#define snprintf _snprintf -#define vsnprintf _vsnprintf - -#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); } +typedef SSIZE_T ssize_t; /* _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 -#define optional_argument 2 -struct option -{ - char *name; - int has_arg; - int *flag; - int val; -}; -extern int optind; -extern char optarg[514]; -int getopt_long(int ___argc, char *const *___argv, const char *__shortopts, const struct option *__longopts, int *__longind); - -struct dirent -{ - char d_name[MAX_PATH]; -}; - -struct DIR -{ - dirent dirent_pointer; - HANDLE find_handle; - WIN32_FIND_DATAA find_data; - bool first; -}; - -struct timespec -{ - time_t tv_sec; - long tv_nsec; -}; - -CoreExport DIR * opendir(const char * path); -CoreExport dirent * readdir(DIR * handle); -CoreExport void closedir(DIR * handle); +#define getpid _getpid +#define dup _dup +#define fdopen _fdopen // warning: 'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2' // Normally, this is a huge problem, but due to our new/delete remap, we can ignore it. @@ -189,18 +140,13 @@ 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 +// warning C4800: 'type' : forcing value to bool 'true' or 'false' (performance warning) +#pragma warning(disable:4800) /* Shared memory allocation functions */ void * ::operator new(size_t iSize); void ::operator delete(void * ptr); -#define DISABLE_WRITEV - #include class CWin32Exception : public std::exception @@ -218,3 +164,43 @@ private: // Same value as EXIT_STATUS_FORK (EXIT_STATUS_FORK is unused on Windows) #define EXIT_STATUS_SERVICE 4 + +// POSIX iovec +struct iovec +{ + void* iov_base; // Starting address + size_t iov_len; // Number of bytes to transfer +}; + +// Windows WSABUF with POSIX field names +struct WindowsIOVec +{ + // POSIX iovec has iov_base then iov_len, WSABUF in Windows has the fields in reverse order + u_long iov_len; // Number of bytes to transfer + char FAR* iov_base; // Starting address +}; + +inline ssize_t writev(int fd, const WindowsIOVec* iov, int count) +{ + DWORD sent; + int ret = WSASend(fd, reinterpret_cast(const_cast(iov)), count, &sent, 0, NULL, NULL); + if (ret == 0) + return sent; + return -1; +} + +// This wrapper is just so we don't need to do #ifdef _WIN32 everywhere in the socket code. It is +// not actually used and does not need to be the same size as sockaddr_un on UNIX systems. +struct sockaddr_un +{ + ADDRESS_FAMILY sun_family; + char sun_path[6]; +}; + +struct WindowsStream +{ + WORD BackgroundColor; + WORD ForegroundColor; + HANDLE Handle; + WindowsStream(DWORD handle); +};