Skip to content

Port socket helpers to QNX #22

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
dallison merged 1 commit into from
May 5, 2026
Merged

Port socket helpers to QNX #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module(
name = "cpp_toolbelt",
version = "2.1.1",
version = "2.1.2",
)

bazel_dep(name = "platforms", version = "1.0.0")
Expand Down
57 changes: 24 additions & 33 deletions toolbelt/sockets.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,28 +32,24 @@ InetAddress InetAddress::AnyAddress(int port) { return InetAddress(port); }

InetAddress::InetAddress(const in_addr &ip, int port) {
valid_ = true;
addr_ = {
addr_ = {};
#if defined(__APPLE__)
.sin_len = sizeof(struct sockaddr_in),
addr_.sin_len = sizeof(struct sockaddr_in);
#endif
.sin_family = AF_INET,
.sin_port = htons(port),
.sin_addr = {.s_addr = ip.s_addr},
.sin_zero = {0}
};
addr_.sin_family = AF_INET;
addr_.sin_port = htons(port);
addr_.sin_addr.s_addr = ip.s_addr;
}

InetAddress::InetAddress(int port) {
valid_ = true;
addr_ = {
addr_ = {};
#if defined(__APPLE__)
.sin_len = sizeof(struct sockaddr_in),
addr_.sin_len = sizeof(struct sockaddr_in);
#endif
.sin_family = AF_INET,
.sin_port = htons(port),
.sin_addr = {.s_addr = INADDR_ANY},
.sin_zero = {0}
};
addr_.sin_family = AF_INET;
addr_.sin_port = htons(port);
addr_.sin_addr.s_addr = INADDR_ANY;
}

InetAddress::InetAddress(const std::string &hostname, int port) {
Expand All @@ -71,15 +67,13 @@ InetAddress::InetAddress(const std::string &hostname, int port) {
}
}
valid_ = true;
addr_ = {
addr_ = {};
#if defined(__APPLE__)
.sin_len = sizeof(struct sockaddr_in),
addr_.sin_len = sizeof(struct sockaddr_in);
#endif
.sin_family = AF_INET,
.sin_port = htons(port),
.sin_addr = {.s_addr = ipaddr},
.sin_zero = {0}
};
addr_.sin_family = AF_INET;
addr_.sin_port = htons(port);
addr_.sin_addr.s_addr = ipaddr;
}

std::string InetAddress::ToString() const {
Expand Down Expand Up @@ -468,10 +462,7 @@ absl::Status UnixSocket::SendFds(const std::vector<FileDescriptor> &fds,
return absl::InternalError("Socket is not connected");
}
constexpr size_t kMaxFds = 252;
union {
char buf[CMSG_SPACE(kMaxFds * sizeof(int))];
struct cmsghdr align;
} u;
std::vector<char> control_buf(CMSG_SPACE(kMaxFds * sizeof(int)));

// We send the total number file descriptors. There is a limit to the
// number we can send in one message.
Expand All @@ -480,7 +471,7 @@ absl::Status UnixSocket::SendFds(const std::vector<FileDescriptor> &fds,

// We need to send at least one message, even if there are no fds to send.
do {
memset(u.buf, 0, sizeof(u.buf));
std::fill(control_buf.begin(), control_buf.end(), 0);

int32_t num_fds = static_cast<int32_t>(fds.size());
size_t fds_to_send = remaining_fds > kMaxFds ? kMaxFds : remaining_fds;
Expand All @@ -496,7 +487,7 @@ absl::Status UnixSocket::SendFds(const std::vector<FileDescriptor> &fds,
#endif
struct msghdr msg = {.msg_iov = &iov,
.msg_iovlen = 1,
.msg_control = u.buf,
.msg_control = control_buf.data(),
.msg_controllen =
static_cast<socklen_t>(CMSG_SPACE(fds_size))};
#if defined(__clang__)
Expand Down Expand Up @@ -536,13 +527,12 @@ absl::Status UnixSocket::ReceiveFds(std::vector<FileDescriptor> &fds,
return absl::InternalError("Socket is not connected");
}
constexpr size_t kMaxFds = 252;
union {
char buf[CMSG_SPACE(kMaxFds * sizeof(int))];
struct cmsghdr align;
} u;
std::vector<char> control_buf(CMSG_SPACE(kMaxFds * sizeof(int)));

int32_t num_fds_received = 0;
for (;;) {
std::fill(control_buf.begin(), control_buf.end(), 0);

// The total number of fds we need to see. This is
// sent in each message, but each message contains only portion
// of the total (there's a limit per message).
Expand All @@ -559,8 +549,9 @@ absl::Status UnixSocket::ReceiveFds(std::vector<FileDescriptor> &fds,
#endif
struct msghdr msg = {.msg_iov = &iov,
.msg_iovlen = 1,
.msg_control = u.buf,
.msg_controllen = sizeof(u.buf)};
.msg_control = control_buf.data(),
.msg_controllen =
static_cast<socklen_t>(control_buf.size())};
#if defined(__clang__)
#pragma clang diagnostic pop
#elif defined(__GNUC__)
Expand Down
Loading