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:
@@ -82,6 +82,46 @@ namespace {
|
||||
EXPECT_EQ(std::string(reinterpret_cast<char *>(recv_buf), 5), "Hello");
|
||||
}
|
||||
|
||||
TEST_F(FakeTcpSocketTest, RecvBuffering)
|
||||
{
|
||||
IP_Port server_addr;
|
||||
ip_init(&server_addr.ip, false);
|
||||
server_addr.ip.ip.v4.uint32 = net_htonl(0x7F000001);
|
||||
server_addr.port = net_htons(8082);
|
||||
|
||||
server.bind(&server_addr);
|
||||
server.listen(5);
|
||||
client.connect(&server_addr);
|
||||
|
||||
universe.process_events(0); // SYN
|
||||
universe.process_events(0); // SYN-ACK
|
||||
universe.process_events(0); // ACK
|
||||
|
||||
auto accepted = server.accept(nullptr);
|
||||
ASSERT_NE(accepted, nullptr);
|
||||
|
||||
uint8_t msg1[] = "Part1";
|
||||
uint8_t msg2[] = "Part2";
|
||||
client.send(msg1, 5);
|
||||
client.send(msg2, 5);
|
||||
|
||||
universe.process_events(0); // Deliver Part1
|
||||
universe.process_events(0); // Deliver Part2
|
||||
|
||||
EXPECT_EQ(accepted->recv_buffer_size(), 10);
|
||||
|
||||
uint8_t recv_buf[20];
|
||||
// Read partial
|
||||
ASSERT_EQ(accepted->recv(recv_buf, 3), 3);
|
||||
EXPECT_EQ(std::string(reinterpret_cast<char *>(recv_buf), 3), "Par");
|
||||
EXPECT_EQ(accepted->recv_buffer_size(), 7);
|
||||
|
||||
// Read rest
|
||||
ASSERT_EQ(accepted->recv(recv_buf, 7), 7);
|
||||
EXPECT_EQ(std::string(reinterpret_cast<char *>(recv_buf), 7), "t1Part2");
|
||||
EXPECT_EQ(accepted->recv_buffer_size(), 0);
|
||||
}
|
||||
|
||||
class FakeUdpSocketTest : public ::testing::Test {
|
||||
public:
|
||||
~FakeUdpSocketTest() override;
|
||||
@@ -119,6 +159,40 @@ namespace {
|
||||
EXPECT_EQ(sender_addr.port, net_htons(client.local_port()));
|
||||
}
|
||||
|
||||
TEST_F(FakeUdpSocketTest, RecvBuffering)
|
||||
{
|
||||
IP_Port server_addr;
|
||||
ip_init(&server_addr.ip, false);
|
||||
server_addr.ip.ip.v4.uint32 = net_htonl(0x7F000001);
|
||||
server_addr.port = net_htons(9001);
|
||||
|
||||
server.bind(&server_addr);
|
||||
|
||||
const char *msg1 = "Msg1";
|
||||
const char *msg2 = "Msg2";
|
||||
|
||||
client.sendto(reinterpret_cast<const uint8_t *>(msg1), strlen(msg1), &server_addr);
|
||||
client.sendto(reinterpret_cast<const uint8_t *>(msg2), strlen(msg2), &server_addr);
|
||||
|
||||
universe.process_events(0); // Deliver msg1
|
||||
universe.process_events(0); // Deliver msg2
|
||||
|
||||
EXPECT_EQ(server.recv_buffer_size(), 2);
|
||||
|
||||
IP_Port sender;
|
||||
uint8_t buf[10];
|
||||
|
||||
int len = server.recvfrom(buf, sizeof(buf), &sender);
|
||||
ASSERT_EQ(len, 4);
|
||||
EXPECT_EQ(std::string(reinterpret_cast<char *>(buf), len), "Msg1");
|
||||
EXPECT_EQ(server.recv_buffer_size(), 1);
|
||||
|
||||
len = server.recvfrom(buf, sizeof(buf), &sender);
|
||||
ASSERT_EQ(len, 4);
|
||||
EXPECT_EQ(std::string(reinterpret_cast<char *>(buf), len), "Msg2");
|
||||
EXPECT_EQ(server.recv_buffer_size(), 0);
|
||||
}
|
||||
|
||||
} // namespace
|
||||
} // namespace tox::test
|
||||
|
||||
|
||||
Reference in New Issue
Block a user