epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

UDP transport shutdown fixed

Browse Source
This commit is contained in:
Matej Sekoranja
2016-02-25 10:37:01 +01:00
parent f0ca714214
commit 7bfe58f1e2
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/remote/blockingUDPTransport.cpp
View File

@@ -154,7 +154,7 @@ inline int sendto(int s, const char *buf, size_t len, int flags, const struct so
// wait for send thread to exit cleanly
if (waitForThreadToComplete)
if (_thread.get() && waitForThreadToComplete)
{
if (!_shutdownEvent.wait(5.0))
{

3
src/remoteClient/clientContextImpl.cpp
View File

@@ -4666,7 +4666,8 @@ namespace epics {
localMulticastTransport->start();
m_udpTransports.push_back(transport);
m_udpTransports.push_back(transport2);
if (transport2)
m_udpTransports.push_back(transport2);
m_udpTransports.push_back(localMulticastTransport);
}

3
src/server/serverContext.cpp
View File

@@ -476,7 +476,8 @@ void ServerContextImpl::initializeBroadcastTransport()
localMulticastTransport->start();
_udpTransports.push_back(transport);
_udpTransports.push_back(transport2);
if(transport2)
_udpTransports.push_back(transport2);
_udpTransports.push_back(localMulticastTransport);
}