hayodea/salmanoff
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Formatting

Browse Source
This commit is contained in:
Hayodea Hekol
2025-09-06 21:37:41 -04:00
parent 3b07a15e11
commit b0596d12f9
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commonLibs/livoxProto1/device.cpp
+9 -8
View File
@@ -260,14 +260,14 @@ bool Device::executeHandshake(
if (timeoutOccurred.load()) if (timeoutOccurred.load())
{ {
std::cerr << __func__ << ": Handshake timeout with " << deviceIP std::cerr << __func__ << ": Handshake timeout with " << deviceIP
<< ":" << deviceEndpoint << std::endl; << "(" << deviceEndpoint << ")" << std::endl;
return false; return false;
} }
if (receiveError) if (receiveError)
{ {
std::cerr << __func__ << ": Handshake error with " << deviceIP std::cerr << __func__ << ": Handshake error with " << deviceIP
<< ": " << receiveError.message() << ":" << deviceEndpoint << ": " << receiveError.message() << "(" << deviceEndpoint << ")"
<< std::endl; << std::endl;
return false; return false;
} }
@@ -275,7 +275,7 @@ bool Device::executeHandshake(
if (bytesReceived < sizeof(comms::HandshakeResponse)) if (bytesReceived < sizeof(comms::HandshakeResponse))
{ {
std::cerr << __func__ << ": Handshake failed - response too small from " std::cerr << __func__ << ": Handshake failed - response too small from "
<< deviceIP << ":" << deviceEndpoint << std::endl; << deviceIP << "(" << deviceEndpoint << ")" << std::endl;
return false; return false;
} }
@@ -291,7 +291,7 @@ bool Device::executeHandshake(
if (!resp->validateCrc32()) if (!resp->validateCrc32())
{ {
std::cerr << __func__ << ": Handshake failed - CRC32 validation " std::cerr << __func__ << ": Handshake failed - CRC32 validation "
"failed from " << deviceIP << ":" << deviceEndpoint "failed from " << deviceIP << "(" << deviceEndpoint << ")"
<< std::endl; << std::endl;
return false; return false;
} }
@@ -301,7 +301,7 @@ bool Device::executeHandshake(
if (!resp->header.validateCrc16()) if (!resp->header.validateCrc16())
{ {
std::cerr << __func__ << ": Handshake failed - CRC16 validation " std::cerr << __func__ << ": Handshake failed - CRC16 validation "
"failed from " << deviceIP << ":" << deviceEndpoint "failed from " << deviceIP << "(" << deviceEndpoint << ")"
<< std::endl; << std::endl;
return false; return false;
} }
@@ -310,13 +310,13 @@ bool Device::executeHandshake(
if (!resp->sanityCheck() || resp->ret_code != 0x00) if (!resp->sanityCheck() || resp->ret_code != 0x00)
{ {
std::cerr << __func__ << ": Handshake failed - invalid response from " std::cerr << __func__ << ": Handshake failed - invalid response from "
<< deviceIP << ":" << deviceEndpoint << deviceIP << "(" << deviceEndpoint << ")"
<< std::endl; << std::endl;
return false; return false;
} }
std::cout << __func__ << ": Handshake successful with " << deviceIP std::cout << __func__ << ": Handshake successful with " << deviceIP
<< ":" << deviceEndpoint << std::endl; << "(" << deviceEndpoint << ")" << std::endl;
return true; return true;
} catch (const std::exception& e) { } catch (const std::exception& e) {
std::cerr << __func__ << ": Handshake failed with " << deviceIP << ": " std::cerr << __func__ << ": Handshake failed with " << deviceIP << ": "
@@ -384,7 +384,8 @@ std::string Device::generateClientDeviceIpFromSerialNumber(
*/ */
// Parse smoIp to extract network prefix // Parse smoIp to extract network prefix
auto smoIpOctets = comms::parseIPv4Address(smoIp); auto smoIpOctets = comms::parseIPv4Address(smoIp);
if (!smoIpOctets.has_value()) { if (!smoIpOctets.has_value())
{
throw std::invalid_argument( throw std::invalid_argument(
std::string(__func__) + ": Invalid smoIp format: must be X.X.X.X"); std::string(__func__) + ": Invalid smoIp format: must be X.X.X.X");
} }