From 4e264f2295b24fae1b507b63fdf431444248baf4 Mon Sep 17 00:00:00 2001 From: Matej Sekoranja Date: Tue, 26 Apr 2016 20:48:27 +0200 Subject: [PATCH] win32: moved osiSockAttach() call before loadConfiguration should fix #45 --- src/server/serverContext.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/server/serverContext.cpp b/src/server/serverContext.cpp index 012128d..21068d8 100644 --- a/src/server/serverContext.cpp +++ b/src/server/serverContext.cpp @@ -174,6 +174,8 @@ void ServerContextImpl::loadConfiguration() // introspect network interfaces // + osiSockAttach(); + SOCKET sock = epicsSocketCreate(AF_INET, SOCK_STREAM, 0); if (!sock) { THROW_BASE_EXCEPTION("Failed to create a socket needed to introspect network interfaces."); @@ -263,7 +265,8 @@ void ServerContextImpl::initialize(ChannelProviderRegistry::shared_pointer const void ServerContextImpl::internalInitialize() { - osiSockAttach(); + // already called in loadConfiguration + //osiSockAttach(); _timer.reset(new Timer("pvAccess-server timer", lowerPriority)); _transportRegistry.reset(new TransportRegistry());