Merge branch 'master' into gui

Former-commit-id: b5a6eba7494e7595000e3c7e1f3c77077485519f [formerly 74e8b34c50d86cea8be86dcc5d9b82e112db9277] [formerly 07e6a0bd2e00dcb9517c6ddc1d9ca7d3326707ae [formerly 59878811e379ef9bfd66e6fd0a0f32eaa39dcc6b]]
Former-commit-id: b7a83377bc61d378410ce33748ab63357ee53abb [formerly d789d8762086eb0dd43e0cef08f1edfbd8d346f2]
Former-commit-id: 7aa71e252bf91965f8f488dd9396e6287607edf9
This commit is contained in:
Lynix
2016-10-10 22:10:36 +02:00
92 changed files with 2231 additions and 344 deletions

View File

@@ -1,33 +1,36 @@
#include <Nazara/Core/Thread.hpp>
#include <Nazara/Math/Vector3.hpp>
#include <Nazara/Network/NetPacket.hpp>
#include <Nazara/Network/TcpClient.hpp>
#include <Nazara/Network/TcpServer.hpp>
#include <Catch/catch.hpp>
#include <Nazara/Math/Vector3.hpp>
#include <Nazara/Network/NetPacket.hpp>
#include <random>
SCENARIO("TCP", "[NETWORK][TCP]")
{
GIVEN("Two TCP, one client, one server")
{
// Avoid reusing the same socket
std::random_device rd;
std::mt19937 gen(rd());
std::uniform_int_distribution<> dis(1025, 64245);
std::uniform_int_distribution<Nz::UInt16> dis(1025, 65535);
Nz::UInt16 port = dis(rd);
Nz::UInt16 port = dis(gen);
Nz::TcpServer server;
server.EnableBlocking(false);
REQUIRE(server.Listen(Nz::NetProtocol_IPv4, port) == Nz::SocketState_Bound);
Nz::IpAddress serverIP = server.GetBoundAddress();
Nz::IpAddress serverIP(Nz::IpAddress::LoopbackIpV4.ToIPv4(), port);
REQUIRE(serverIP.IsValid());
Nz::TcpClient client;
REQUIRE(client.Connect(serverIP) == Nz::SocketState_Connecting);
Nz::IpAddress clientIP = client.GetRemoteAddress();
REQUIRE(clientIP.IsValid());
Nz::Thread::Sleep(100);
Nz::TcpClient serverToClient;
REQUIRE(server.AcceptClient(&serverToClient));