Squashed 'external/toxcore/c-toxcore/' changes from c9cdae001..9ed2fa80d
9ed2fa80d fix(toxav): remove extra copy of video frame on encode de30cf3ad docs: Add new file kinds, that should be useful to all clients. d5b5e879d fix(DHT): Correct node skipping logic timed out nodes. 30e71fe97 refactor: Generate event dispatch functions and add tox_events_dispatch. 8fdbb0b50 style: Format parameter lists in event handlers. d00dee12b refactor: Add warning logs when losing chat invites. b144e8db1 feat: Add a way to look up a file number by ID. 849281ea0 feat: Add a way to fetch groups by chat ID. a2c177396 refactor: Harden event system and improve type safety. 8f5caa656 refactor: Add MessagePack string support to bin_pack. 34e8d5ad5 chore: Add GitHub CodeQL workflow and local Docker runner. f7b068010 refactor: Add nullability annotations to event headers. 788abe651 refactor(toxav): Use system allocator for mutexes. 2e4b423eb refactor: Use specific typedefs for public API arrays. 2baf34775 docs(toxav): update idle iteration interval see 679444751876fa3882a717772918ebdc8f083354 2f87ac67b feat: Add Event Loop abstraction (Ev). f8dfc38d8 test: Fix data race in ToxScenario virtual_clock. 38313921e test(TCP): Add regression test for TCP priority queue integrity. f94a50d9a refactor(toxav): Replace mutable_mutex with dynamically allocated mutex. ad054511e refactor: Internalize DHT structs and add debug helpers. 8b467cc96 fix: Prevent potential integer overflow in group chat handshake. 4962bdbb8 test: Improve TCP simulation and add tests 5f0227093 refactor: Allow nullable data in group chat handlers. e97b18ea9 chore: Improve Windows Docker support. b14943bbd refactor: Move Logger out of Messenger into Tox. dd3136250 cleanup: Apply nullability qualifiers to C++ codebase. 1849f70fc refactor: Extract low-level networking code to net and os_network. 8fec75421 refactor: Delete tox_random, align on rng and os_random. a03ae8051 refactor: Delete tox_memory, align on mem and os_memory. 4c88fed2c refactor: Use `std::` prefixes more consistently in C++ code. 72452f2ae test: Add some more tests for onion and shared key cache. d5a51b09a cleanup: Use tox_attributes.h in tox_private.h and install it. b6f5b9fc5 test: Add some benchmarks for various high level things. 8a8d02785 test(support): Introduce threaded Tox runner and simulation barrier d68d1d095 perf(toxav): optimize audio and video intermediate buffers by keeping them around REVERT: c9cdae001 fix(toxav): remove extra copy of video frame on encode git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: 9ed2fa80d582c714d6bdde6a7648220a92cddff8
This commit is contained in:
@@ -236,5 +236,86 @@ namespace {
|
||||
std::string(reinterpret_cast<char *>(buf), static_cast<size_t>(len)), "Padding test");
|
||||
}
|
||||
|
||||
TEST_F(NetworkUniverseTest, TcpRoutingSpecificity)
|
||||
{
|
||||
IP ip1{};
|
||||
ip_init(&ip1, false);
|
||||
ip1.ip.v4.uint32 = net_htonl(0x0A000001); // 10.0.0.1
|
||||
|
||||
uint16_t port = 12345;
|
||||
IP_Port local_addr{ip1, net_htons(port)};
|
||||
|
||||
FakeTcpSocket listen_sock(universe);
|
||||
listen_sock.set_ip(ip1);
|
||||
listen_sock.bind(&local_addr);
|
||||
listen_sock.listen(5);
|
||||
|
||||
IP remote_ip{};
|
||||
ip_init(&remote_ip, false);
|
||||
remote_ip.ip.v4.uint32 = net_htonl(0x0A000002); // 10.0.0.2
|
||||
IP_Port remote_addr{remote_ip, net_htons(33445)};
|
||||
|
||||
auto established_sock = FakeTcpSocket::create_connected(universe, remote_addr, port);
|
||||
established_sock->set_ip(ip1);
|
||||
universe.bind_tcp(ip1, port, established_sock.get());
|
||||
|
||||
// Send a data packet from remote to local
|
||||
Packet p{};
|
||||
p.from = remote_addr;
|
||||
p.to = local_addr;
|
||||
p.is_tcp = true;
|
||||
p.tcp_flags = 0x10; // ACK (Data)
|
||||
const char *data = "Specific";
|
||||
p.data.assign(data, data + strlen(data));
|
||||
|
||||
universe.send_packet(p);
|
||||
universe.process_events(0);
|
||||
|
||||
// established_sock should have received it
|
||||
EXPECT_EQ(established_sock->recv_buffer_size(), strlen(data));
|
||||
|
||||
// listen_sock should NOT have received it (it doesn't have a buffer, but it shouldn't have
|
||||
// been called) We can't easily check listen_sock wasn't called without mocks or checking
|
||||
// logs, but we can check that it didn't create a new pending connection.
|
||||
EXPECT_FALSE(listen_sock.is_readable());
|
||||
}
|
||||
|
||||
TEST_F(NetworkUniverseTest, PacketOrdering)
|
||||
{
|
||||
IP ip1{}, ip2{};
|
||||
ip_init(&ip1, false);
|
||||
ip1.ip.v4.uint32 = net_htonl(0x0A000001);
|
||||
ip_init(&ip2, false);
|
||||
ip2.ip.v4.uint32 = net_htonl(0x0A000002);
|
||||
|
||||
uint16_t port = 33445;
|
||||
IP_Port addr1{ip1, net_htons(port)};
|
||||
IP_Port addr2{ip2, net_htons(port)};
|
||||
|
||||
FakeUdpSocket sock1{universe};
|
||||
sock1.set_ip(ip1);
|
||||
sock1.bind(&addr1);
|
||||
|
||||
FakeUdpSocket sock2{universe};
|
||||
sock2.set_ip(ip2);
|
||||
sock2.bind(&addr2);
|
||||
|
||||
// Send 10 packets with the same delivery time (global latency = 0)
|
||||
for (int i = 0; i < 10; ++i) {
|
||||
uint8_t data = static_cast<uint8_t>(i);
|
||||
sock1.sendto(&data, 1, &addr2);
|
||||
}
|
||||
|
||||
universe.process_events(0);
|
||||
|
||||
// They should be received in the exact order they were sent
|
||||
for (int i = 0; i < 10; ++i) {
|
||||
uint8_t buf[1];
|
||||
IP_Port from;
|
||||
ASSERT_EQ(sock2.recvfrom(buf, 1, &from), 1);
|
||||
EXPECT_EQ(buf[0], i) << "Packet " << i << " was delivered out of order";
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace
|
||||
} // namespace tox::test
|
||||
|
||||
Reference in New Issue
Block a user