epics/pvxs
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

client: fix bcast addr id

Browse Source
This commit is contained in:
Michael Davidsaver
2021-06-02 14:42:48 -05:00
parent e287ce5a58
commit 69ed03e508
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client.cpp
+6 -4
View File
@@ -391,10 +391,10 @@ ContextImpl::ContextImpl(const Config& conf, const evbase& tcp_loop)
searchBuckets.resize(nBuckets);
std::set<std::string> bcasts;
std::set<SockAddr> bcasts;
for(auto& addr : searchTx.interfaces()) {
addr.setPort(0u);
bcasts.insert(addr.tostring());
bcasts.insert(addr);
}
{
@@ -420,15 +420,17 @@ ContextImpl::ContextImpl(const Config& conf, const evbase& tcp_loop)
enable_SO_RXQ_OVFL(searchTx.sock);
for(auto& addr : effective.addressList) {
auto isbcast = bcasts.find(addr)!=bcasts.end();
SockAddr saddr(AF_INET);
try {
saddr.setAddress(addr.c_str(), effective.udp_port);
}catch(std::runtime_error& e) {
log_err_printf(setup, "%s Ignoring %s\n", e.what(), addr.c_str());
continue;
}
auto top = ntohl(saddr->in.sin_addr.s_addr)>>24u;
auto isucast = !isbcast && top<239 && top>224;
auto ismcast = top>224 && top<239;
bool isbcast = bcasts.find(saddr.withPort(0))!=bcasts.end(); // TODO: exclude port
auto isucast = !isbcast && !ismcast;
log_info_printf(io, "Searching to %s%s\n", saddr.tostring().c_str(), (isucast?" unicast":""));
searchDest.emplace_back(saddr, isucast);