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:
@@ -6,6 +6,7 @@
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "DHT.h"
|
||||
#include "attributes.h"
|
||||
#include "crypto_core.h"
|
||||
#include "logger.h"
|
||||
#include "mono_time.h"
|
||||
@@ -20,15 +21,15 @@ using tox::test::SimulatedEnvironment;
|
||||
struct Announces : ::testing::Test {
|
||||
protected:
|
||||
SimulatedEnvironment env;
|
||||
Tox_Memory c_mem_;
|
||||
Mono_Time *mono_time_ = nullptr;
|
||||
GC_Announces_List *gca_ = nullptr;
|
||||
Memory c_mem_;
|
||||
Mono_Time *_Nullable mono_time_ = nullptr;
|
||||
GC_Announces_List *_Nullable gca_ = nullptr;
|
||||
GC_Announce _ann1;
|
||||
GC_Announce _ann2;
|
||||
|
||||
void SetUp() override
|
||||
{
|
||||
c_mem_ = env.fake_memory().get_c_memory();
|
||||
c_mem_ = env.fake_memory().c_memory();
|
||||
mono_time_ = mono_time_new(&c_mem_, nullptr, nullptr);
|
||||
ASSERT_NE(mono_time_, nullptr);
|
||||
setup_fake_clock(mono_time_, env.fake_clock());
|
||||
@@ -43,7 +44,7 @@ protected:
|
||||
mono_time_free(&c_mem_, mono_time_);
|
||||
}
|
||||
|
||||
void advance_clock(uint64_t increment)
|
||||
void advance_clock(std::uint64_t increment)
|
||||
{
|
||||
env.fake_clock().advance(increment);
|
||||
mono_time_update(mono_time_);
|
||||
@@ -105,7 +106,7 @@ TEST_F(Announces, AnnouncesGetAndCleanup)
|
||||
ASSERT_NE(gca_add_announce(&c_mem_, mono_time_, gca_, &ann2), nullptr);
|
||||
ASSERT_NE(gca_add_announce(&c_mem_, mono_time_, gca_, &ann2), nullptr);
|
||||
|
||||
uint8_t empty_pk[ENC_PUBLIC_KEY_SIZE] = {0};
|
||||
std::uint8_t empty_pk[ENC_PUBLIC_KEY_SIZE] = {0};
|
||||
|
||||
GC_Announce announces;
|
||||
ASSERT_EQ(gca_get_announces(gca_, &announces, 1, ann1.chat_public_key, empty_pk), 1);
|
||||
@@ -124,13 +125,13 @@ TEST_F(Announces, AnnouncesGetAndCleanup)
|
||||
struct AnnouncesPack : ::testing::Test {
|
||||
protected:
|
||||
SimulatedEnvironment env;
|
||||
Tox_Memory c_mem_;
|
||||
Memory c_mem_;
|
||||
std::vector<GC_Announce> announces_;
|
||||
Logger *logger_ = nullptr;
|
||||
|
||||
void SetUp() override
|
||||
{
|
||||
c_mem_ = env.fake_memory().get_c_memory();
|
||||
c_mem_ = env.fake_memory().c_memory();
|
||||
logger_ = logger_new(&c_mem_);
|
||||
ASSERT_NE(logger_, nullptr);
|
||||
|
||||
@@ -168,7 +169,7 @@ TEST_F(AnnouncesPack, PublicAnnounceCanBePackedAndUnpacked)
|
||||
ann.chat_public_key[0] = 0x88;
|
||||
ann.base_announce = announces_[0];
|
||||
|
||||
std::vector<uint8_t> packed(GCA_PUBLIC_ANNOUNCE_MAX_SIZE);
|
||||
std::vector<std::uint8_t> packed(GCA_PUBLIC_ANNOUNCE_MAX_SIZE);
|
||||
const int packed_size = gca_pack_public_announce(logger_, packed.data(), packed.size(), &ann);
|
||||
|
||||
EXPECT_GT(packed_size, 0);
|
||||
@@ -182,7 +183,7 @@ TEST_F(AnnouncesPack, UnpackEmptyPublicAnnounce)
|
||||
{
|
||||
#ifndef __clang__
|
||||
GC_Public_Announce ann{};
|
||||
std::vector<uint8_t> packed(GCA_PUBLIC_ANNOUNCE_MAX_SIZE);
|
||||
std::vector<std::uint8_t> packed(GCA_PUBLIC_ANNOUNCE_MAX_SIZE);
|
||||
|
||||
EXPECT_EQ(gca_unpack_public_announce(logger_, nullptr, 0, &ann), -1);
|
||||
EXPECT_EQ(gca_unpack_public_announce(logger_, packed.data(), packed.size(), nullptr), -1);
|
||||
@@ -193,7 +194,7 @@ TEST_F(AnnouncesPack, PackEmptyPublicAnnounce)
|
||||
{
|
||||
#ifndef __clang__
|
||||
GC_Public_Announce ann{};
|
||||
std::vector<uint8_t> packed(GCA_PUBLIC_ANNOUNCE_MAX_SIZE);
|
||||
std::vector<std::uint8_t> packed(GCA_PUBLIC_ANNOUNCE_MAX_SIZE);
|
||||
EXPECT_EQ(gca_pack_public_announce(logger_, packed.data(), packed.size(), nullptr), -1);
|
||||
EXPECT_EQ(gca_pack_public_announce(logger_, nullptr, 0, &ann), -1);
|
||||
#endif
|
||||
@@ -202,13 +203,13 @@ TEST_F(AnnouncesPack, PackEmptyPublicAnnounce)
|
||||
TEST_F(AnnouncesPack, PublicAnnouncePackNull)
|
||||
{
|
||||
GC_Public_Announce ann{};
|
||||
std::vector<uint8_t> packed(GCA_PUBLIC_ANNOUNCE_MAX_SIZE);
|
||||
std::vector<std::uint8_t> packed(GCA_PUBLIC_ANNOUNCE_MAX_SIZE);
|
||||
EXPECT_EQ(gca_pack_public_announce(logger_, packed.data(), packed.size(), &ann), -1);
|
||||
|
||||
ann.chat_public_key[0] = 0x88;
|
||||
ann.base_announce = announces_[0];
|
||||
|
||||
std::vector<uint8_t> packedTooSmall(GCA_PUBLIC_ANNOUNCE_MAX_SIZE - 1);
|
||||
std::vector<std::uint8_t> packedTooSmall(GCA_PUBLIC_ANNOUNCE_MAX_SIZE - 1);
|
||||
EXPECT_EQ(
|
||||
gca_pack_public_announce(logger_, packedTooSmall.data(), packedTooSmall.size(), &ann), -1);
|
||||
|
||||
@@ -235,9 +236,9 @@ TEST_F(AnnouncesPack, AnnouncesValidationCheck)
|
||||
|
||||
TEST_F(AnnouncesPack, UnpackIncompleteAnnouncesList)
|
||||
{
|
||||
const uint8_t data[] = {0x00, 0x24, 0x3d, 0x00, 0x3d, 0xff, 0xff, 0x5b, 0x04, 0x20, 0x00, 0x01,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00};
|
||||
const std::uint8_t data[] = {0x00, 0x24, 0x3d, 0x00, 0x3d, 0xff, 0xff, 0x5b, 0x04, 0x20, 0x00,
|
||||
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00};
|
||||
|
||||
GC_Announce announce;
|
||||
EXPECT_EQ(gca_unpack_announces_list(logger_, data, sizeof(data), &announce, 1), -1);
|
||||
@@ -249,10 +250,10 @@ TEST_F(AnnouncesPack, UnpackIncompleteAnnouncesList)
|
||||
|
||||
TEST_F(AnnouncesPack, PackedAnnouncesListCanBeUnpacked)
|
||||
{
|
||||
const uint16_t size = gca_pack_announces_list_size(announces_.size());
|
||||
std::vector<uint8_t> packed(size);
|
||||
const std::uint16_t size = gca_pack_announces_list_size(announces_.size());
|
||||
std::vector<std::uint8_t> packed(size);
|
||||
|
||||
size_t processed = 0;
|
||||
std::size_t processed = 0;
|
||||
|
||||
EXPECT_GT(gca_pack_announces_list(logger_, packed.data(), packed.size(), announces_.data(),
|
||||
announces_.size(), &processed),
|
||||
@@ -269,7 +270,7 @@ TEST_F(AnnouncesPack, PackedAnnouncesListCanBeUnpacked)
|
||||
TEST_F(AnnouncesPack, PackingEmptyAnnounceFails)
|
||||
{
|
||||
GC_Announce announce{}; // all zeroes
|
||||
std::vector<uint8_t> packed(gca_pack_announces_list_size(1));
|
||||
std::vector<std::uint8_t> packed(gca_pack_announces_list_size(1));
|
||||
EXPECT_EQ(
|
||||
gca_pack_announces_list(logger_, packed.data(), packed.size(), &announce, 1, nullptr), -1);
|
||||
#ifndef __clang__
|
||||
@@ -282,7 +283,7 @@ TEST_F(AnnouncesPack, PackingEmptyAnnounceFails)
|
||||
TEST_F(AnnouncesPack, PackAnnounceNull)
|
||||
{
|
||||
#ifndef __clang__
|
||||
std::vector<uint8_t> data(GCA_ANNOUNCE_MAX_SIZE);
|
||||
std::vector<std::uint8_t> data(GCA_ANNOUNCE_MAX_SIZE);
|
||||
GC_Announce announce;
|
||||
ASSERT_EQ(gca_pack_announce(logger_, nullptr, 0, &announce), -1);
|
||||
ASSERT_EQ(gca_pack_announce(logger_, data.data(), data.size(), nullptr), -1);
|
||||
|
||||
Reference in New Issue
Block a user