Green Sky
aae086cc65
b03b571272 fix: flaky tcp test This only fixes the symptoms, not the real problem. Sometimes or consistently on some platforms a socket might need a moment before it can be written to. 32e67ab4c2 cleanup: use typedef for private message ID's in callback 7b1db6adc1 feat: add message IDs to private group messages 99e0bcc27d refactor: Observers/ignored peers can now send and receive custom packets b3c3c49d26 fix: Disable IPv6 in Windows cross-compilation tests e742deddff feat: Check hashes of Windows dependencies when cross-compiling dfb9a0b02b fix: Test the current Windows Dockerfile, not an old Dockerhub image 14de93ccec chore: Use WineHQ's Wine as Debian Bookworm's crashes ed37616249 docs: Update the Windows cross-compilation section 9bb79c174f cleanup: Remove a couple of unnecessary misc_tools dependencies 19475adb70 chore: Statically link OpenMP into the cracker fun util on Windows 1be311e51f feat: Build the fun utils when cross-compiling to Windows 88133f8446 chore: Strip Windows binaries 3cc0ae7535 refactor: Copy over all of the required static dependencies c4fa8f7fb1 feat: Generate .def, .exp and .lib files when building for Windows 74bbac5363 feat: Let CMake create the dll instead of doing so ourselves 246642e9ae feat: Harden Windows cross-compilation 8d431c0d11 chore: Bump Windows build dependency versions e519f7998b fix: Remove unnecessary wsock32 dependency on Windows ed2b60c217 chore: Use a specific non-broken slimcc version. d7f21010a1 chore: Update github actions. e71a68b7f2 docs: Update the list of CMake options 77e08876ff chore: Remove mod and founder from group API naming scheme 12bc042767 docs: add the experimental api build option to INSTALL.md e1fa5cae96 refactor: Rename Queries to Query to align with other enums. be82a3ea30 fix: Correct type for conference offline peer numbers. 0627c36716 test: Add pkgsrc build. 92578afe4b test: Add FreeBSD VM action on GitHub. 52ece0f57b test: Build toxcore on NetBSD (VM). 3fe8ee2c11 chore: Only install tox_private.h on request. 9a8dfa06ab fix: save_compatibility_test failing on big-endian systems 86f5e55578 fix: Don't serve files from websockify. 710eb674a5 fix: Correctly pass extended public keys to group moderation code. 021db7031c refactor: Use `struct`s for extended public/secret keys. a1e999fd80 chore: Compile libsodium reference implementation with compcert. fbe3c19cf5 cleanup: correct a few nullable annotations 623e3ee5c3 cleanup: Don't use `memcpy` to cast arbitrary `struct`s to `uint8_t[]`. c71567dc18 fix: Pass array, not array pointer, to `memcmp`. 9b46a08144 cleanup: Never pass `void*` directly to `memcpy`. 5d7b7a7bbc refactor: Use tox rng to seed the keypair generation. 961891d568 cleanup: Small improvements found by PVS Studio. 8201019f0d chore: Disable NGC saving by default, enable through Tox_Options. 5dd9ee3f65 cleanup: Replace pointer arithmetic with explicit `&arr[i]`. ca4606d49d refactor: Use strong typedef for NGC peer id. 442213b722 cleanup: Simplify custom packet length check in NGC. 08d3393def fix: Correct a few potential null derefs in bootstrap daemon. b9877b32b0 fix: Add missing memunlock of local variable when it goes out of scope. dab5fe44b9 fix: Zero out stack-allocated secret key before return. f058103299 refactor: Make prune_gc_sanctions_list more obviously correct. 3ba7a0dec9 docs: Add static analysis tool list to README. 8d0811a0f3 docs: Run prettier-markdown on markdown files. 969e3a2bfc refactor: Fix network test not using the strong typedef 93c83fbc7c refactor: Use strong typedef instead of struct for `Socket`. 9fe18b176f fix: Fix some false positive from PVS Studio. 7c44379ccb cleanup: Check that WINXP macro exists before comparing it. 5c93231bef refactor: Make tox mutex non-recursive. aacff73939 docs: Fix up doxyfile. d55fc85ff5 docs: Add more documentation to crypto_core. 5bdaaaedb6 refactor: Remove `Tox *` from `tox_dispatch`. e202341e76 refactor: Don't rely on tox_dispatch passing tox in tests. 34df938f52 chore: Use C++ mode for clang-tidy. 8b05296a78 chore: Check that both gtest and gmock exist for tests. 42010660e1 test: Add slimcc compiler compatibility test. b473630321 chore: Add some comments to the astyle config. b7404f24f6 cleanup: Remove implicit bool conversions. 4e2dba4d9f chore: Reformat sources with astyle. 4359e3a6bc chore: Rename C++ headers to .hh suffixes. 0c05566e58 cleanup: Further `#include` cleanups. 8d29935b7a chore: Only check the bootstrap daemon checksum on release. f70e588bc6 cleanup: Add more `const` where possible. 511bfe39c8 cleanup: Use Bazel modules to enforce proper `#include` hygiene. 1710a0d091 refactor: Move pack/unpack `IP_Port` from DHT into network module. a975943564 chore: Really fix coverage docker image build. c08409390f chore: Fix post-submit coverage image. 39aadf8922 fix: Don't use `memcmp` to compare `IP_Port`s. d94246a906 fix: partially fix a bug that prevented group part messages from sending. eeaa039222 chore: Fix rpm build; add a CI check for it. 8328449c1a chore: Speed up docker builds a bit by reducing layer count. d6d67d56f3 cleanup: Add `const` where possible in auto tests. 6aa9e6850d cleanup: Minor cleanup of event unpack code. bdf460a3a9 refactor: Rename `system_{memory,...}` to `os_{memory,...}`. 203e1af81e fix: a few off by one errors in group autotests 5c093c4888 cleanup: Remove all uses of `SIZEOF_VLA`. 662c2140f3 test: Add goblint static analyser. 8f07755834 cleanup: Use `memzero(x, s)` instead of `memset(x, 0, s)`. a7258e40cf cleanup: Use explicit 0 instead of `PACKET_ID_PADDING`. 6370d0f15d cleanup: Expand the `Tox_Options` accessor macros. 14a1a0b9bd cleanup: Remove plan9 support. a05dccad13 test: Add a simple new/delete test for Tox. 1cdcf938b9 cleanup: Add comment after every `#endif`. ba99d4dc4b test: Fix comment I broke in the events test PR. e07248debb refactor: Migrate auto_tests to new events API. bdd42b5452 refactor: Add common msgpack array packer with callback. 3c659f5288 cleanup: Rename group to conference in groupav documentation. 89957be230 cleanup: Ensure handler params are named after callback params. c650d9d345 refactor: Pass `this` pointer as first param to s11n callbacks. e7fb91ddb8 refactor: Allow NULL pointers for byte arrays in events. 5e2c8cabc1 cleanup: make some improvements to group moderation test 259de4867e cleanup: Remove `bin_pack_{new,free}`. 21a8ff5895 cleanup: skip a do_gc iteration before removing peers marked for deletion 16809dc36e feat: Add dht_get_nodes_response event to the events system. git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: b03b5712720de9a9901ea12fd741f177327a7021
225 lines
6.7 KiB
C
225 lines
6.7 KiB
C
/* SPDX-License-Identifier: GPL-3.0-or-later
|
|
* Copyright © 2016-2018 The TokTok team.
|
|
* Copyright © 2013-2015 Tox project.
|
|
*/
|
|
#include "bwcontroller.h"
|
|
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "ring_buffer.h"
|
|
|
|
#include "../toxcore/ccompat.h"
|
|
#include "../toxcore/logger.h"
|
|
#include "../toxcore/mono_time.h"
|
|
#include "../toxcore/util.h"
|
|
|
|
#define BWC_PACKET_ID 196
|
|
#define BWC_SEND_INTERVAL_MS 950 // 0.95s
|
|
#define BWC_AVG_PKT_COUNT 20
|
|
#define BWC_AVG_LOSS_OVER_CYCLES_COUNT 30
|
|
|
|
typedef struct BWCCycle {
|
|
uint32_t last_recv_timestamp; /* Last recv update time stamp */
|
|
uint32_t last_sent_timestamp; /* Last sent update time stamp */
|
|
uint32_t last_refresh_timestamp; /* Last refresh time stamp */
|
|
|
|
uint32_t lost;
|
|
uint32_t recv;
|
|
} BWCCycle;
|
|
|
|
typedef struct BWCRcvPkt {
|
|
uint32_t packet_length_array[BWC_AVG_PKT_COUNT];
|
|
RingBuffer *rb;
|
|
} BWCRcvPkt;
|
|
|
|
struct BWController {
|
|
m_cb *mcb;
|
|
void *mcb_user_data;
|
|
|
|
Messenger *m;
|
|
Tox *tox;
|
|
uint32_t friend_number;
|
|
|
|
BWCCycle cycle;
|
|
|
|
BWCRcvPkt rcvpkt; /* To calculate average received packet (this means split parts, not the full message!) */
|
|
|
|
uint32_t packet_loss_counted_cycles;
|
|
Mono_Time *bwc_mono_time;
|
|
};
|
|
|
|
struct BWCMessage {
|
|
uint32_t lost;
|
|
uint32_t recv;
|
|
};
|
|
|
|
static int bwc_handle_data(Messenger *m, uint32_t friend_number, const uint8_t *data, uint16_t length, void *object);
|
|
static int bwc_send_custom_lossy_packet(Tox *tox, int32_t friendnumber, const uint8_t *data, uint32_t length);
|
|
static void send_update(BWController *bwc);
|
|
|
|
BWController *bwc_new(Messenger *m, Tox *tox, uint32_t friendnumber, m_cb *mcb, void *mcb_user_data,
|
|
Mono_Time *bwc_mono_time)
|
|
{
|
|
BWController *retu = (BWController *)calloc(1, sizeof(BWController));
|
|
|
|
if (retu == nullptr) {
|
|
return nullptr;
|
|
}
|
|
|
|
LOGGER_DEBUG(m->log, "Creating bandwidth controller");
|
|
retu->mcb = mcb;
|
|
retu->mcb_user_data = mcb_user_data;
|
|
retu->m = m;
|
|
retu->friend_number = friendnumber;
|
|
retu->bwc_mono_time = bwc_mono_time;
|
|
const uint64_t now = current_time_monotonic(bwc_mono_time);
|
|
retu->cycle.last_sent_timestamp = now;
|
|
retu->cycle.last_refresh_timestamp = now;
|
|
retu->tox = tox;
|
|
retu->rcvpkt.rb = rb_new(BWC_AVG_PKT_COUNT);
|
|
retu->cycle.lost = 0;
|
|
retu->cycle.recv = 0;
|
|
retu->packet_loss_counted_cycles = 0;
|
|
|
|
/* Fill with zeros */
|
|
for (int i = 0; i < BWC_AVG_PKT_COUNT; ++i) {
|
|
rb_write(retu->rcvpkt.rb, &retu->rcvpkt.packet_length_array[i]);
|
|
}
|
|
|
|
m_callback_rtp_packet(m, friendnumber, BWC_PACKET_ID, bwc_handle_data, retu);
|
|
return retu;
|
|
}
|
|
|
|
void bwc_kill(BWController *bwc)
|
|
{
|
|
if (bwc == nullptr) {
|
|
return;
|
|
}
|
|
|
|
m_callback_rtp_packet(bwc->m, bwc->friend_number, BWC_PACKET_ID, nullptr, nullptr);
|
|
rb_kill(bwc->rcvpkt.rb);
|
|
free(bwc);
|
|
}
|
|
|
|
void bwc_add_lost(BWController *bwc, uint32_t bytes_lost)
|
|
{
|
|
if (bwc == nullptr) {
|
|
return;
|
|
}
|
|
|
|
if (bytes_lost > 0) {
|
|
LOGGER_DEBUG(bwc->m->log, "BWC lost(1): %d", (int)bytes_lost);
|
|
bwc->cycle.lost += bytes_lost;
|
|
send_update(bwc);
|
|
}
|
|
}
|
|
|
|
void bwc_add_recv(BWController *bwc, uint32_t recv_bytes)
|
|
{
|
|
if (bwc == nullptr || recv_bytes == 0) {
|
|
return;
|
|
}
|
|
|
|
++bwc->packet_loss_counted_cycles;
|
|
bwc->cycle.recv += recv_bytes;
|
|
send_update(bwc);
|
|
}
|
|
|
|
static void send_update(BWController *bwc)
|
|
{
|
|
if (bwc->packet_loss_counted_cycles > BWC_AVG_LOSS_OVER_CYCLES_COUNT &&
|
|
current_time_monotonic(bwc->bwc_mono_time) - bwc->cycle.last_sent_timestamp > BWC_SEND_INTERVAL_MS) {
|
|
bwc->packet_loss_counted_cycles = 0;
|
|
|
|
if (bwc->cycle.lost != 0) {
|
|
LOGGER_DEBUG(bwc->m->log, "%p Sent update rcv: %u lost: %u percent: %f %%",
|
|
(void *)bwc, bwc->cycle.recv, bwc->cycle.lost,
|
|
((double)bwc->cycle.lost / (bwc->cycle.recv + bwc->cycle.lost)) * 100.0);
|
|
uint8_t bwc_packet[sizeof(struct BWCMessage) + 1];
|
|
size_t offset = 0;
|
|
|
|
bwc_packet[offset] = BWC_PACKET_ID; // set packet ID
|
|
++offset;
|
|
|
|
offset += net_pack_u32(bwc_packet + offset, bwc->cycle.lost);
|
|
offset += net_pack_u32(bwc_packet + offset, bwc->cycle.recv);
|
|
assert(offset == sizeof(bwc_packet));
|
|
|
|
if (bwc_send_custom_lossy_packet(bwc->tox, bwc->friend_number, bwc_packet, sizeof(bwc_packet)) == -1) {
|
|
char *netstrerror = net_new_strerror(net_error());
|
|
char *stdstrerror = net_new_strerror(errno);
|
|
LOGGER_WARNING(bwc->m->log, "BWC send failed (len: %u)! std error: %s, net error %s",
|
|
(unsigned)sizeof(bwc_packet), stdstrerror, netstrerror);
|
|
net_kill_strerror(stdstrerror);
|
|
net_kill_strerror(netstrerror);
|
|
}
|
|
}
|
|
|
|
bwc->cycle.last_sent_timestamp = current_time_monotonic(bwc->bwc_mono_time);
|
|
bwc->cycle.lost = 0;
|
|
bwc->cycle.recv = 0;
|
|
}
|
|
}
|
|
|
|
static int on_update(BWController *bwc, const struct BWCMessage *msg)
|
|
{
|
|
LOGGER_DEBUG(bwc->m->log, "%p Got update from peer", (void *)bwc);
|
|
|
|
/* Peers sent update too soon */
|
|
if (bwc->cycle.last_recv_timestamp + BWC_SEND_INTERVAL_MS > current_time_monotonic(bwc->bwc_mono_time)) {
|
|
LOGGER_INFO(bwc->m->log, "%p Rejecting extra update", (void *)bwc);
|
|
return -1;
|
|
}
|
|
|
|
bwc->cycle.last_recv_timestamp = current_time_monotonic(bwc->bwc_mono_time);
|
|
|
|
const uint32_t lost = msg->lost;
|
|
|
|
if (lost != 0 && bwc->mcb != nullptr) {
|
|
const uint32_t recv = msg->recv;
|
|
LOGGER_DEBUG(bwc->m->log, "recved: %u lost: %u percentage: %f %%", recv, lost,
|
|
((double)lost / (recv + lost)) * 100.0);
|
|
bwc->mcb(bwc, bwc->friend_number,
|
|
(float)lost / (recv + lost),
|
|
bwc->mcb_user_data);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* return -1 on failure, 0 on success
|
|
*
|
|
*/
|
|
static int bwc_send_custom_lossy_packet(Tox *tox, int32_t friendnumber, const uint8_t *data, uint32_t length)
|
|
{
|
|
Tox_Err_Friend_Custom_Packet error;
|
|
tox_friend_send_lossy_packet(tox, friendnumber, data, (size_t)length, &error);
|
|
|
|
if (error == TOX_ERR_FRIEND_CUSTOM_PACKET_OK) {
|
|
return 0;
|
|
}
|
|
|
|
return -1;
|
|
}
|
|
|
|
static int bwc_handle_data(Messenger *m, uint32_t friend_number, const uint8_t *data, uint16_t length, void *object)
|
|
{
|
|
BWController *bwc = (BWController *)object;
|
|
|
|
if (length - 1 != sizeof(struct BWCMessage)) {
|
|
return -1;
|
|
}
|
|
|
|
size_t offset = 1; // Ignore packet id.
|
|
struct BWCMessage msg;
|
|
offset += net_unpack_u32(data + offset, &msg.lost);
|
|
offset += net_unpack_u32(data + offset, &msg.recv);
|
|
assert(offset == length);
|
|
|
|
return on_update(bwc, &msg);
|
|
}
|