diff options
author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:57:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-04 16:57:47 +0100 |
commit | 3e16c3a78fff61c20e63ba730d15e94e3bb877b4 (patch) | |
tree | c070350db219f2c4241d22bc31949685c7b42fe9 /src/unittest/test_socket.cpp | |
parent | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (diff) | |
parent | 6ccb5835ff55d85156be91473c598eca9d6cb9a6 (diff) | |
download | dragonfireclient-3e16c3a78fff61c20e63ba730d15e94e3bb877b4.tar.xz |
Merge branch 'master' into master
Diffstat (limited to 'src/unittest/test_socket.cpp')
-rw-r--r-- | src/unittest/test_socket.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/unittest/test_socket.cpp b/src/unittest/test_socket.cpp index 30623874e..6d5cf334d 100644 --- a/src/unittest/test_socket.cpp +++ b/src/unittest/test_socket.cpp @@ -23,8 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "settings.h" #include "network/socket.h" -class TestSocket : public TestBase -{ +class TestSocket : public TestBase { public: TestSocket() { @@ -88,13 +87,13 @@ void TestSocket::testIPv4Socket() sleep_ms(50); - char rcvbuffer[256] = {0}; + char rcvbuffer[256] = { 0 }; Address sender; for (;;) { if (socket.Receive(sender, rcvbuffer, sizeof(rcvbuffer)) < 0) break; } - // FIXME: This fails on some systems + //FIXME: This fails on some systems UASSERT(strncmp(sendbuffer, rcvbuffer, sizeof(sendbuffer)) == 0); if (address != Address(0, 0, 0, 0, port)) { @@ -134,21 +133,19 @@ void TestSocket::testIPv6Socket() sleep_ms(50); - char rcvbuffer[256] = {0}; + char rcvbuffer[256] = { 0 }; Address sender; - for (;;) { + for(;;) { if (socket6.Receive(sender, rcvbuffer, sizeof(rcvbuffer)) < 0) break; } - // FIXME: This fails on some systems + //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); + Address(&bytes, 0).getAddress6().sin6_addr.s6_addr, 16) == 0); } catch (SendFailedException &e) { - errorstream << "IPv6 support enabled but not available!" << std::endl; + errorstream << "IPv6 support enabled but not available!" + << std::endl; } } |