From fbd8fd2ccff9d1f51b0dec379d18ab7f11bcd4bf Mon Sep 17 00:00:00 2001 From: Jordan Bayles Date: Thu, 26 Mar 2020 19:27:04 +0000 Subject: Change hardware address to be std::array This patch changes InterfaceInfo's type to be a std::array, for easier use with STL containers like any_of, and for type safety. Change-Id: If8fb66e60e72857db5f171e60e0f4a97f855ac12 Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/2122256 Reviewed-by: Max Yakimakha Commit-Queue: Jordan Bayles --- osp/impl/discovery/mdns/mdns_responder_adapter_impl.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'osp') diff --git a/osp/impl/discovery/mdns/mdns_responder_adapter_impl.cc b/osp/impl/discovery/mdns/mdns_responder_adapter_impl.cc index b6b86c86..3feb8e7a 100644 --- a/osp/impl/discovery/mdns/mdns_responder_adapter_impl.cc +++ b/osp/impl/discovery/mdns/mdns_responder_adapter_impl.cc @@ -270,8 +270,9 @@ Error MdnsResponderAdapterImpl::RegisterInterface( } static_assert(sizeof(info.MAC.b) == sizeof(interface_info.hardware_address), - "MAC addresss size mismatch."); - memcpy(info.MAC.b, interface_info.hardware_address, sizeof(info.MAC.b)); + "MAC address size mismatch."); + memcpy(info.MAC.b, interface_info.hardware_address.data(), + sizeof(info.MAC.b)); info.McastTxRx = 1; platform_storage_.sockets.push_back(socket); auto result = mDNS_RegisterInterface(&mdns_, &info, mDNSfalse); -- cgit v1.2.3