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:
@@ -8,66 +8,6 @@
|
||||
#include "network.h"
|
||||
#include "test_util.hh"
|
||||
|
||||
struct Network_Class {
|
||||
static Network_Funcs const vtable;
|
||||
Network const self;
|
||||
|
||||
operator Network const *() const { return &self; }
|
||||
|
||||
Network_Class(Network_Class const &) = default;
|
||||
Network_Class()
|
||||
: self{&vtable, this}
|
||||
{
|
||||
}
|
||||
|
||||
virtual ~Network_Class();
|
||||
virtual net_close_cb close = 0;
|
||||
virtual net_accept_cb accept = 0;
|
||||
virtual net_bind_cb bind = 0;
|
||||
virtual net_listen_cb listen = 0;
|
||||
virtual net_connect_cb connect = 0;
|
||||
virtual net_recvbuf_cb recvbuf = 0;
|
||||
virtual net_recv_cb recv = 0;
|
||||
virtual net_recvfrom_cb recvfrom = 0;
|
||||
virtual net_send_cb send = 0;
|
||||
virtual net_sendto_cb sendto = 0;
|
||||
virtual net_socket_cb socket = 0;
|
||||
virtual net_socket_nonblock_cb socket_nonblock = 0;
|
||||
virtual net_getsockopt_cb getsockopt = 0;
|
||||
virtual net_setsockopt_cb setsockopt = 0;
|
||||
virtual net_getaddrinfo_cb getaddrinfo = 0;
|
||||
virtual net_freeaddrinfo_cb freeaddrinfo = 0;
|
||||
};
|
||||
|
||||
/**
|
||||
* Base test Network class that just forwards to os_network. Can be
|
||||
* subclassed to override individual (or all) functions.
|
||||
*/
|
||||
class Test_Network : public Network_Class {
|
||||
const Network *net = REQUIRE_NOT_NULL(os_network());
|
||||
|
||||
int close(void *obj, Socket sock) override;
|
||||
Socket accept(void *obj, Socket sock) override;
|
||||
int bind(void *obj, Socket sock, const Network_Addr *addr) override;
|
||||
int listen(void *obj, Socket sock, int backlog) override;
|
||||
int connect(void *obj, Socket sock, const Network_Addr *addr) override;
|
||||
int recvbuf(void *obj, Socket sock) override;
|
||||
int recv(void *obj, Socket sock, uint8_t *buf, size_t len) override;
|
||||
int recvfrom(void *obj, Socket sock, uint8_t *buf, size_t len, Network_Addr *addr) override;
|
||||
int send(void *obj, Socket sock, const uint8_t *buf, size_t len) override;
|
||||
int sendto(
|
||||
void *obj, Socket sock, const uint8_t *buf, size_t len, const Network_Addr *addr) override;
|
||||
Socket socket(void *obj, int domain, int type, int proto) override;
|
||||
int socket_nonblock(void *obj, Socket sock, bool nonblock) override;
|
||||
int getsockopt(
|
||||
void *obj, Socket sock, int level, int optname, void *optval, size_t *optlen) override;
|
||||
int setsockopt(
|
||||
void *obj, Socket sock, int level, int optname, const void *optval, size_t optlen) override;
|
||||
int getaddrinfo(void *obj, const Memory *mem, const char *address, int family, int protocol,
|
||||
Network_Addr **addrs) override;
|
||||
int freeaddrinfo(void *obj, const Memory *mem, Network_Addr *addrs) override;
|
||||
};
|
||||
|
||||
template <>
|
||||
struct Deleter<Networking_Core> : Function_Deleter<Networking_Core, kill_networking> { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user