Skip to content

fix pass sockaddr* #112

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
BartolomeyKant merged 1 commit into from
Mar 26, 2025
+7 −7
Merged

fix pass sockaddr* #112

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
14 changes: 7 additions & 7 deletions aether/transport/low_level/tcp/unix_tcp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ inline bool SetNonblocking(int sock) {
}

struct SockAddr {
sockaddr* addr() { return reinterpret_cast<sockaddr*>(&data); }

union {
# if AE_SUPPORT_IPV4 == 1
struct sockaddr_in ipv4;
Expand All @@ -87,7 +89,7 @@ struct SockAddr {
struct sockaddr_in6 ipv6;
# endif
} data;
sockaddr* addr;

std::size_t size;
};

Expand All @@ -96,18 +98,17 @@ inline SockAddr GetSockAddr(IpAddressPort const& ip_address_port) {
case IpAddress::Version::kIpV4:
# if AE_SUPPORT_IPV4 == 1
{
SockAddr sock_addr;
sock_addr.addr = reinterpret_cast<sockaddr*>(&sock_addr.data.ipv4);
SockAddr sock_addr{};
sock_addr.size = sizeof(sock_addr.data.ipv4);
auto& addr = sock_addr.data.ipv4;

# ifndef __unix__
addr.sin_len = sizeof(sockaddr_in);
# endif // __unix__
addr.sin_family = AF_INET;
std::memcpy(&addr.sin_addr.s_addr, ip_address_port.ip.value.ipv4_value,
4);
addr.sin_port = ae::SwapToInet(ip_address_port.port);
addr.sin_family = AF_INET;

return sock_addr;
}
Expand All @@ -120,15 +121,14 @@ inline SockAddr GetSockAddr(IpAddressPort const& ip_address_port) {
case IpAddress::Version::kIpV6: {
# if AE_SUPPORT_IPV6 == 1
SockAddr sock_addr;
sock_addr.addr = reinterpret_cast<sockaddr*>(&sock_addr.data.ipv6);
sock_addr.size = sizeof(sock_addr.data.ipv6);
auto& addr = sock_addr.data.ipv6;
# ifndef __unix__
addr.sin6_len = sizeof(sockaddr_in6);
# endif // __unix__
addr.sin6_family = AF_INET;
std::memcpy(&addr.sin6_addr, ip_address_port.ip.value.ipv6_value, 16);
addr.sin6_port = ae::SwapToInet(ip_address_port.port);
addr.sin6_family = AF_INET6;

return sock_addr;
}
Expand Down Expand Up @@ -207,7 +207,7 @@ void UnixTcpTransport::ConnectionAction::Connect() {
}

auto addr = unix_tcp_internal::GetSockAddr(transport_->endpoint_);
auto res = connect(socket_, addr.addr, static_cast<socklen_t>(addr.size));
auto res = connect(socket_, addr.addr(), static_cast<socklen_t>(addr.size));
if (res == -1) {
if ((errno == EAGAIN) || (errno == EINPROGRESS)) {
AE_TELED_DEBUG("Wait connection");
Expand Down
Loading