marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert addresses from puncher to IPv4 

Addresses from the puncher would show as [::ffff:1.2.3.4] and be a bit
confusing.
ipv6
Lukas Werling 2017-01-07 17:18:06 +01:00
parent f4bfd8c080
commit 725e99bb9c
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/network/C4NetIO.cpp
View File

@ -290,11 +290,27 @@ C4NetIO::HostAddress C4NetIO::HostAddress::AsIPv6() const
return nrv;
}
C4NetIO::HostAddress C4NetIO::HostAddress::AsIPv4() const
{
HostAddress nrv(*this);
if (gen.sa_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&v6.sin6_addr))
{
nrv.v4.sin_family = AF_INET;
memcpy((char*) &nrv.v4.sin_addr, (char*) &v6.sin6_addr.s6_addr[12], sizeof(v4.sin_addr));
}
return nrv;
}
C4NetIO::EndpointAddress C4NetIO::EndpointAddress::AsIPv6() const
{
return EndpointAddress(HostAddress::AsIPv6(), GetPort());
}
C4NetIO::EndpointAddress C4NetIO::EndpointAddress::AsIPv4() const
{
return EndpointAddress(HostAddress::AsIPv4(), GetPort());
}
void C4NetIO::HostAddress::SetHost(const sockaddr *addr)
{
// Copy all but port number

2
src/network/C4NetIO.h
View File

@ -106,6 +106,7 @@ public:
void SetHost(uint32_t host);
C4NetIO::HostAddress AsIPv6() const; // convert an IPv4 address to an IPv6-mapped IPv4 address
C4NetIO::HostAddress AsIPv4() const; // try to convert an IPv6-mapped IPv4 address to an IPv4 address (returns unchanged address if not possible)
// General categories
bool IsNull() const;
@ -151,6 +152,7 @@ public:
HostAddress GetHost() const { return *this; } // HostAddress copy ctor slices off port information
EndpointAddress AsIPv6() const; // convert an IPv4 address to an IPv6-mapped IPv4 address
EndpointAddress AsIPv4() const; // try to convert an IPv6-mapped IPv4 address to an IPv4 address (returns unchanged address if not possible)
void SetPort(uint16_t port);
uint16_t GetPort() const;

9
src/network/C4Network2IO.cpp
View File

@ -1268,14 +1268,13 @@ void C4Network2IO::SendConnPackets()
void C4Network2IO::OnPuncherConnect(C4NetIO::addr_t addr)
{
// Sanity check
if (addr.GetFamily() != C4NetIO::HostAddress::IPv4)
return;
Application.InteractiveThread.ThreadLogS("Adding address from puncher: %s", addr.ToString().getData());
// NAT punching is only relevant for IPv4, so convert here to show a proper address.
auto maybe_v4 = addr.AsIPv4();
Application.InteractiveThread.ThreadLogS("Adding address from puncher: %s", maybe_v4.ToString().getData());
// Add for local client
C4Network2Client *pLocal = ::Network.Clients.GetLocal();
if (pLocal)
pLocal->AddAddr(C4Network2Address(addr, P_UDP), true);
pLocal->AddAddr(C4Network2Address(maybe_v4, P_UDP), true);
// Do not ::Network.InvalidateReference(); yet, we're expecting an ID from the netpuncher
}