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

class for Ip and Mac

Browse Source
This commit is contained in:
Erik Frojdh
2019-04-02 15:24:25 +02:00
parent df2d67d90d
commit b198b50377
10 changed files with 204 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slsSupportLib/src/network_utils.cpp
View File

@@ -17,6 +17,7 @@ namespace sls {
IpAddr::IpAddr(uint32_t address) : addr_{address} {}
IpAddr::IpAddr(const std::string &address) { inet_pton(AF_INET, address.c_str(), &addr_); }
IpAddr::IpAddr(const char *address) { inet_pton(AF_INET, address, &addr_); }
std::string IpAddr::str() const {
char ipstring[INET_ADDRSTRLEN]{};
inet_ntop(AF_INET, &addr_, ipstring, INET_ADDRSTRLEN);
@@ -31,6 +32,7 @@ std::string IpAddr::hex() const {
return ss.str();
}
MacAddr::MacAddr(uint64_t mac) : addr_{mac} {}
MacAddr::MacAddr(std::string mac) {
if ((mac.length() != 17) || (mac[2] != ':') || (mac[5] != ':') || (mac[8] != ':') ||
(mac[11] != ':') || (mac[14] != ':')) {
@@ -39,8 +41,9 @@ MacAddr::MacAddr(std::string mac) {
mac.erase(std::remove(mac.begin(), mac.end(), ':'), mac.end());
addr_ = std::stol(mac, nullptr, 16);
}
MacAddr::MacAddr(const char *address) : MacAddr(std::string(address)) {}
std::string MacAddr::to_hex(const char delimiter) {
std::string MacAddr::to_hex(const char delimiter) const{
std::ostringstream ss;
ss << std::hex << std::setfill('0') << std::setw(2);
ss << ((addr_ >> 40) & 0xFF);
@@ -52,6 +55,14 @@ std::string MacAddr::to_hex(const char delimiter) {
return ss.str();
}
std::ostream &operator<<(std::ostream &out, const IpAddr &addr){
return out << addr.str();
}
std::ostream &operator<<(std::ostream &out, const MacAddr &addr){
return out << addr.str();
}
std::string MacAddrToString(uint64_t mac) {
std::ostringstream ss;
ss << std::hex << std::setfill('0') << std::setw(2);

17
slsSupportLib/src/string_utils.cpp
View File

@@ -1,6 +1,7 @@
#include "string_utils.h"
#include "container_utils.h"
#include "network_utils.h"
#include <sstream>
#include <iomanip>
#include <algorithm>
@@ -38,6 +39,22 @@ std::string concatenateIfDifferent(const std::vector<std::string>& container)
return result;
}
}
template<typename T>
std::string concatenateIfDifferent(const std::vector<T>& container)
{
if (allEqual(container)) {
return container.front().str();
} else {
std::string result;
for (const auto& s : container)
result += s.str() + '+';
return result;
}
}
template std::string concatenateIfDifferent(const std::vector<IpAddr>&);
template std::string concatenateIfDifferent(const std::vector<MacAddr>&);
std::string stringIpToHex(const std::string& ip)
{