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

Transport::getRemoteAddress() return reference

Browse Source 
make it clear that result is always !NULL
This commit is contained in:
Michael Davidsaver
2018-02-01 19:09:44 -08:00
parent f1defe4e9f
commit 9b828852c0
9 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/remoteClient/clientContextImpl.cpp
View File

@@ -3663,11 +3663,11 @@ public:
{
// GUID check case: same server listening on different NIF
if (!sockAddrAreIdentical(transport->getRemoteAddress(), serverAddress) &&
if (!sockAddrAreIdentical(&transport->getRemoteAddress(), serverAddress) &&
!std::equal(guid.value, guid.value + 12, m_guid.value))
{
EXCEPTION_GUARD3(m_requester, req, req->message("More than one channel with name '" + m_name +
"' detected, connected to: " + inetAddressToString(*transport->getRemoteAddress()) + ", ignored: " + inetAddressToString(*serverAddress), warningMessage));
"' detected, connected to: " + inetAddressToString(transport->getRemoteAddress()) + ", ignored: " + inetAddressToString(*serverAddress), warningMessage));
}
// do not pass (create transports) with we already have one