Commit afce78d4 authored by Dominik Charousset's avatar Dominik Charousset

Replace `detail::iface_info` with string pair

parent de76b158
......@@ -27,10 +27,8 @@
namespace caf {
namespace detail {
struct iface_info {
std::string interface_name;
std::string ethernet_address;
};
using iface_info = std::pair<std::string /* interface name */,
std::string /* interface address */>;
std::vector<iface_info> get_mac_addresses();
......
......@@ -168,7 +168,7 @@ node_id::data* node_id::data::create_singleton() {
std::vector<std::string> macs;
macs.reserve(ifs.size());
for (auto& i : ifs) {
macs.emplace_back(std::move(i.ethernet_address));
macs.emplace_back(std::move(i.second));
}
auto hd_serial_and_mac_addr = join(macs, "") + detail::get_root_uuid();
node_id::host_id_type nid;
......
Subproject commit fcf305450e030116ff4446576596ad11cdf5d47d
Subproject commit d2634f2da9699088829fc97abe46b01e95723db6
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment