ProtocolInterface::SendEncapsulatedData() changes

[user/henk/code/inspircd.git] / src / socketengine.cpp

diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index 6c99edc95a789b34c83104507b8b538b17d8c1d0..219d154f276df68e7e3beb386f2ca01ec2146dc7 100644 (file)
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -60,7 +60,7 @@ void SocketEngine::ChangeEventMask(EventHandler* eh, int change)
                new_m &= ~FD_WANT_READ_MASK;
        if (change & FD_WANT_WRITE_MASK)
                new_m &= ~FD_WANT_WRITE_MASK;
-       
+
        // if adding a trial read/write, insert it into the set
        if (change & FD_TRIAL_NOTE_MASK && !(old_m & FD_TRIAL_NOTE_MASK))
                trials.insert(eh->GetFd());
@@ -255,3 +255,26 @@ void SocketEngine::GetStats(float &kbitpersec_in, float &kbitpersec_out, float &
        kbitpersec_in = in_kbit / 1024;
        kbitpersec_out = out_kbit / 1024;
 }
+
+std::string SocketEngine::LastError()
+{
+#ifndef _WIN32
+       return strerror(errno);
+#else
+       char szErrorString[500];
+       DWORD dwErrorCode = WSAGetLastError();
+       if (FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)szErrorString, _countof(szErrorString), NULL) == 0)
+               sprintf_s(szErrorString, _countof(szErrorString), "Error code: %u", dwErrorCode);
+       return szErrorString;
+#endif
+}
+
+std::string SocketEngine::GetError(int errnum)
+{
+#ifndef _WIN32
+       return strerror(errnum);
+#else
+       WSASetLastError(errnum);
+       return LastError();
+#endif
+}