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

bug fix for mac addr format check

Browse Source
This commit is contained in:
maliakal_d 2018-11-02 14:13:59 +01:00
parent d55c39ef08
commit 742d4e6cb7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -2872,8 +2872,8 @@ std::string slsDetector::setDetectorMAC(std::string detectorMAC) {
// invalid format // invalid format
if ((detectorMAC.length() != 17) || if ((detectorMAC.length() != 17) ||
(detectorMAC[2] == ':') || (detectorMAC[5] == ':') || (detectorMAC[8] == ':') || (detectorMAC[2] != ':') || (detectorMAC[5] != ':') || (detectorMAC[8] != ':') ||
(detectorMAC[11] == ':') ||(detectorMAC[14] == ':')) { (detectorMAC[11] != ':') ||(detectorMAC[14] != ':')) {
setErrorMask((getErrorMask())|(COULDNOT_SET_NETWORK_PARAMETER)); setErrorMask((getErrorMask())|(COULDNOT_SET_NETWORK_PARAMETER));
FILE_LOG(logERROR) << "server MAC Address should be in xx:xx:xx:xx:xx:xx format"; FILE_LOG(logERROR) << "server MAC Address should be in xx:xx:xx:xx:xx:xx format";
} }
@ -3042,8 +3042,8 @@ std::string slsDetector::setReceiverUDPIP(std::string udpip) {
std::string slsDetector::setReceiverUDPMAC(std::string udpmac) { std::string slsDetector::setReceiverUDPMAC(std::string udpmac) {
// invalid format // invalid format
if ((udpmac.length() != 17) || if ((udpmac.length() != 17) ||
(udpmac[2] == ':') || (udpmac[5] == ':') || (udpmac[8] == ':') || (udpmac[2] != ':') || (udpmac[5] != ':') || (udpmac[8] != ':') ||
(udpmac[11] == ':') ||(udpmac[14] == ':')) { (udpmac[11] != ':') ||(udpmac[14] != ':')) {
setErrorMask((getErrorMask())|(COULDNOT_SET_NETWORK_PARAMETER)); setErrorMask((getErrorMask())|(COULDNOT_SET_NETWORK_PARAMETER));
FILE_LOG(logERROR) << "receiver udp MAC Address should be in xx:xx:xx:xx:xx:xx format"; FILE_LOG(logERROR) << "receiver udp MAC Address should be in xx:xx:xx:xx:xx:xx format";
} }