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
186 lines
5.8 KiB
C++
186 lines
5.8 KiB
C++
#include "DHT_test_util.hh"
|
|
|
|
#include <cassert>
|
|
#include <cstring>
|
|
#include <iomanip>
|
|
#include <ostream>
|
|
|
|
#include "../testing/support/public/simulated_environment.hh"
|
|
#include "DHT.h"
|
|
#include "crypto_core.h"
|
|
#include "crypto_core_test_util.hh"
|
|
#include "network.h"
|
|
#include "network_test_util.hh"
|
|
|
|
using tox::test::FakeClock;
|
|
|
|
// --- Mock DHT Implementation ---
|
|
|
|
MockDHT::MockDHT(const Random *_Nonnull rng)
|
|
{
|
|
crypto_new_keypair(rng, self_public_key, self_secret_key);
|
|
}
|
|
|
|
const std::uint8_t *_Nullable MockDHT::get_shared_key(const std::uint8_t *_Nonnull pk)
|
|
{
|
|
std::array<std::uint8_t, CRYPTO_PUBLIC_KEY_SIZE> pk_arr;
|
|
std::copy(pk, pk + CRYPTO_PUBLIC_KEY_SIZE, pk_arr.begin());
|
|
auto it = shared_keys.find(pk_arr);
|
|
if (it != shared_keys.end()) {
|
|
return it->second.data();
|
|
}
|
|
|
|
++computation_count;
|
|
|
|
// Compute new shared key
|
|
std::array<std::uint8_t, CRYPTO_SHARED_KEY_SIZE> sk;
|
|
encrypt_precompute(pk, self_secret_key, sk.data());
|
|
shared_keys[pk_arr] = sk;
|
|
return shared_keys[pk_arr].data();
|
|
}
|
|
|
|
const Net_Crypto_DHT_Funcs MockDHT::funcs = {
|
|
[](void *_Nonnull obj, const std::uint8_t *_Nonnull public_key) {
|
|
return static_cast<MockDHT *>(obj)->get_shared_key(public_key);
|
|
},
|
|
[](const void *_Nonnull obj) { return static_cast<const MockDHT *>(obj)->self_public_key; },
|
|
[](const void *_Nonnull obj) { return static_cast<const MockDHT *>(obj)->self_secret_key; },
|
|
};
|
|
|
|
// --- WrappedMockDHT Implementation ---
|
|
|
|
WrappedMockDHT::WrappedMockDHT(tox::test::SimulatedEnvironment &env, std::uint16_t port)
|
|
: node_(env.create_node(0))
|
|
, logger_(logger_new(&node_->c_memory), [](Logger *l) { logger_kill(l); })
|
|
, mono_time_(mono_time_new(
|
|
&node_->c_memory,
|
|
[](void *_Nullable ud) -> std::uint64_t {
|
|
return static_cast<tox::test::FakeClock *>(ud)->current_time_ms();
|
|
},
|
|
&env.fake_clock()),
|
|
[mem = &node_->c_memory](Mono_Time *t) { mono_time_free(mem, t); })
|
|
, networking_(nullptr, [](Networking_Core *n) { kill_networking(n); })
|
|
, dht_(&node_->c_random)
|
|
{
|
|
// Setup Networking
|
|
IP ip;
|
|
ip_init(&ip, false);
|
|
unsigned int error = 0;
|
|
networking_.reset(new_networking_ex(
|
|
logger_.get(), &node_->c_memory, &node_->c_network, &ip, port, port + 1, &error));
|
|
assert(error == 0);
|
|
|
|
node_->endpoint = node_->node->get_primary_socket();
|
|
assert(node_->endpoint != nullptr);
|
|
assert(node_->endpoint->local_port() == port);
|
|
}
|
|
|
|
WrappedMockDHT::~WrappedMockDHT() = default;
|
|
|
|
IP_Port WrappedMockDHT::get_ip_port() const
|
|
{
|
|
IP_Port ip_port;
|
|
ip_port.ip = node_->node->ip;
|
|
ip_port.port = net_htons(node_->endpoint->local_port());
|
|
return ip_port;
|
|
}
|
|
|
|
void WrappedMockDHT::poll()
|
|
{
|
|
mono_time_update(mono_time_.get());
|
|
networking_poll(networking_.get(), nullptr);
|
|
}
|
|
|
|
const Net_Crypto_DHT_Funcs WrappedMockDHT::funcs = MockDHT::funcs;
|
|
|
|
// --- WrappedDHT Implementation ---
|
|
|
|
WrappedDHT::WrappedDHT(tox::test::SimulatedEnvironment &env, std::uint16_t port)
|
|
: node_(env.create_node(0))
|
|
, logger_(logger_new(&node_->c_memory), [](Logger *l) { logger_kill(l); })
|
|
, mono_time_(mono_time_new(
|
|
&node_->c_memory,
|
|
[](void *_Nullable ud) -> std::uint64_t {
|
|
return static_cast<FakeClock *>(ud)->current_time_ms();
|
|
},
|
|
&env.fake_clock()),
|
|
[mem = &node_->c_memory](Mono_Time *t) { mono_time_free(mem, t); })
|
|
, networking_(nullptr, [](Networking_Core *n) { kill_networking(n); })
|
|
, dht_(nullptr, [](DHT *d) { kill_dht(d); })
|
|
{
|
|
// Setup Networking
|
|
IP ip;
|
|
ip_init(&ip, false);
|
|
unsigned int error = 0;
|
|
networking_.reset(new_networking_ex(
|
|
logger_.get(), &node_->c_memory, &node_->c_network, &ip, port, port + 1, &error));
|
|
assert(error == 0);
|
|
|
|
node_->endpoint = node_->node->get_primary_socket();
|
|
assert(node_->endpoint != nullptr);
|
|
assert(node_->endpoint->local_port() == port);
|
|
|
|
// Setup DHT
|
|
dht_.reset(new_dht(logger_.get(), &node_->c_memory, &node_->c_random, &node_->c_network,
|
|
mono_time_.get(), networking_.get(), true, true));
|
|
}
|
|
|
|
WrappedDHT::~WrappedDHT() = default;
|
|
|
|
const std::uint8_t *WrappedDHT::dht_public_key() const
|
|
{
|
|
return dht_get_self_public_key(dht_.get());
|
|
}
|
|
|
|
const std::uint8_t *WrappedDHT::dht_secret_key() const
|
|
{
|
|
return dht_get_self_secret_key(dht_.get());
|
|
}
|
|
|
|
IP_Port WrappedDHT::get_ip_port() const
|
|
{
|
|
IP_Port ip_port;
|
|
ip_port.ip = node_->node->ip;
|
|
ip_port.port = net_htons(node_->endpoint->local_port());
|
|
return ip_port;
|
|
}
|
|
|
|
void WrappedDHT::poll()
|
|
{
|
|
mono_time_update(mono_time_.get());
|
|
networking_poll(networking_.get(), nullptr);
|
|
do_dht(dht_.get());
|
|
}
|
|
|
|
const Net_Crypto_DHT_Funcs WrappedDHT::funcs = {
|
|
[](void *_Nonnull obj, const std::uint8_t *_Nonnull public_key) {
|
|
return dht_get_shared_key_sent(static_cast<DHT *>(obj), public_key);
|
|
},
|
|
[](const void *_Nonnull obj) { return dht_get_self_public_key(static_cast<const DHT *>(obj)); },
|
|
[](const void *_Nonnull obj) { return dht_get_self_secret_key(static_cast<const DHT *>(obj)); },
|
|
};
|
|
|
|
// --- Test Util Functions ---
|
|
|
|
Node_format random_node_format(const Random *_Nonnull rng)
|
|
{
|
|
Node_format node;
|
|
auto const pk = random_pk(rng);
|
|
std::copy(pk.begin(), pk.end(), node.public_key);
|
|
node.ip_port = random_ip_port(rng);
|
|
return node;
|
|
}
|
|
|
|
bool operator==(Node_format const &a, Node_format const &b)
|
|
{
|
|
return std::memcmp(a.public_key, b.public_key, sizeof(a.public_key)) == 0
|
|
&& a.ip_port == b.ip_port;
|
|
}
|
|
|
|
std::ostream &operator<<(std::ostream &out, Node_format const &v)
|
|
{
|
|
return out << "\n Node_format{\n"
|
|
<< " public_key = " << PublicKey(v.public_key) << ",\n"
|
|
<< " ip_port = " << v.ip_port << " }";
|
|
}
|