Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-15 09:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add resolver for hostname -> ip, use it before bind/connect

Browse Source
This commit is contained in:
Alexey Rybalchenko
2018-05-03 15:00:32 +02:00
committed by Dennis Klein
parent 166e537d9f
commit a5ff7d5a1e
4 changed files with 82 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
fairmq/FairMQDevice.cxx
View File

@@ -302,15 +302,32 @@ bool FairMQDevice::AttachChannel(FairMQChannel& ch)
address = endpoint.substr(1);
}
bool rc = true;
if (address.compare(0, 6, "tcp://") == 0)
{
string addressString = address.substr(6);
auto pos = addressString.find(":");
string hostPart = addressString.substr(0, pos);
if (!(bind && hostPart == "*"))
{
string portPart = addressString.substr(pos + 1);
string resolvedHost = fair::mq::tools::getIpFromHostname(hostPart);
if (resolvedHost == "")
{
return false;
}
address.assign("tcp://" + resolvedHost + ":" + portPart);
}
}
bool success = true;
// make the connection
if (bind)
{
rc = BindEndpoint(*ch.fSocket, address);
success = BindEndpoint(*ch.fSocket, address);
}
else
{
rc = ConnectEndpoint(*ch.fSocket, address);
success = ConnectEndpoint(*ch.fSocket, address);
}
// bind might bind to an address different than requested,
@@ -325,9 +342,9 @@ bool FairMQDevice::AttachChannel(FairMQChannel& ch)
LOG(debug) << "Attached channel " << ch.fName << " to " << endpoint << (bind ? " (bind) " : " (connect) ");
// after the book keeping is done, exit in case of errors
if (!rc)
if (!success)
{
return rc;
return success;
}
}