Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/DebugConfiguration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ Syslog &Syslog::logMask(uint8_t priMask)

void Syslog::enable()
{
this->_client->begin(this->_port);
this->_enabled = true;
}

Expand Down Expand Up @@ -166,14 +165,21 @@ inline bool Syslog::_sendLog(uint16_t pri, const char *appName, const char *mess
if ((pri & LOG_FACMASK) == 0)
pri = LOG_MAKEPRI(LOG_FAC(this->_priDefault), pri);

// W5100S: acquire UDP socket on-demand to avoid permanent socket consumption
if (!this->_client->begin(this->_port)) {
return false;
}

if (this->_server != NULL) {
result = this->_client->beginPacket(this->_server, this->_port);
} else {
result = this->_client->beginPacket(this->_ip, this->_port);
}

if (result != 1)
if (result != 1) {
this->_client->stop();
return false;
}

this->_client->print('<');
this->_client->print(pri);
Expand All @@ -193,6 +199,8 @@ inline bool Syslog::_sendLog(uint16_t pri, const char *appName, const char *mess
this->_client->print(message);
this->_client->endPacket();
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

return value of endPacket() is ignored; true is returned unconditionally. On embedded Ethernet stacks, endPacket() is the point where TX failure is reported; this currently reports success even when the datagram send fails.


this->_client->stop(); // W5100S: release UDP socket for other services

return true;
}

Expand Down
2 changes: 1 addition & 1 deletion src/mesh/eth/ethClient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ static int32_t reconnectETH()

#ifndef DISABLE_NTP
LOG_INFO("Start NTP time client");
timeClient.begin();
timeClient.setUpdateInterval(60 * 60); // Update once an hour
#endif

Expand Down Expand Up @@ -159,6 +158,7 @@ static int32_t reconnectETH()
LOG_ERROR("NTP Update failed");
ntp_renew = millis() + 300 * 1000; // failure, retry every 5 minutes
}
timeClient.end(); // W5100S: release UDP socket for other services
}
#endif

Expand Down
Loading