merge

pvAccessApp/remoteClient/clientContextImpl.cpp

@@ -3729,6 +3729,7 @@ TODO
 
             void internalInitialize() {
 
+                osiSockAttach();
                 m_timer.reset(new Timer("pvAccess-client timer", lowPriority));
                 Context::shared_pointer thisPointer = shared_from_this();
                 m_connector.reset(new BlockingTCPConnector(thisPointer, m_receiveBufferSize, m_beaconPeriod));

pvAccessApp/server/serverContext.cpp

@@ -173,6 +173,7 @@ std::auto_ptr<ResponseHandler> ServerContextImpl::createResponseHandler()
 
 void ServerContextImpl::internalInitialize()
 {
+        osiSockAttach();
 	_timer.reset(new Timer("pvAccess-server timer",lowerPriority));
 	_transportRegistry.reset(new TransportRegistry());
 

testApp/utils/inetAddressUtilsTest.cpp

@@ -22,6 +22,7 @@ using namespace epics::pvAccess;
 using namespace std;
 
 int main(int argc, char *argv[]) {
+    osiSockAttach();
     createFileLogger("inetAddresUtils.log");
 
     InetAddrVector *vec;