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:
Green Sky
@@ -8,55 +8,60 @@
|
||||
|
||||
namespace tox::test {
|
||||
|
||||
static const Network_Funcs kVtable = {
|
||||
.close
|
||||
= [](void *obj, Socket sock) { return static_cast<FakeNetworkStack *>(obj)->close(sock); },
|
||||
.accept
|
||||
= [](void *obj, Socket sock) { return static_cast<FakeNetworkStack *>(obj)->accept(sock); },
|
||||
.bind
|
||||
= [](void *obj, Socket sock,
|
||||
const IP_Port *addr) { return static_cast<FakeNetworkStack *>(obj)->bind(sock, addr); },
|
||||
static const Network_Funcs kNetworkVtable = {
|
||||
.close = [](void *_Nonnull obj,
|
||||
Socket sock) { return static_cast<FakeNetworkStack *>(obj)->close(sock); },
|
||||
.accept = [](void *_Nonnull obj,
|
||||
Socket sock) { return static_cast<FakeNetworkStack *>(obj)->accept(sock); },
|
||||
.bind =
|
||||
[](void *_Nonnull obj, Socket sock, const IP_Port *_Nonnull addr) {
|
||||
return static_cast<FakeNetworkStack *>(obj)->bind(sock, addr);
|
||||
},
|
||||
.listen
|
||||
= [](void *obj, Socket sock,
|
||||
= [](void *_Nonnull obj, Socket sock,
|
||||
int backlog) { return static_cast<FakeNetworkStack *>(obj)->listen(sock, backlog); },
|
||||
.connect =
|
||||
[](void *obj, Socket sock, const IP_Port *addr) {
|
||||
[](void *_Nonnull obj, Socket sock, const IP_Port *_Nonnull addr) {
|
||||
return static_cast<FakeNetworkStack *>(obj)->connect(sock, addr);
|
||||
},
|
||||
.recvbuf
|
||||
= [](void *obj, Socket sock) { return static_cast<FakeNetworkStack *>(obj)->recvbuf(sock); },
|
||||
.recv = [](void *obj, Socket sock, uint8_t *buf,
|
||||
.recvbuf = [](void *_Nonnull obj,
|
||||
Socket sock) { return static_cast<FakeNetworkStack *>(obj)->recvbuf(sock); },
|
||||
.recv = [](void *_Nonnull obj, Socket sock, uint8_t *_Nonnull buf,
|
||||
size_t len) { return static_cast<FakeNetworkStack *>(obj)->recv(sock, buf, len); },
|
||||
.recvfrom =
|
||||
[](void *obj, Socket sock, uint8_t *buf, size_t len, IP_Port *addr) {
|
||||
[](void *_Nonnull obj, Socket sock, uint8_t *_Nonnull buf, size_t len,
|
||||
IP_Port *_Nonnull addr) {
|
||||
return static_cast<FakeNetworkStack *>(obj)->recvfrom(sock, buf, len, addr);
|
||||
},
|
||||
.send = [](void *obj, Socket sock, const uint8_t *buf,
|
||||
.send = [](void *_Nonnull obj, Socket sock, const uint8_t *_Nonnull buf,
|
||||
size_t len) { return static_cast<FakeNetworkStack *>(obj)->send(sock, buf, len); },
|
||||
.sendto =
|
||||
[](void *obj, Socket sock, const uint8_t *buf, size_t len, const IP_Port *addr) {
|
||||
[](void *_Nonnull obj, Socket sock, const uint8_t *_Nonnull buf, size_t len,
|
||||
const IP_Port *_Nonnull addr) {
|
||||
return static_cast<FakeNetworkStack *>(obj)->sendto(sock, buf, len, addr);
|
||||
},
|
||||
.socket
|
||||
= [](void *obj, int domain, int type,
|
||||
= [](void *_Nonnull obj, int domain, int type,
|
||||
int proto) { return static_cast<FakeNetworkStack *>(obj)->socket(domain, type, proto); },
|
||||
.socket_nonblock =
|
||||
[](void *obj, Socket sock, bool nonblock) {
|
||||
[](void *_Nonnull obj, Socket sock, bool nonblock) {
|
||||
return static_cast<FakeNetworkStack *>(obj)->socket_nonblock(sock, nonblock);
|
||||
},
|
||||
.getsockopt =
|
||||
[](void *obj, Socket sock, int level, int optname, void *optval, size_t *optlen) {
|
||||
[](void *_Nonnull obj, Socket sock, int level, int optname, void *_Nonnull optval,
|
||||
size_t *_Nonnull optlen) {
|
||||
return static_cast<FakeNetworkStack *>(obj)->getsockopt(
|
||||
sock, level, optname, optval, optlen);
|
||||
},
|
||||
.setsockopt =
|
||||
[](void *obj, Socket sock, int level, int optname, const void *optval, size_t optlen) {
|
||||
[](void *_Nonnull obj, Socket sock, int level, int optname, const void *_Nonnull optval,
|
||||
size_t optlen) {
|
||||
return static_cast<FakeNetworkStack *>(obj)->setsockopt(
|
||||
sock, level, optname, optval, optlen);
|
||||
},
|
||||
.getaddrinfo =
|
||||
[](void *obj, const Memory *mem, const char *address, int family, int protocol,
|
||||
IP_Port **addrs) {
|
||||
[](void *_Nonnull obj, const Memory *_Nonnull mem, const char *_Nonnull address, int family,
|
||||
int protocol, IP_Port *_Nullable *_Nonnull addrs) {
|
||||
FakeNetworkStack *self = static_cast<FakeNetworkStack *>(obj);
|
||||
if (self->universe().is_verbose()) {
|
||||
std::cerr << "[FakeNetworkStack] getaddrinfo for " << address << std::endl;
|
||||
@@ -83,7 +88,7 @@ static const Network_Funcs kVtable = {
|
||||
return 0;
|
||||
},
|
||||
.freeaddrinfo =
|
||||
[](void *obj, const Memory *mem, IP_Port *addrs) {
|
||||
[](void *_Nonnull obj, const Memory *_Nonnull mem, IP_Port *_Nullable addrs) {
|
||||
mem_delete(mem, addrs);
|
||||
return 0;
|
||||
},
|
||||
@@ -97,7 +102,7 @@ FakeNetworkStack::FakeNetworkStack(NetworkUniverse &universe, const IP &node_ip)
|
||||
|
||||
FakeNetworkStack::~FakeNetworkStack() = default;
|
||||
|
||||
struct Network FakeNetworkStack::get_c_network() { return Network{&kVtable, this}; }
|
||||
struct Network FakeNetworkStack::c_network() { return Network{&kNetworkVtable, this}; }
|
||||
|
||||
Socket FakeNetworkStack::socket(int domain, int type, int protocol)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user