Skip to content

Swap to using getnameinfo for address names #177

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
TrentHouliston merged 3 commits into from
Mar 6, 2025
Merged

Swap to using getnameinfo for address names #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd14422
Swap to using getnameinfo for address names
TrentHouliston Feb 20, 2025
9b174ca
clang-tidy
TrentHouliston Feb 20, 2025
d2e074c
silly windows
TrentHouliston Feb 20, 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
16 changes: 3 additions & 13 deletions src/dsl/word/TCP.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,10 @@ namespace dsl {

struct Connection {

struct Target {
/// The address of the connection
std::string address;
/// The port of the connection
uint16_t port;
};

/// The local address of the connection
Target local;
util::network::sock_t local;
/// The remote address of the connection
Target remote;
util::network::sock_t remote;

/// The file descriptor for the connection
fd_t fd;
Expand Down Expand Up @@ -187,10 +180,7 @@ namespace dsl {
return Connection{};
}

auto local_s = local.address();
auto remote_s = remote.address();

return Connection{{local_s.first, local_s.second}, {remote_s.first, remote_s.second}, fd.release()};
return Connection{local, remote, fd.release()};
}
};

Expand Down
44 changes: 14 additions & 30 deletions src/dsl/word/UDP.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,20 +102,10 @@ namespace dsl {
/// If the packet is valid (it contains data)
bool valid{false};

struct Target {
Target() = default;
Target(std::string address, const uint16_t& port) : address(std::move(address)), port(port) {}

/// The address of the target
std::string address;
/// The port of the target
uint16_t port{0};
};

/// The information about this packets destination
Target local;
util::network::sock_t local{};
/// The information about this packets source
Target remote;
util::network::sock_t remote{};

/// The data to be sent in the packet
std::vector<uint8_t> payload;
Expand Down Expand Up @@ -427,12 +417,10 @@ namespace dsl {
RecvResult result = read<DSL>(task);

Packet p{};
p.valid = result.valid;
p.payload = std::move(result.payload);
auto local_s = result.local.address();
auto remote_s = result.remote.address();
p.local = Packet::Target{local_s.first, local_s.second};
p.remote = Packet::Target{remote_s.first, remote_s.second};
p.valid = result.valid;
p.payload = std::move(result.payload);
p.local = result.local;
p.remote = result.remote;

// Confirm that this packet was sent to one of our local addresses
for (const auto& iface : util::network::get_interfaces()) {
Expand Down Expand Up @@ -475,12 +463,10 @@ namespace dsl {
if (result.local.sock.sa_family == AF_INET) {

Packet p{};
p.valid = result.valid;
p.payload = std::move(result.payload);
auto local_s = result.local.address();
auto remote_s = result.remote.address();
p.local = Packet::Target{local_s.first, local_s.second};
p.remote = Packet::Target{remote_s.first, remote_s.second};
p.valid = result.valid;
p.payload = std::move(result.payload);
p.local = result.local;
p.remote = result.remote;

// 255.255.255.255 is always a valid broadcast address
if (result.local.ipv4.sin_addr.s_addr == htonl(INADDR_BROADCAST)) {
Expand Down Expand Up @@ -526,12 +512,10 @@ namespace dsl {
// Only return multicast packets
if (multicast) {
Packet p{};
p.valid = result.valid;
p.payload = std::move(result.payload);
auto local_s = result.local.address();
auto remote_s = result.remote.address();
p.local = Packet::Target{local_s.first, local_s.second};
p.remote = Packet::Target{remote_s.first, remote_s.second};
p.valid = result.valid;
p.payload = std::move(result.payload);
p.local = result.local;
p.remote = result.remote;
return p;
}

Expand Down
30 changes: 18 additions & 12 deletions src/util/network/sock_t.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
#define NUCLEAR_UTIL_NETWORK_SOCK_T_HPP

#include <array>
#include <cstring>
#include <stdexcept>
#include <system_error>

#include "../platform.hpp"

Expand All @@ -50,19 +52,23 @@ namespace util {
}
}

std::pair<std::string, in_port_t> address() const {
std::array<char, std::max(INET_ADDRSTRLEN, INET6_ADDRSTRLEN)> c = {0};
switch (sock.sa_family) {
case AF_INET:
return std::make_pair(::inet_ntop(sock.sa_family, &ipv4.sin_addr, c.data(), c.size()),
ntohs(ipv4.sin_port));
case AF_INET6:
return std::make_pair(::inet_ntop(sock.sa_family, &ipv6.sin6_addr, c.data(), c.size()),
ntohs(ipv6.sin6_port));
default:
throw std::runtime_error("Cannot get address for socket address family "
+ std::to_string(sock.sa_family));
std::pair<std::string, in_port_t> address(bool numeric_host = false) const {
std::array<char, NI_MAXHOST> host{};
std::array<char, NI_MAXSERV> service{};
const int result = ::getnameinfo(reinterpret_cast<const sockaddr*>(&storage),
size(),
host.data(),
static_cast<socklen_t>(host.size()),
service.data(),
static_cast<socklen_t>(service.size()),
NI_NUMERICSERV | (numeric_host ? NI_NUMERICHOST : 0));
if (result != 0) {
throw std::system_error(
network_errno,
std::system_category(),
"Cannot get address for socket address family " + std::to_string(sock.sa_family));
}
return std::make_pair(std::string(host.data()), static_cast<in_port_t>(std::stoi(service.data())));
}
};

Expand Down
5 changes: 3 additions & 2 deletions tests/tests/dsl/UDP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,9 @@ class TestReactor : public test_util::TestBase<TestReactor> {
void handle_data(const std::string& name, const UDP::Packet& packet) {
const std::string data(packet.payload.begin(), packet.payload.end());

// Convert IP address to string in dotted decimal format
const std::string local = packet.local.address + ":" + std::to_string(packet.local.port);
// Convert IP address to a numeric string
auto s = packet.local.address(true);
const std::string local = s.first + ":" + std::to_string(s.second);

events.push_back(name + " <- " + data + " (" + local + ")");

Expand Down
Loading