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

fixed MacAddr 0 output

Browse Source
This commit is contained in:
Erik Frojdh 2019-05-17 09:08:13 +02:00
parent fff79fbbb6
commit 591ff53b84
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
slsSupportLib/src/network_utils.cpp
View File

@ -20,9 +20,7 @@ IpAddr::IpAddr(const std::string &address) {
inet_pton(AF_INET, address.c_str(), &addr_); inet_pton(AF_INET, address.c_str(), &addr_);
} }
IpAddr::IpAddr(const char *address) { IpAddr::IpAddr(const char *address) { inet_pton(AF_INET, address, &addr_); }
inet_pton(AF_INET, address, &addr_);
}
std::string IpAddr::str() const { std::string IpAddr::str() const {
char ipstring[INET_ADDRSTRLEN]{}; char ipstring[INET_ADDRSTRLEN]{};
@ -31,9 +29,9 @@ std::string IpAddr::str() const {
} }
std::string IpAddr::hex() const { std::string IpAddr::hex() const {
std::ostringstream ss; std::ostringstream ss;
ss << std::hex << std::setfill('0');
for (int i = 0; i != 4; ++i) { for (int i = 0; i != 4; ++i) {
ss << std::hex << std::setfill('0') << std::setw(2) ss << std::setw(2) << ((addr_ >> i * 8) & 0xFF);
<< ((addr_ >> i * 8) & 0xFF);
} }
return ss.str(); return ss.str();
} }
@ -56,18 +54,14 @@ std::string MacAddr::to_hex(const char delimiter) const {
for (int i = 32; i >= 0; i -= 8) { for (int i = 32; i >= 0; i -= 8) {
if (delimiter) if (delimiter)
ss << delimiter; ss << delimiter;
ss << ((addr_ >> i) & 0xFF); ss << std::setw(2) << ((addr_ >> i) & 0xFF);
} }
return ss.str(); return ss.str();
} }
std::string MacAddr::str() const { std::string MacAddr::str() const { return to_hex(':'); }
return to_hex(':');
}
std::string MacAddr::hex() const { std::string MacAddr::hex() const { return to_hex(); }
return to_hex();
}
std::ostream &operator<<(std::ostream &out, const IpAddr &addr) { std::ostream &operator<<(std::ostream &out, const IpAddr &addr) {
return out << addr.str(); return out << addr.str();

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

@ -11,9 +11,9 @@ using namespace sls;
TEST_CASE("Convert mac address using classes", "[support]") { TEST_CASE("Convert mac address using classes", "[support]") {
std::vector<uint64_t> vec_addr{346856806822, 346856806852, 262027939863028}; std::vector<uint64_t> vec_addr{346856806822, 346856806852, 262027939863028,0, 281474976710655};
std::vector<std::string> vec_ans{"00:50:c2:46:d9:a6", "00:50:c2:46:d9:c4", std::vector<std::string> vec_ans{"00:50:c2:46:d9:a6", "00:50:c2:46:d9:c4",
"ee:50:22:46:d9:f4"}; "ee:50:22:46:d9:f4", "00:00:00:00:00:00", "ff:ff:ff:ff:ff:ff"};
for (size_t i = 0; i != vec_addr.size(); ++i) { for (size_t i = 0; i != vec_addr.size(); ++i) {
auto mac0 = MacAddr(vec_addr[i]); auto mac0 = MacAddr(vec_addr[i]);
auto mac1 = MacAddr(vec_ans[i]); auto mac1 = MacAddr(vec_ans[i]);