Skip to content

SocketWrapper: Refactoring Socket management #227

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

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

SocketWrapper: Refactoring Socket management #227

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c11b69f
Ethernet lib: add AdvancedChatServer example
leonardocavagnis Nov 13, 2025
396c158
Zephyr client lib: fix connected() function
leonardocavagnis Nov 13, 2025
316fa77
SocketWrapper: use pointer for sock_fd
leonardocavagnis Nov 13, 2025
7244771
SocketWrapper: use shared_ptr for sock_fd to prevent unwanted closure
leonardocavagnis Nov 13, 2025
2a941c7
clang: fix cosmetics
leonardocavagnis Nov 13, 2025
b4e67d6
SocketWrapper: removing close() because directly managed by shared_ptr
leonardocavagnis Nov 14, 2025
c80ccfa
SocketWrapper: fix sock_fd check condition
leonardocavagnis Nov 14, 2025
472ebb4
SocketWrapper: use static instead lambda for sock deleter
leonardocavagnis Nov 14, 2025
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
45 changes: 28 additions & 17 deletions libraries/SocketWrapper/SocketWrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,36 +7,40 @@
#endif

#include <zephyr/net/socket.h>
#include <memory>
#include <cstring>

class ZephyrSocketWrapper {
protected:
int* sock_fd = nullptr;
std::shared_ptr<int> sock_fd;
bool is_ssl = false;
int ssl_sock_temp_char = -1;

public:
ZephyrSocketWrapper() {
sock_fd = new int(-1);
// custom deleter for shared_ptr to close automatically the socket
static auto socket_deleter() {
return [](int *fd) {
if (fd && *fd != -1) {
::close(*fd);
delete fd;
}
};
}

ZephyrSocketWrapper(int fd) {
sock_fd = new int(fd);
}
public:
ZephyrSocketWrapper() = default;

~ZephyrSocketWrapper() {
if (sock_fd && *sock_fd != -1) {
::close(*sock_fd);
}
delete sock_fd;
sock_fd = nullptr;
ZephyrSocketWrapper(int fd) : sock_fd(std::shared_ptr<int>(fd<0 ? nullptr : new int(fd), socket_deleter())) {
}

~ZephyrSocketWrapper() = default; // socket close managed by shared_ptr

bool connect(const char *host, uint16_t port) {

// Resolve address
struct addrinfo hints = {0};
struct addrinfo *res = nullptr;
bool rv = true;
int raw_sock_fd;

hints.ai_family = AF_INET;
hints.ai_socktype = SOCK_STREAM;
Expand All @@ -59,7 +63,8 @@ class ZephyrSocketWrapper {
goto exit;
}

*sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
raw_sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
sock_fd = std::shared_ptr<int>(raw_sock_fd < 0 ? nullptr : new int(raw_sock_fd), socket_deleter());
if (!sock_fd || *sock_fd < 0) {
rv = false;

Expand All @@ -85,13 +90,15 @@ class ZephyrSocketWrapper {
bool connect(IPAddress host, uint16_t port) {

const char *_host = host.toString().c_str();
int raw_sock_fd;

struct sockaddr_in addr;
addr.sin_family = AF_INET;
addr.sin_port = htons(port);
inet_pton(AF_INET, _host, &addr.sin_addr);

*sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
raw_sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
sock_fd = std::shared_ptr<int>(raw_sock_fd < 0 ? nullptr : new int(raw_sock_fd), socket_deleter());
if (!sock_fd || *sock_fd < 0) {
return false;
}
Expand All @@ -118,6 +125,7 @@ class ZephyrSocketWrapper {
int resolve_attempts = 100;
int ret;
bool rv = false;
int raw_sock_fd;

sec_tag_t sec_tag_opt[] = {
CA_CERTIFICATE_TAG,
Expand Down Expand Up @@ -150,7 +158,8 @@ class ZephyrSocketWrapper {
}
}

*sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TLS_1_2);
raw_sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TLS_1_2);
sock_fd = std::shared_ptr<int>(raw_sock_fd < 0 ? nullptr : new int(raw_sock_fd), socket_deleter());
if (!sock_fd || *sock_fd < 0) {
goto exit;
}
Expand Down Expand Up @@ -238,11 +247,13 @@ class ZephyrSocketWrapper {

bool bind(uint16_t port) {
struct sockaddr_in addr;
int raw_sock_fd;
addr.sin_family = AF_INET;
addr.sin_port = htons(port);
addr.sin_addr.s_addr = INADDR_ANY;

*sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
raw_sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
sock_fd = std::shared_ptr<int>(raw_sock_fd < 0 ? nullptr : new int(raw_sock_fd), socket_deleter());
if (!sock_fd || *sock_fd < 0) {
return false;
}
Expand Down
6 changes: 1 addition & 5 deletions libraries/SocketWrapper/ZephyrClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@ class ZephyrClient : public arduino::Client, ZephyrSocketWrapper {

protected:
void setSocket(int sock) {
if (sock_fd) {
*sock_fd = sock;
} else {
sock_fd = new int(sock);
}
sock_fd = std::shared_ptr<int>(sock < 0 ? nullptr : new int(sock), socket_deleter());
_connected = true;
}

Expand Down