forked from Green-Sky/tomato
Squashed 'external/toxcore/c-toxcore/' changes from 11ab1d2a723..d9b8fa6098d
d9b8fa6098d fix: Fake broadcast address for 127.x.x.x aa649165a57 chore: Add code for future netprof TCP testing 9e5693de5ac chore: add to_string functions for netprof enums 52d915e6a90 cleanup: Heap allocate network profile objects 80fabd4a729 feat: Implement Tox network profiler 05abe083cb6 cleanup: Some random cleanups, mostly related to mem. 5cca24513b8 cleanup: Check that onion IP/Port packing worked. e092ecd1244 cleanup: Use tox memory allocator in some more places. 3cfe41c7587 fix: Avoid `memcpy`-ing structs into onion ping id data. e32ac001938 fix: Add more information on why the frame was not sent. ab887003687 fix: Allow TCP connections to fail `connect` calls. 7603170e663 refactor: Use tox memory in group connection allocations. 5bd8a85eb89 cleanup: Align internal logger with external on type of source line. e9bf524d9e1 cleanup: Add missing `#include` to sort_test.cc. d10c966b998 feat: Add `to_string` functions for toxencryptsave errors. 7bfd0dc8003 docs: Update the docs for group join functions 380dde9f2ae test: Add more logging to TCP connection constructor. 0f12f384c8c cleanup: Reduce stack frame sizes to below 4096 bytes. bc43cec0626 chore: Happy new year! fbe78f1702e cleanup: Add a `TOX_HIDE_DEPRECATED` check to hide deprecated symbols. 44d9da07e77 refactor: Use tox memory for group moderation/pack allocations. 7f26d520168 refactor: Use tox memory in group chats allocations. 2f62f3d0e77 refactor: Use tox Memory for group allocations. 8a968162041 chore: Add dispatch/events headers to bazel export. 2bbfb35abf6 docs: Output the error code string instead of int. in toxav logging d55d0e4eaef cleanup: Remove redundant code for checking if group exists 2a6dc643338 chore: Upgrade dependencies for websockify. fc0650601c1 fix: Allow peers to reconnect to group chats using a password git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: d9b8fa6098de6c074038b6664d2572627540b148
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
/* SPDX-License-Identifier: GPL-3.0-or-later
|
||||
* Copyright © 2016-2022 The TokTok team.
|
||||
* Copyright © 2016-2025 The TokTok team.
|
||||
* Copyright © 2013 Tox project.
|
||||
*/
|
||||
|
||||
@ -11,13 +11,16 @@
|
||||
#include <assert.h>
|
||||
|
||||
#include "DHT.h"
|
||||
#include "TCP_server.h"
|
||||
#include "attributes.h"
|
||||
#include "ccompat.h"
|
||||
#include "crypto_core.h"
|
||||
#include "group_chats.h"
|
||||
#include "group_common.h"
|
||||
#include "logger.h"
|
||||
#include "mem.h"
|
||||
#include "net_crypto.h"
|
||||
#include "net_profile.h"
|
||||
#include "network.h"
|
||||
#include "tox.h"
|
||||
#include "tox_struct.h"
|
||||
@ -226,3 +229,199 @@ bool tox_group_peer_get_ip_address(const Tox *tox, uint32_t group_number, uint32
|
||||
SET_ERROR_PARAMETER(error, TOX_ERR_GROUP_PEER_QUERY_OK);
|
||||
return true;
|
||||
}
|
||||
|
||||
uint64_t tox_netprof_get_packet_id_count(const Tox *tox, Tox_Netprof_Packet_Type type, uint8_t id,
|
||||
Tox_Netprof_Direction direction)
|
||||
{
|
||||
assert(tox != nullptr);
|
||||
|
||||
tox_lock(tox);
|
||||
|
||||
const Net_Profile *tcp_c_profile = nc_get_tcp_client_net_profile(tox->m->net_crypto);
|
||||
const Net_Profile *tcp_s_profile = tcp_server_get_net_profile(tox->m->tcp_server);
|
||||
|
||||
const Packet_Direction dir = (Packet_Direction) direction;
|
||||
|
||||
uint64_t count = 0;
|
||||
|
||||
switch (type) {
|
||||
case TOX_NETPROF_PACKET_TYPE_TCP_CLIENT: {
|
||||
count = netprof_get_packet_count_id(tcp_c_profile, id, dir);
|
||||
break;
|
||||
}
|
||||
|
||||
case TOX_NETPROF_PACKET_TYPE_TCP_SERVER: {
|
||||
count = netprof_get_packet_count_id(tcp_s_profile, id, dir);
|
||||
break;
|
||||
}
|
||||
|
||||
case TOX_NETPROF_PACKET_TYPE_TCP: {
|
||||
const uint64_t tcp_c_count = netprof_get_packet_count_id(tcp_c_profile, id, dir);
|
||||
const uint64_t tcp_s_count = netprof_get_packet_count_id(tcp_s_profile, id, dir);
|
||||
count = tcp_c_count + tcp_s_count;
|
||||
break;
|
||||
}
|
||||
|
||||
case TOX_NETPROF_PACKET_TYPE_UDP: {
|
||||
const Net_Profile *udp_profile = net_get_net_profile(tox->m->net);
|
||||
count = netprof_get_packet_count_id(udp_profile, id, dir);
|
||||
break;
|
||||
}
|
||||
|
||||
default: {
|
||||
LOGGER_ERROR(tox->m->log, "invalid packet type: %d", type);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
tox_unlock(tox);
|
||||
|
||||
return count;
|
||||
}
|
||||
|
||||
uint64_t tox_netprof_get_packet_total_count(const Tox *tox, Tox_Netprof_Packet_Type type,
|
||||
Tox_Netprof_Direction direction)
|
||||
{
|
||||
assert(tox != nullptr);
|
||||
|
||||
tox_lock(tox);
|
||||
|
||||
const Net_Profile *tcp_c_profile = nc_get_tcp_client_net_profile(tox->m->net_crypto);
|
||||
const Net_Profile *tcp_s_profile = tcp_server_get_net_profile(tox->m->tcp_server);
|
||||
|
||||
const Packet_Direction dir = (Packet_Direction) direction;
|
||||
|
||||
uint64_t count = 0;
|
||||
|
||||
switch (type) {
|
||||
case TOX_NETPROF_PACKET_TYPE_TCP_CLIENT: {
|
||||
count = netprof_get_packet_count_total(tcp_c_profile, dir);
|
||||
break;
|
||||
}
|
||||
|
||||
case TOX_NETPROF_PACKET_TYPE_TCP_SERVER: {
|
||||
count = netprof_get_packet_count_total(tcp_s_profile, dir);
|
||||
break;
|
||||
}
|
||||
|
||||
case TOX_NETPROF_PACKET_TYPE_TCP: {
|
||||
const uint64_t tcp_c_count = netprof_get_packet_count_total(tcp_c_profile, dir);
|
||||
const uint64_t tcp_s_count = netprof_get_packet_count_total(tcp_s_profile, dir);
|
||||
count = tcp_c_count + tcp_s_count;
|
||||
break;
|
||||
}
|
||||
|
||||
case TOX_NETPROF_PACKET_TYPE_UDP: {
|
||||
const Net_Profile *udp_profile = net_get_net_profile(tox->m->net);
|
||||
count = netprof_get_packet_count_total(udp_profile, dir);
|
||||
break;
|
||||
}
|
||||
|
||||
default: {
|
||||
LOGGER_ERROR(tox->m->log, "invalid packet type: %d", type);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
tox_unlock(tox);
|
||||
|
||||
return count;
|
||||
}
|
||||
|
||||
uint64_t tox_netprof_get_packet_id_bytes(const Tox *tox, Tox_Netprof_Packet_Type type, uint8_t id,
|
||||
Tox_Netprof_Direction direction)
|
||||
{
|
||||
assert(tox != nullptr);
|
||||
|
||||
tox_lock(tox);
|
||||
|
||||
const Net_Profile *tcp_c_profile = nc_get_tcp_client_net_profile(tox->m->net_crypto);
|
||||
const Net_Profile *tcp_s_profile = tcp_server_get_net_profile(tox->m->tcp_server);
|
||||
|
||||
const Packet_Direction dir = (Packet_Direction) direction;
|
||||
|
||||
uint64_t bytes = 0;
|
||||
|
||||
switch (type) {
|
||||
case TOX_NETPROF_PACKET_TYPE_TCP_CLIENT: {
|
||||
bytes = netprof_get_bytes_id(tcp_c_profile, id, dir);
|
||||
break;
|
||||
}
|
||||
|
||||
case TOX_NETPROF_PACKET_TYPE_TCP_SERVER: {
|
||||
bytes = netprof_get_bytes_id(tcp_s_profile, id, dir);
|
||||
break;
|
||||
}
|
||||
|
||||
case TOX_NETPROF_PACKET_TYPE_TCP: {
|
||||
const uint64_t tcp_c_bytes = netprof_get_bytes_id(tcp_c_profile, id, dir);
|
||||
const uint64_t tcp_s_bytes = netprof_get_bytes_id(tcp_s_profile, id, dir);
|
||||
bytes = tcp_c_bytes + tcp_s_bytes;
|
||||
break;
|
||||
}
|
||||
|
||||
case TOX_NETPROF_PACKET_TYPE_UDP: {
|
||||
const Net_Profile *udp_profile = net_get_net_profile(tox->m->net);
|
||||
bytes = netprof_get_bytes_id(udp_profile, id, dir);
|
||||
break;
|
||||
}
|
||||
|
||||
default: {
|
||||
LOGGER_ERROR(tox->m->log, "invalid packet type: %d", type);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
tox_unlock(tox);
|
||||
|
||||
return bytes;
|
||||
}
|
||||
|
||||
uint64_t tox_netprof_get_packet_total_bytes(const Tox *tox, Tox_Netprof_Packet_Type type,
|
||||
Tox_Netprof_Direction direction)
|
||||
{
|
||||
assert(tox != nullptr);
|
||||
|
||||
tox_lock(tox);
|
||||
|
||||
const Net_Profile *tcp_c_profile = nc_get_tcp_client_net_profile(tox->m->net_crypto);
|
||||
const Net_Profile *tcp_s_profile = tcp_server_get_net_profile(tox->m->tcp_server);
|
||||
|
||||
const Packet_Direction dir = (Packet_Direction) direction;
|
||||
|
||||
uint64_t bytes = 0;
|
||||
|
||||
switch (type) {
|
||||
case TOX_NETPROF_PACKET_TYPE_TCP_CLIENT: {
|
||||
bytes = netprof_get_bytes_total(tcp_c_profile, dir);
|
||||
break;
|
||||
}
|
||||
|
||||
case TOX_NETPROF_PACKET_TYPE_TCP_SERVER: {
|
||||
bytes = netprof_get_bytes_total(tcp_s_profile, dir);
|
||||
break;
|
||||
}
|
||||
|
||||
case TOX_NETPROF_PACKET_TYPE_TCP: {
|
||||
const uint64_t tcp_c_bytes = netprof_get_bytes_total(tcp_c_profile, dir);
|
||||
const uint64_t tcp_s_bytes = netprof_get_bytes_total(tcp_s_profile, dir);
|
||||
bytes = tcp_c_bytes + tcp_s_bytes;
|
||||
break;
|
||||
}
|
||||
|
||||
case TOX_NETPROF_PACKET_TYPE_UDP: {
|
||||
const Net_Profile *udp_profile = net_get_net_profile(tox->m->net);
|
||||
bytes = netprof_get_bytes_total(udp_profile, dir);
|
||||
break;
|
||||
}
|
||||
|
||||
default: {
|
||||
LOGGER_ERROR(tox->m->log, "invalid packet type: %d", type);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
tox_unlock(tox);
|
||||
|
||||
return bytes;
|
||||
}
|
||||
|
Reference in New Issue
Block a user