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

UDP struct uses IpAddr and MacAddr

Browse Source
This commit is contained in:
Erik Frojdh
2021-09-07 15:16:03 +02:00
parent 9d744deb4a
commit ba52bfb65e
6 changed files with 55 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
slsSupportLib/include/sls/network_utils.h
View File

@ -30,7 +30,7 @@ class IpAddr {
return addr_ != other;
}
constexpr uint32_t uint32() const noexcept { return addr_; }
};
} __attribute__((packed));
class MacAddr {
private:
@ -57,62 +57,23 @@ class MacAddr {
return addr_ != other;
}
constexpr uint64_t uint64() const noexcept { return addr_; }
};
class UdpDestination {
private:
uint32_t entry_{};
uint32_t port_{};
uint32_t port2_{};
uint32_t ip_{};
uint32_t ip2_{};
uint64_t mac_{};
uint64_t mac2_{};
public:
constexpr UdpDestination() noexcept = default;
explicit constexpr UdpDestination(uint32_t entry, uint32_t port = 0,
IpAddr ip = {}, MacAddr mac = {},
uint32_t port2 = 0, IpAddr ip2 = {},
MacAddr mac2 = {})
: entry_(entry), port_(port), port2_(port2), ip_(ip.uint32()),
ip2_(ip2.uint32()), mac_(mac.uint64()), mac2_(mac2.uint64()) {}
uint32_t getEntry() const noexcept { return entry_; }
void setEntry(const uint32_t value) { entry_ = value; }
uint32_t getPort() const noexcept { return port_; }
void setPort(const uint32_t value) { port_ = value; }
uint32_t getPort2() const noexcept { return port2_; }
void setPort2(const uint32_t value) { port2_ = value; }
IpAddr getIp() const noexcept { return IpAddr(ip_); }
void setIp(const IpAddr value) { ip_ = value.uint32(); }
IpAddr getIp2() const noexcept { return IpAddr(ip2_); }
void setIp2(const IpAddr value) { ip2_ = value.uint32(); }
MacAddr getMac() const noexcept { return MacAddr(mac_); }
void setMac(const MacAddr value) { mac_ = value.uint64(); }
MacAddr getMac2() const noexcept { return MacAddr(mac2_); }
void setMac2(const MacAddr value) { mac2_ = value.uint64(); }
} __attribute__((packed));
struct UdpDestination {
uint32_t entry{};
uint32_t port{};
uint32_t port2{};
IpAddr ip;
IpAddr ip2;
MacAddr mac;
MacAddr mac2;
std::string str() const;
constexpr bool operator==(const UdpDestination &other) const {
return ((entry_ == other.entry_) && (port_ == other.port_) &&
(port2_ == other.port2_) && (ip_ == other.ip_) &&
(ip2_ == other.ip2_) && (mac_ == other.mac_) &&
(mac2_ == other.mac2_));
return ((entry == other.entry) && (port == other.port) &&
(port2 == other.port2) && (ip== other.ip) &&
(ip2 == other.ip2) && (mac == other.mac) &&
(mac2 == other.mac2));
}
} __attribute__((packed));