Formatting
This commit is contained in:
@@ -260,14 +260,14 @@ bool Device::executeHandshake(
|
||||
if (timeoutOccurred.load())
|
||||
{
|
||||
std::cerr << __func__ << ": Handshake timeout with " << deviceIP
|
||||
<< ":" << deviceEndpoint << std::endl;
|
||||
<< "(" << deviceEndpoint << ")" << std::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (receiveError)
|
||||
{
|
||||
std::cerr << __func__ << ": Handshake error with " << deviceIP
|
||||
<< ": " << receiveError.message() << ":" << deviceEndpoint
|
||||
<< ": " << receiveError.message() << "(" << deviceEndpoint << ")"
|
||||
<< std::endl;
|
||||
return false;
|
||||
}
|
||||
@@ -275,7 +275,7 @@ bool Device::executeHandshake(
|
||||
if (bytesReceived < sizeof(comms::HandshakeResponse))
|
||||
{
|
||||
std::cerr << __func__ << ": Handshake failed - response too small from "
|
||||
<< deviceIP << ":" << deviceEndpoint << std::endl;
|
||||
<< deviceIP << "(" << deviceEndpoint << ")" << std::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -291,7 +291,7 @@ bool Device::executeHandshake(
|
||||
if (!resp->validateCrc32())
|
||||
{
|
||||
std::cerr << __func__ << ": Handshake failed - CRC32 validation "
|
||||
"failed from " << deviceIP << ":" << deviceEndpoint
|
||||
"failed from " << deviceIP << "(" << deviceEndpoint << ")"
|
||||
<< std::endl;
|
||||
return false;
|
||||
}
|
||||
@@ -301,7 +301,7 @@ bool Device::executeHandshake(
|
||||
if (!resp->header.validateCrc16())
|
||||
{
|
||||
std::cerr << __func__ << ": Handshake failed - CRC16 validation "
|
||||
"failed from " << deviceIP << ":" << deviceEndpoint
|
||||
"failed from " << deviceIP << "(" << deviceEndpoint << ")"
|
||||
<< std::endl;
|
||||
return false;
|
||||
}
|
||||
@@ -310,13 +310,13 @@ bool Device::executeHandshake(
|
||||
if (!resp->sanityCheck() || resp->ret_code != 0x00)
|
||||
{
|
||||
std::cerr << __func__ << ": Handshake failed - invalid response from "
|
||||
<< deviceIP << ":" << deviceEndpoint
|
||||
<< deviceIP << "(" << deviceEndpoint << ")"
|
||||
<< std::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
std::cout << __func__ << ": Handshake successful with " << deviceIP
|
||||
<< ":" << deviceEndpoint << std::endl;
|
||||
<< "(" << deviceEndpoint << ")" << std::endl;
|
||||
return true;
|
||||
} catch (const std::exception& e) {
|
||||
std::cerr << __func__ << ": Handshake failed with " << deviceIP << ": "
|
||||
@@ -384,7 +384,8 @@ std::string Device::generateClientDeviceIpFromSerialNumber(
|
||||
*/
|
||||
// Parse smoIp to extract network prefix
|
||||
auto smoIpOctets = comms::parseIPv4Address(smoIp);
|
||||
if (!smoIpOctets.has_value()) {
|
||||
if (!smoIpOctets.has_value())
|
||||
{
|
||||
throw std::invalid_argument(
|
||||
std::string(__func__) + ": Invalid smoIp format: must be X.X.X.X");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user