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

replace udpDestination struct with a class that accepts ipaddr

Browse Source
This commit is contained in:
maliakal_d
2021-09-07 12:21:25 +02:00
parent 905b40c76c
commit 82c5bf15a6
11 changed files with 123 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
slsDetectorSoftware/src/CmdProxy.cpp
View File

@@ -1379,15 +1379,8 @@ IpAddr CmdProxy::getIpFromAuto() {
return val;
}
defs::udpDestination CmdProxy::getUdpList() {
uint32_t entry{};
uint32_t port{};
uint32_t port2{};
uint32_t ip{};
uint32_t ip2{};
uint64_t mac{};
uint64_t mac2{};
UdpDestination CmdProxy::getUdpEntry() {
UdpDestination udpDestination{};
bool hasEntry = false;
for (auto it : args) {
@@ -1395,40 +1388,40 @@ defs::udpDestination CmdProxy::getUdpList() {
std::string key = it.substr(0, pos);
std::string value = it.substr(pos + 1);
if (key == "entry") {
entry = StringTo<int>(value);
udpDestination.setEntry(StringTo<int>(value));
hasEntry = true;
} else if (key == "ip") {
if (value == "auto") {
auto val = getIpFromAuto();
LOG(logINFO) << "Setting udp_dstip of detector " << det_id
<< " to " << val;
ip = val.uint32();
udpDestination.setIp(val);
} else {
ip = IpAddr(value).uint32();
udpDestination.setIp(IpAddr(value));
}
} else if (key == "ip2") {
if (value == "auto") {
auto val = getIpFromAuto();
LOG(logINFO) << "Setting udp_dstip2 of detector " << det_id
<< " to " << val;
ip2 = val.uint32();
udpDestination.setIp2(val);
} else {
ip2 = IpAddr(value).uint32();
udpDestination.setIp2(IpAddr(value));
}
} else if (key == "mac") {
mac = MacAddr(value).uint64();
udpDestination.setMac(MacAddr(value));
} else if (key == "mac2") {
mac2 = MacAddr(value).uint64();
udpDestination.setMac2(MacAddr(value));
} else if (key == "port") {
port = StringTo<uint32_t>(value);
udpDestination.setPort(StringTo<uint32_t>(value));
} else if (key == "port2") {
port2 = StringTo<uint32_t>(value);
udpDestination.setPort2(StringTo<uint32_t>(value));
}
}
if (!hasEntry) {
throw sls::RuntimeError("Found no entry argument.");
}
return defs::udpDestination(entry, port, ip, mac, port2, ip2, mac2);
return udpDestination;
}
std::string CmdProxy::UDPDestinationList(int action) {
@@ -1454,7 +1447,7 @@ std::string CmdProxy::UDPDestinationList(int action) {
if (args.empty()) {
WrongNumberOfParameters(1);
}
auto t = getUdpList();
auto t = getUdpEntry();
det->setDestinationUDPList(t, det_id);
os << ToString(args) << std::endl;
} else {