forked from Green-Sky/tomato
Squashed 'external/toxcore/c-toxcore/' changes from 1828c5356..c9cdae001
c9cdae001 fix(toxav): remove extra copy of video frame on encode 4f6d4546b test: Improve the fake network library. a2581e700 refactor(toxcore): generate `Friend_Request` and `Dht_Nodes_Response` 2aaa11770 refactor(toxcore): use Tox_Memory in generated events 5c367452b test(toxcore): fix incorrect mutex in tox_scenario_get_time 8f92e710f perf: Add a timed limit of number of cookie requests. 695b6417a test: Add some more simulated network support. 815ae9ce9 test(toxcore): fix thread-safety in scenario framework 6d85c754e test(toxcore): add unit tests for net_crypto 9c22e79cc test(support): add SimulatedEnvironment for deterministic testing f34fcb195 chore: Update windows Dockerfile to debian stable (trixie). ece0e8980 fix(group_moderation): allow validating unsorted sanction list signatures a4fa754d7 refactor: rename struct Packet to struct Net_Packet d6f330f85 cleanup: Fix some warnings from coverity. e206bffa2 fix(group_chats): fix sync packets reverting topics 0e4715598 test: Add new scenario testing framework. 668291f44 refactor(toxcore): decouple Network_Funcs from sockaddr via IP_Port fc4396cef fix: potential division by zero in toxav and unsafe hex parsing 8e8b352ab refactor: Add nullable annotations to struct members. 7740bb421 refactor: decouple net_crypto from DHT 1936d4296 test: add benchmark for toxav audio and video 46bfdc2df fix: correct printf format specifiers for unsigned integers REVERT: 1828c5356 fix(toxav): remove extra copy of video frame on encode git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: c9cdae001341e701fca980c9bb9febfeb95d2902
This commit is contained in:
@@ -1,14 +1,26 @@
|
||||
#include <cassert>
|
||||
#include <cstdio>
|
||||
#include <functional>
|
||||
#include <memory>
|
||||
|
||||
#include "../../toxcore/tox.h"
|
||||
#include "../../toxcore/tox_dispatch.h"
|
||||
#include "../../toxcore/tox_events.h"
|
||||
#include "fuzz_support.hh"
|
||||
#include "fuzz_tox.hh"
|
||||
#include "../support/public/fuzz_data.hh"
|
||||
#include "../support/public/fuzz_helpers.hh"
|
||||
#include "../support/public/simulated_environment.hh"
|
||||
|
||||
namespace {
|
||||
|
||||
using tox::test::configure_fuzz_memory_source;
|
||||
using tox::test::configure_fuzz_packet_source;
|
||||
using tox::test::FakeClock;
|
||||
using tox::test::Fuzz_Data;
|
||||
using tox::test::SimulatedEnvironment;
|
||||
|
||||
template <typename T>
|
||||
using Ptr = std::unique_ptr<T, void (*)(T *)>;
|
||||
|
||||
void setup_callbacks(Tox_Dispatch *dispatch)
|
||||
{
|
||||
tox_events_callback_conference_connected(
|
||||
@@ -97,10 +109,15 @@ void setup_callbacks(Tox_Dispatch *dispatch)
|
||||
|
||||
void TestBootstrap(Fuzz_Data &input)
|
||||
{
|
||||
// Null system for regularly working memory allocations needed in
|
||||
// tox_events_equal.
|
||||
Null_System null_sys;
|
||||
Fuzz_System sys(input);
|
||||
SimulatedEnvironment env;
|
||||
env.fake_clock().advance(1000000000); // Match legacy behavior
|
||||
auto node = env.create_node(33445);
|
||||
configure_fuzz_memory_source(env.fake_memory(), input);
|
||||
configure_fuzz_packet_source(*node->endpoint, input);
|
||||
|
||||
// Create a second null system for tox_events_equal check
|
||||
SimulatedEnvironment null_env;
|
||||
auto null_node = null_env.create_node(0); // Port 0 (unbound/irrelevant)
|
||||
|
||||
Ptr<Tox_Options> opts(tox_options_new(nullptr), tox_options_free);
|
||||
assert(opts != nullptr);
|
||||
@@ -110,8 +127,26 @@ void TestBootstrap(Fuzz_Data &input)
|
||||
const char *message, void *user_data) {
|
||||
// Log to stdout.
|
||||
if (Fuzz_Data::FUZZ_DEBUG) {
|
||||
std::printf("[tox1] %c %s:%u(%s): %s\n", tox_log_level_name(level), file, line,
|
||||
func, message);
|
||||
// Approximate level name mapping
|
||||
char level_char = '?';
|
||||
switch (level) {
|
||||
case TOX_LOG_LEVEL_TRACE:
|
||||
level_char = 'T';
|
||||
break;
|
||||
case TOX_LOG_LEVEL_DEBUG:
|
||||
level_char = 'D';
|
||||
break;
|
||||
case TOX_LOG_LEVEL_INFO:
|
||||
level_char = 'I';
|
||||
break;
|
||||
case TOX_LOG_LEVEL_WARNING:
|
||||
level_char = 'W';
|
||||
break;
|
||||
case TOX_LOG_LEVEL_ERROR:
|
||||
level_char = 'E';
|
||||
break;
|
||||
}
|
||||
std::printf("[tox1] %c %s:%u(%s): %s\n", level_char, file, line, func, message);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -134,7 +169,7 @@ void TestBootstrap(Fuzz_Data &input)
|
||||
}
|
||||
|
||||
Tox_Options_Testing tox_options_testing;
|
||||
tox_options_testing.operating_system = sys.sys.get();
|
||||
tox_options_testing.operating_system = &node->system;
|
||||
|
||||
Tox_Err_New error_new;
|
||||
Tox_Err_New_Testing error_new_testing;
|
||||
@@ -165,15 +200,17 @@ void TestBootstrap(Fuzz_Data &input)
|
||||
while (!input.empty()) {
|
||||
Tox_Err_Events_Iterate error_iterate;
|
||||
Tox_Events *events = tox_events_iterate(tox, true, &error_iterate);
|
||||
assert(tox_events_equal(null_sys.sys.get(), events, events));
|
||||
assert(tox_events_equal(&null_node->system, events, events));
|
||||
|
||||
tox_dispatch_invoke(dispatch, events, tox);
|
||||
tox_events_free(events);
|
||||
// Move the clock forward a decent amount so all the time-based checks
|
||||
// trigger more quickly.
|
||||
sys.clock += 200;
|
||||
|
||||
// If no input was consumed, something went wrong.
|
||||
assert(input_size != input.size());
|
||||
env.advance_time(200);
|
||||
|
||||
// If no input was consumed, stop.
|
||||
if (input_size == input.size()) {
|
||||
break;
|
||||
}
|
||||
|
||||
input_size = input.size();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user