detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 08:39:21 +01:00
Code Issues Actions Packages Releases Activity

merge

Browse Source
This commit is contained in:
Erik Frojdh
2019-05-16 15:18:14 +02:00
parent 415567006f 1943e77b24
commit a11fc31c49
9 changed files with 85 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsSupportLib/include/versionAPI.h
View File

@@ -6,5 +6,5 @@
#define APILIB 0x190405
#define APIRECEIVER 0x190405
#define APIGUI 0x190405
#define APIEIGER 0x190514
#define APICTB 0x190514
#define APIEIGER 0x190516

4
slsSupportLib/src/network_utils.cpp
View File

@@ -35,9 +35,9 @@ std::string IpAddr::str() const {
}
std::string IpAddr::hex() const {
std::ostringstream ss;
ss << std::hex << std::setfill('0') << std::setw(2);
for (int i = 0; i != 4; ++i) {
ss << ((addr_ >> i * 8) & 0xFF);
ss << std::hex << std::setfill('0') << std::setw(2)
<< ((addr_ >> i * 8) & 0xFF);
}
return ss.str();
}

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

@@ -42,9 +42,12 @@ TEST_CASE("Hex representation of MAC", "[support]") {
}
TEST_CASE("Convert IP using classes ", "[support]") {
std::vector<uint32_t> vec_addr{4073554305, 2747957633, 2697625985, 16779786};
std::vector<uint32_t> vec_addr{4073554305, 2747957633, 2697625985, 2566979594, 0};
std::vector<std::string> vec_ans{"129.129.205.242", "129.129.202.163",
"129.129.202.160", "10.10.0.1"};
"129.129.202.160", "10.0.1.153", "0.0.0.0"};
std::vector<std::string> vec_hex{"8181cdf2", "8181caa3",
"8181caa0", "0a000199","00000000"};
for (size_t i = 0; i != vec_addr.size(); ++i) {
auto ip0 = IpAddr(vec_addr[i]);
@@ -57,6 +60,8 @@ TEST_CASE("Convert IP using classes ", "[support]") {
CHECK(ip1 == vec_ans[i]);
CHECK(ip0.str() == vec_ans[i]);
CHECK(ip1.str() == vec_ans[i]);
CHECK(ip0.hex() == vec_hex[i]);
CHECK(ip1.hex() == vec_hex[i]);
}
}
@@ -96,4 +101,4 @@ TEST_CASE("MAC Output operator gives same result as string", "[support]") {
CHECK(os.str() == addr.str());
}
//TODO!(Erik) Look up a real hostname and verify the IP
//TODO!(Erik) Look up a real hostname and verify the IP