diff --git a/include/opendht/dht.h b/include/opendht/dht.h index 5b1c06dc8b8409044e7a97e32000d5e1d3fbe2ba..77af07f9f1e5b667248f653ad122d431796841d1 100644 --- a/include/opendht/dht.h +++ b/include/opendht/dht.h @@ -369,7 +369,7 @@ public: /* This must be provided by the user. */ static bool isBlacklisted(const sockaddr*, socklen_t) { return false; } - std::vector<Address> getPublicAddress(); + std::vector<Address> getPublicAddress(sa_family_t family = 0); protected: LogMethod DHT_DEBUG = NOLOG; diff --git a/include/opendht/dhtrunner.h b/include/opendht/dhtrunner.h index f24625cdbb14f7808d0fc1e3f3269f58c2c5f0a0..22b08fee80e8d1e1eccf459f3a72df2e2a9f15d1 100644 --- a/include/opendht/dhtrunner.h +++ b/include/opendht/dhtrunner.h @@ -293,14 +293,14 @@ public: std::lock_guard<std::mutex> lck(dht_mtx); return dht_->getSearchesLog(af); } - std::vector<Address> getPublicAddress() + std::vector<Address> getPublicAddress(sa_family_t af = 0) { std::lock_guard<std::mutex> lck(dht_mtx); - return dht_->getPublicAddress(); + return dht_->getPublicAddress(af); } - std::vector<std::string> getPublicAddressStr() + std::vector<std::string> getPublicAddressStr(sa_family_t af = 0) { - auto addrs = getPublicAddress(); + auto addrs = getPublicAddress(af); std::vector<std::string> ret(addrs.size()); std::transform(addrs.begin(), addrs.end(), ret.begin(), dht::printAddr); return ret; diff --git a/src/dht.cpp b/src/dht.cpp index f05938363a409ca49ed4c3b9b19bb2152b767245..17276b3eacdb0d744a666ae92ff0cad94fe174d8 100644 --- a/src/dht.cpp +++ b/src/dht.cpp @@ -573,15 +573,15 @@ Dht::isNodeBlacklisted(const sockaddr *sa, socklen_t salen) const } std::vector<Address> -Dht::getPublicAddress() +Dht::getPublicAddress(sa_family_t family) { std::sort(reported_addr.begin(), reported_addr.end(), [](const ReportedAddr& a, const ReportedAddr& b) { return a.first < b.first; }); std::vector<Address> ret; - ret.reserve(reported_addr.size()); for (const auto& addr : reported_addr) - ret.emplace_back(addr.second); + if (!family || family == addr.second.first.ss_family) + ret.emplace_back(addr.second); return ret; }