diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-09-02 16:18:16 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-09-03 10:59:19 +0200 |
| commit | 26c9b836778cbaf9b9ccb9b92e841d7bd6ea2fdc (patch) | |
| tree | 36f589364a3040c46914c1e038e6544bb48e4b7f /src/init.cpp | |
| parent | 4be0b082b97062be4df20e9c45dafa577b05b07c (diff) | |
| download | bitcoin-26c9b836778cbaf9b9ccb9b92e841d7bd6ea2fdc.tar.xz | |
Move windows socket init to utility function
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/init.cpp b/src/init.cpp index 4aaeee257b..4cdbd5edaa 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -658,17 +658,12 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) typedef BOOL (WINAPI *PSETPROCDEPPOL)(DWORD); PSETPROCDEPPOL setProcDEPPol = (PSETPROCDEPPOL)GetProcAddress(GetModuleHandleA("Kernel32.dll"), "SetProcessDEPPolicy"); if (setProcDEPPol != NULL) setProcDEPPol(PROCESS_DEP_ENABLE); - - // Initialize Windows Sockets - WSADATA wsadata; - int ret = WSAStartup(MAKEWORD(2,2), &wsadata); - if (ret != NO_ERROR || LOBYTE(wsadata.wVersion ) != 2 || HIBYTE(wsadata.wVersion) != 2) - { - return InitError(strprintf("Error: Winsock library failed to start (WSAStartup returned error %d)", ret)); - } #endif -#ifndef WIN32 + if (!SetupNetworking()) + return InitError("Error: Initializing networking failed"); + +#ifndef WIN32 if (GetBoolArg("-sysperms", false)) { #ifdef ENABLE_WALLET if (!GetBoolArg("-disablewallet", false)) |