Skip to content

NetworkClient - close the connection in stop() method #9542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 10, 2024
Merged

NetworkClient - close the connection in stop() method #9542

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a9e719
fix: NetworkClient - close the connection in stop() method
JAndrassy Apr 17, 2024
3caf16e
Merge branch 'master' into networkclient_fix_stop
me-no-dev May 10, 2024
efa7630
ci(pre-commit): Apply automatic fixes
pre-commit-ci-lite[bot] May 10, 2024
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
23 changes: 17 additions & 6 deletions libraries/Network/src/NetworkClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,14 @@ class NetworkClientSocketHandle {
NetworkClientSocketHandle(int fd) : sockfd(fd) {}

~NetworkClientSocketHandle() {
close(sockfd);
close();
}

void close() {
if (sockfd >= 0) {
::close(sockfd);
sockfd = -1;
}
}

int fd() {
Expand All @@ -177,11 +184,12 @@ NetworkClient::NetworkClient(int fd) : _connected(true), _timeout(WIFI_CLIENT_DE
_rxBuffer.reset(new NetworkClientRxBuffer(fd));
}

NetworkClient::~NetworkClient() {
stop();
}
NetworkClient::~NetworkClient() {}

void NetworkClient::stop() {
if (clientSocketHandle) {
clientSocketHandle->close();
}
clientSocketHandle = NULL;
_rxBuffer = NULL;
_connected = false;
Expand Down Expand Up @@ -473,7 +481,7 @@ int NetworkClient::read(uint8_t *buf, size_t size) {

int NetworkClient::peek() {
int res = -1;
if (_rxBuffer) {
if (fd() >= 0 && _rxBuffer) {
res = _rxBuffer->peek();
if (_rxBuffer->failed()) {
log_e("fail on fd %d, errno: %d, \"%s\"", fd(), errno, strerror(errno));
Expand All @@ -484,7 +492,7 @@ int NetworkClient::peek() {
}

int NetworkClient::available() {
if (!_rxBuffer) {
if (fd() < 0 || !_rxBuffer) {
return 0;
}
int res = _rxBuffer->available();
Expand All @@ -502,6 +510,9 @@ void NetworkClient::clear() {
}

uint8_t NetworkClient::connected() {
if (fd() == -1 && _connected) {
stop();
}
if (_connected) {
uint8_t dummy;
int res = recv(fd(), &dummy, 0, MSG_DONTWAIT);
Expand Down