summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2007-07-27 17:39:51 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2007-07-27 17:39:51 +0000
commitf40811fd6e82d62010b395d2897b46e58dfebf6c (patch)
treec3646a0732c9a0cef4b9f445e37fc3461305a969
parent156c232d1d22568d20ec498c4bd344bf03052e4a (diff)
Fix compile errors in windows
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7592 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--include/socketengine_iocp.h10
-rw-r--r--win/inspircd_win32wrapper.cpp9
-rw-r--r--win/inspircd_win32wrapper.h8
3 files changed, 13 insertions, 14 deletions
diff --git a/include/socketengine_iocp.h b/include/socketengine_iocp.h
index f4825c6b4..ad3e58157 100644
--- a/include/socketengine_iocp.h
+++ b/include/socketengine_iocp.h
@@ -114,6 +114,11 @@ class IOCPEngine : public SocketEngine
map<int, EventHandler*> m_binding;
public:
+ /** Holds the preallocated buffer passed to WSARecvFrom
+ * function. Yes, I know, it's a dirty hack.
+ */
+ udp_overlap * udp_ov;
+
/** Creates an IOCP Socket Engine
* @param Instance The creator of this object
*/
@@ -206,10 +211,7 @@ public:
*/
EventHandler* GetIntRef(int fd);
- /** Holds the preallocated buffer passed to WSARecvFrom
- * function. Yes, I know, it's a dirty hack.
- */
- udp_overlap * udp_ov;
+ bool BoundsCheckFd(EventHandler* eh);
};
/** Creates a SocketEngine
diff --git a/win/inspircd_win32wrapper.cpp b/win/inspircd_win32wrapper.cpp
index 37d071459..0e7f0172e 100644
--- a/win/inspircd_win32wrapper.cpp
+++ b/win/inspircd_win32wrapper.cpp
@@ -366,7 +366,7 @@ int getopt_long_only(int ___argc, char *const *___argv, const char *__shortopts,
#define IPC_MESSAGE_DIE 2
#define IPC_MESSAGE_RESTART 3
-void InitIPC()
+void IPC::IPC(InspIRCd* Srv) : Instance(Srv)
{
static DWORD buflen = 1024;
static const char * pipename = "\\\\.\\mailslot\\Inspircd";
@@ -375,7 +375,7 @@ void InitIPC()
printf("IPC Pipe could not be created. Are you sure you didn't start InspIRCd twice?\n");
}
-void CheckIPC(InspIRCd * Instance)
+void IPC::Check()
{
if (hIPCPipe == INVALID_HANDLE_VALUE)
return;
@@ -407,7 +407,7 @@ void CheckIPC(InspIRCd * Instance)
}
}
-void CloseIPC()
+void IPC::~IPC()
{
CloseHandle(hIPCPipe);
}
@@ -643,6 +643,3 @@ bool ValidateWindowsDnsServer(ServerConfig* conf, const char* tag, const char* v
}
return true;
}
-
-#else
-
diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h
index dcb0b1d39..3f412db55 100644
--- a/win/inspircd_win32wrapper.h
+++ b/win/inspircd_win32wrapper.h
@@ -174,8 +174,8 @@ void ::operator delete(void * ptr);
/* IPC Handlers */
class InspIRCd;
-class ConfigReader;
class ValueItem;
+class ServerConfig;
class IPC
{
@@ -183,9 +183,9 @@ class IPC
InspIRCd* Instance;
HANDLE hIPCPipe;
public:
- void IPC();
- void CheckIPC(InspIRCd* Srv);
- void ~IPC();
+ IPC(InspIRCd* Srv);
+ void Check();
+ ~IPC();
};
/* Look up the nameserver in use from the registry on windows */