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:
@@ -9,6 +9,7 @@
|
||||
#include <queue>
|
||||
#include <vector>
|
||||
|
||||
#include "../../../toxcore/attributes.h"
|
||||
#include "../../../toxcore/network.h"
|
||||
|
||||
namespace tox::test {
|
||||
@@ -16,11 +17,17 @@ namespace tox::test {
|
||||
class FakeUdpSocket;
|
||||
class FakeTcpSocket;
|
||||
|
||||
struct TcpFlags {
|
||||
uint8_t value;
|
||||
};
|
||||
std::ostream &operator<<(std::ostream &os, TcpFlags flags);
|
||||
|
||||
struct Packet {
|
||||
IP_Port from;
|
||||
IP_Port to;
|
||||
std::vector<uint8_t> data;
|
||||
uint64_t delivery_time;
|
||||
uint64_t sequence_number = 0;
|
||||
bool is_tcp = false;
|
||||
|
||||
// TCP Simulation Fields
|
||||
@@ -28,9 +35,17 @@ struct Packet {
|
||||
uint32_t seq = 0;
|
||||
uint32_t ack = 0;
|
||||
|
||||
bool operator>(const Packet &other) const { return delivery_time > other.delivery_time; }
|
||||
bool operator>(const Packet &other) const
|
||||
{
|
||||
if (delivery_time != other.delivery_time) {
|
||||
return delivery_time > other.delivery_time;
|
||||
}
|
||||
return sequence_number > other.sequence_number;
|
||||
}
|
||||
};
|
||||
|
||||
bool is_loopback(const IP &ip);
|
||||
|
||||
/**
|
||||
* @brief The God Object for the network simulation.
|
||||
* Manages routing, latency, and connectivity.
|
||||
@@ -45,11 +60,11 @@ public:
|
||||
|
||||
// Registration
|
||||
// Returns true if binding succeeded
|
||||
bool bind_udp(IP ip, uint16_t port, FakeUdpSocket *socket);
|
||||
bool bind_udp(IP ip, uint16_t port, FakeUdpSocket *_Nonnull socket);
|
||||
void unbind_udp(IP ip, uint16_t port);
|
||||
|
||||
bool bind_tcp(IP ip, uint16_t port, FakeTcpSocket *socket);
|
||||
void unbind_tcp(IP ip, uint16_t port, FakeTcpSocket *socket);
|
||||
bool bind_tcp(IP ip, uint16_t port, FakeTcpSocket *_Nonnull socket);
|
||||
void unbind_tcp(IP ip, uint16_t port, FakeTcpSocket *_Nonnull socket);
|
||||
|
||||
// Routing
|
||||
void send_packet(Packet p);
|
||||
@@ -81,6 +96,7 @@ private:
|
||||
std::vector<PacketSink> observers_;
|
||||
|
||||
uint64_t global_latency_ms_ = 0;
|
||||
uint64_t next_packet_id_ = 0;
|
||||
bool verbose_ = false;
|
||||
std::recursive_mutex mutex_;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user