detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-24 15:20:02 +02:00
Code Issues Actions Packages Releases Activity

explicit also in MacAddr

Browse Source
This commit is contained in:
Erik Frojdh 2020-01-16 16:57:04 +01:00
parent c1fac7cdb7
commit 6170c42618
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsSupportLib/include/network_utils.h
View File

@ -40,8 +40,8 @@ class MacAddr {
public: public:
constexpr MacAddr() noexcept = default; constexpr MacAddr() noexcept = default;
explicit constexpr MacAddr(uint64_t mac) noexcept : addr_{mac} {} explicit constexpr MacAddr(uint64_t mac) noexcept : addr_{mac} {}
MacAddr(std::string mac); explicit MacAddr(std::string mac);
MacAddr(const char *address); explicit MacAddr(const char *address);
std::string str() const; std::string str() const;
std::string hex() const; std::string hex() const;
constexpr bool operator==(const MacAddr &other) const noexcept { constexpr bool operator==(const MacAddr &other) const noexcept {

2
slsSupportLib/src/network_utils.cpp
View File

@ -136,7 +136,7 @@ MacAddr InterfaceNameToMac(const std::string& inf) {
if (-1==ioctl(sock, SIOCGIFHWADDR, &ifr)) { if (-1==ioctl(sock, SIOCGIFHWADDR, &ifr)) {
perror("ioctl(SIOCGIFHWADDR) "); perror("ioctl(SIOCGIFHWADDR) ");
return std::string("00:00:00:00:00:00"); return MacAddr{};
} }
for (int j=0, k=0; j<6; j++) { for (int j=0, k=0; j<6; j++) {
k+=snprintf(mac+k, mac_len-k-1, j ? ":%02X" : "%02X", k+=snprintf(mac+k, mac_len-k-1, j ? ":%02X" : "%02X",

8
slsSupportLib/tests/test-network_utils.cpp
View File

@ -22,8 +22,8 @@ TEST_CASE("Convert mac address using classes", "[support]") {
CHECK(mac0 == vec_addr[i]); CHECK(mac0 == vec_addr[i]);
CHECK(mac1 == vec_addr[i]); CHECK(mac1 == vec_addr[i]);
CHECK(mac0 == vec_ans[i]); CHECK(mac0.str() == vec_ans[i]);
CHECK(mac1 == vec_ans[i]); CHECK(mac1.str() == vec_ans[i]);
CHECK(mac0.str() == vec_ans[i]); CHECK(mac0.str() == vec_ans[i]);
CHECK(mac1.str() == vec_ans[i]); CHECK(mac1.str() == vec_ans[i]);
} }
@ -59,8 +59,8 @@ TEST_CASE("Convert IP using classes ", "[support]") {
CHECK(ip0 == ip1); CHECK(ip0 == ip1);
CHECK(ip0 == vec_addr[i]); CHECK(ip0 == vec_addr[i]);
CHECK(ip1 == vec_addr[i]); CHECK(ip1 == vec_addr[i]);
CHECK(ip0 == vec_ans[i]); CHECK(ip0.str() == vec_ans[i]);
CHECK(ip1 == vec_ans[i]); CHECK(ip1.str() == vec_ans[i]);
CHECK(ip0.str() == vec_ans[i]); CHECK(ip0.str() == vec_ans[i]);
CHECK(ip0.arr().data() == vec_ans[i]); CHECK(ip0.arr().data() == vec_ans[i]);
CHECK(ip1.str() == vec_ans[i]); CHECK(ip1.str() == vec_ans[i]);