oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-22 17:18:39 +00:00
Code Wiki Activity

Socket-related cleanups

Browse source 
Improve error handling on Windows and reduce the size of the `Address` class
This commit is contained in:
sfan5 2021-12-29 23:01:26 +01:00 • committed by GitHub
parent 05573d6d8d
commit 0ea8df4d64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 114 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/unittest/test_socket.cpp
View file

@ -97,11 +97,11 @@ void TestSocket::testIPv4Socket()
UASSERT(strncmp(sendbuffer, rcvbuffer, sizeof(sendbuffer)) == 0);
if (address != Address(0, 0, 0, 0, port)) {
UASSERT(sender.getAddress().sin_addr.s_addr ==
address.getAddress().sin_addr.s_addr);
UASSERT(sender.getAddress().s_addr ==
address.getAddress().s_addr);
} else {
UASSERT(sender.getAddress().sin_addr.s_addr ==
Address(127, 0, 0, 1, 0).getAddress().sin_addr.s_addr);
UASSERT(sender.getAddress().s_addr ==
Address(127, 0, 0, 1, 0).getAddress().s_addr);
}
}
@ -128,7 +128,7 @@ void TestSocket::testIPv6Socket()
socket6.Bind(address6);
try {
{
socket6.Send(Address(&bytes, port), sendbuffer, sizeof(sendbuffer));
sleep_ms(50);
@ -142,10 +142,8 @@ void TestSocket::testIPv6Socket()
}
//FIXME: This fails on some systems
UASSERT(strncmp(sendbuffer, rcvbuffer, sizeof(sendbuffer)) == 0);
UASSERT(memcmp(sender.getAddress6().sin6_addr.s6_addr,
Address(&bytes, 0).getAddress6().sin6_addr.s6_addr, 16) == 0);
} catch (SendFailedException &e) {
errorstream << "IPv6 support enabled but not available!"
<< std::endl;
UASSERT(memcmp(sender.getAddress6().s6_addr,
Address(&bytes, 0).getAddress6().s6_addr, 16) == 0);
}
}