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:
@@ -3,8 +3,11 @@
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include <cmath>
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include <vector>
|
||||
|
||||
#include "../toxcore/attributes.h"
|
||||
#include "../toxcore/logger.h"
|
||||
#include "../toxcore/mono_time.h"
|
||||
#include "../toxcore/network.h"
|
||||
@@ -13,17 +16,18 @@
|
||||
namespace {
|
||||
|
||||
struct BwcTimeMock {
|
||||
uint64_t t;
|
||||
std::uint64_t t;
|
||||
};
|
||||
|
||||
uint64_t bwc_mock_time_cb(void *ud) { return static_cast<BwcTimeMock *>(ud)->t; }
|
||||
std::uint64_t bwc_mock_time_cb(void *ud) { return static_cast<BwcTimeMock *>(ud)->t; }
|
||||
|
||||
struct MockBwcData {
|
||||
std::vector<std::vector<uint8_t>> sent_packets;
|
||||
std::vector<std::vector<std::uint8_t>> sent_packets;
|
||||
std::vector<float> reported_losses;
|
||||
uint32_t friend_number = 0;
|
||||
std::uint32_t friend_number = 0;
|
||||
|
||||
static int send_packet(void *user_data, const uint8_t *data, uint16_t length)
|
||||
static int send_packet(
|
||||
void *_Nullable user_data, const std::uint8_t *_Nonnull data, std::uint16_t length)
|
||||
{
|
||||
auto *sd = static_cast<MockBwcData *>(user_data);
|
||||
if (sd->fail_send) {
|
||||
@@ -33,8 +37,8 @@ struct MockBwcData {
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void loss_report(
|
||||
BWController * /*bwc*/, uint32_t friend_number, float loss, void *user_data)
|
||||
static void loss_report(BWController *_Nonnull /*bwc*/, std::uint32_t friend_number, float loss,
|
||||
void *_Nullable user_data)
|
||||
{
|
||||
auto *sd = static_cast<MockBwcData *>(user_data);
|
||||
sd->friend_number = friend_number;
|
||||
@@ -57,13 +61,13 @@ protected:
|
||||
|
||||
void TearDown() override
|
||||
{
|
||||
const Memory *mem = os_memory();
|
||||
const Memory *_Nonnull mem = os_memory();
|
||||
mono_time_free(mem, mono_time);
|
||||
logger_kill(log);
|
||||
}
|
||||
|
||||
Logger *log;
|
||||
Mono_Time *mono_time;
|
||||
Logger *_Nullable log;
|
||||
Mono_Time *_Nullable mono_time;
|
||||
BwcTimeMock tm;
|
||||
};
|
||||
|
||||
@@ -79,7 +83,7 @@ TEST_F(BwcTest, BasicNewKill)
|
||||
TEST_F(BwcTest, SendUpdate)
|
||||
{
|
||||
MockBwcData sd;
|
||||
uint32_t friend_number = 123;
|
||||
std::uint32_t friend_number = 123;
|
||||
BWController *bwc = bwc_new(log, friend_number, MockBwcData::loss_report, &sd,
|
||||
MockBwcData::send_packet, &sd, mono_time);
|
||||
ASSERT_NE(bwc, nullptr);
|
||||
@@ -107,7 +111,7 @@ TEST_F(BwcTest, SendUpdate)
|
||||
EXPECT_EQ(sd.sent_packets[0][0], BWC_PACKET_ID);
|
||||
|
||||
// Packet contains lost (4 bytes) and recv (4 bytes)
|
||||
uint32_t lost, recv;
|
||||
std::uint32_t lost, recv;
|
||||
net_unpack_u32(sd.sent_packets[0].data() + 1, &lost);
|
||||
net_unpack_u32(sd.sent_packets[0].data() + 5, &recv);
|
||||
|
||||
@@ -120,12 +124,12 @@ TEST_F(BwcTest, SendUpdate)
|
||||
TEST_F(BwcTest, HandlePacket)
|
||||
{
|
||||
MockBwcData sd;
|
||||
uint32_t friend_number = 123;
|
||||
std::uint32_t friend_number = 123;
|
||||
BWController *bwc = bwc_new(log, friend_number, MockBwcData::loss_report, &sd,
|
||||
MockBwcData::send_packet, &sd, mono_time);
|
||||
ASSERT_NE(bwc, nullptr);
|
||||
|
||||
uint8_t packet[9];
|
||||
std::uint8_t packet[9];
|
||||
packet[0] = BWC_PACKET_ID;
|
||||
net_pack_u32(packet + 1, 100); // lost
|
||||
net_pack_u32(packet + 5, 900); // recv
|
||||
@@ -155,7 +159,7 @@ TEST_F(BwcTest, InvalidPacketSize)
|
||||
MockBwcData sd;
|
||||
BWController *bwc = bwc_new(
|
||||
log, 123, MockBwcData::loss_report, &sd, MockBwcData::send_packet, &sd, mono_time);
|
||||
uint8_t packet[10] = {0};
|
||||
std::uint8_t packet[10] = {0};
|
||||
|
||||
// Correct size is 9
|
||||
bwc_handle_packet(bwc, packet, 8);
|
||||
@@ -193,7 +197,7 @@ TEST_F(BwcTest, NullCallback)
|
||||
BWController *bwc
|
||||
= bwc_new(log, 123, nullptr, nullptr, MockBwcData::send_packet, &sd, mono_time);
|
||||
|
||||
uint8_t packet[9];
|
||||
std::uint8_t packet[9];
|
||||
packet[0] = BWC_PACKET_ID;
|
||||
net_pack_u32(packet + 1, 100); // lost
|
||||
net_pack_u32(packet + 5, 900); // recv
|
||||
@@ -213,7 +217,7 @@ TEST_F(BwcTest, ZeroLoss)
|
||||
log, 123, MockBwcData::loss_report, &sd, MockBwcData::send_packet, &sd, mono_time);
|
||||
|
||||
// 1. Peer sends update with zero loss
|
||||
uint8_t packet[9];
|
||||
std::uint8_t packet[9];
|
||||
packet[0] = BWC_PACKET_ID;
|
||||
net_pack_u32(packet + 1, 0); // lost
|
||||
net_pack_u32(packet + 5, 1000); // recv
|
||||
@@ -255,7 +259,7 @@ TEST_F(BwcTest, Overflow)
|
||||
bwc_add_recv(bwc, 1);
|
||||
|
||||
ASSERT_EQ(sd.sent_packets.size(), 1);
|
||||
uint32_t lost, recv;
|
||||
std::uint32_t lost, recv;
|
||||
net_unpack_u32(sd.sent_packets[0].data() + 1, &lost);
|
||||
net_unpack_u32(sd.sent_packets[0].data() + 5, &recv);
|
||||
|
||||
@@ -324,7 +328,7 @@ TEST_F(BwcTest, RecvPlusLostOverflowBug)
|
||||
MockBwcData sd;
|
||||
BWController *bwc = bwc_new(
|
||||
log, 123, MockBwcData::loss_report, &sd, MockBwcData::send_packet, &sd, mono_time);
|
||||
uint8_t packet[9];
|
||||
std::uint8_t packet[9];
|
||||
packet[0] = BWC_PACKET_ID;
|
||||
net_pack_u32(packet + 1, 1);
|
||||
net_pack_u32(packet + 5, 0xFFFFFFFF);
|
||||
@@ -342,7 +346,7 @@ TEST_F(BwcTest, RateLimitBypassBug)
|
||||
log, 123, MockBwcData::loss_report, &sd, MockBwcData::send_packet, &sd, mono_time);
|
||||
tm.t = 0xFFFFFFF0;
|
||||
mono_time_update(mono_time);
|
||||
uint8_t packet[9];
|
||||
std::uint8_t packet[9];
|
||||
packet[0] = BWC_PACKET_ID;
|
||||
net_pack_u32(packet + 1, 1);
|
||||
net_pack_u32(packet + 5, 100);
|
||||
|
||||
Reference in New Issue
Block a user