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
207 lines
4.7 KiB
C
207 lines
4.7 KiB
C
/* SPDX-License-Identifier: GPL-3.0-or-later
|
|
* Copyright © 2022 The TokTok team.
|
|
*/
|
|
|
|
#include "bin_unpack.h"
|
|
|
|
#include <assert.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "../third_party/cmp/cmp.h"
|
|
#include "attributes.h"
|
|
#include "ccompat.h"
|
|
|
|
struct Bin_Unpack {
|
|
const uint8_t *bytes;
|
|
uint32_t bytes_size;
|
|
cmp_ctx_t ctx;
|
|
};
|
|
|
|
non_null()
|
|
static bool buf_reader(cmp_ctx_t *ctx, void *data, size_t limit)
|
|
{
|
|
uint8_t *bytes = (uint8_t *)data;
|
|
Bin_Unpack *reader = (Bin_Unpack *)ctx->buf;
|
|
assert(reader != nullptr && reader->bytes != nullptr);
|
|
if (limit > reader->bytes_size) {
|
|
return false;
|
|
}
|
|
memcpy(bytes, reader->bytes, limit);
|
|
reader->bytes += limit;
|
|
reader->bytes_size -= limit;
|
|
return true;
|
|
}
|
|
|
|
non_null()
|
|
static bool buf_skipper(cmp_ctx_t *ctx, size_t count)
|
|
{
|
|
Bin_Unpack *reader = (Bin_Unpack *)ctx->buf;
|
|
assert(reader != nullptr && reader->bytes != nullptr);
|
|
if (count > reader->bytes_size) {
|
|
return false;
|
|
}
|
|
reader->bytes += count;
|
|
reader->bytes_size -= count;
|
|
return true;
|
|
}
|
|
|
|
non_null()
|
|
static size_t null_writer(cmp_ctx_t *ctx, const void *data, size_t count)
|
|
{
|
|
assert(count == 0);
|
|
return 0;
|
|
}
|
|
|
|
non_null()
|
|
static void bin_unpack_init(Bin_Unpack *bu, const uint8_t *buf, uint32_t buf_size)
|
|
{
|
|
bu->bytes = buf;
|
|
bu->bytes_size = buf_size;
|
|
cmp_init(&bu->ctx, bu, buf_reader, buf_skipper, null_writer);
|
|
}
|
|
|
|
bool bin_unpack_obj(bin_unpack_cb *callback, void *obj, const uint8_t *buf, uint32_t buf_size)
|
|
{
|
|
Bin_Unpack bu;
|
|
bin_unpack_init(&bu, buf, buf_size);
|
|
return callback(obj, &bu);
|
|
}
|
|
|
|
bool bin_unpack_array(Bin_Unpack *bu, uint32_t *size)
|
|
{
|
|
return cmp_read_array(&bu->ctx, size) && *size <= bu->bytes_size;
|
|
}
|
|
|
|
bool bin_unpack_array_fixed(Bin_Unpack *bu, uint32_t required_size, uint32_t *actual_size)
|
|
{
|
|
uint32_t size = 0;
|
|
const bool success = cmp_read_array(&bu->ctx, &size) && size == required_size;
|
|
if (actual_size != nullptr) {
|
|
*actual_size = size;
|
|
}
|
|
return success;
|
|
}
|
|
|
|
bool bin_unpack_bool(Bin_Unpack *bu, bool *val)
|
|
{
|
|
return cmp_read_bool(&bu->ctx, val);
|
|
}
|
|
|
|
bool bin_unpack_u08(Bin_Unpack *bu, uint8_t *val)
|
|
{
|
|
return cmp_read_uchar(&bu->ctx, val);
|
|
}
|
|
|
|
bool bin_unpack_u16(Bin_Unpack *bu, uint16_t *val)
|
|
{
|
|
return cmp_read_ushort(&bu->ctx, val);
|
|
}
|
|
|
|
bool bin_unpack_u32(Bin_Unpack *bu, uint32_t *val)
|
|
{
|
|
return cmp_read_uint(&bu->ctx, val);
|
|
}
|
|
|
|
bool bin_unpack_u64(Bin_Unpack *bu, uint64_t *val)
|
|
{
|
|
return cmp_read_ulong(&bu->ctx, val);
|
|
}
|
|
|
|
bool bin_unpack_nil(Bin_Unpack *bu)
|
|
{
|
|
return cmp_read_nil(&bu->ctx);
|
|
}
|
|
|
|
bool bin_unpack_bin(Bin_Unpack *bu, uint8_t **data_ptr, uint32_t *data_length_ptr)
|
|
{
|
|
uint32_t bin_size;
|
|
if (!bin_unpack_bin_size(bu, &bin_size) || bin_size > bu->bytes_size) {
|
|
// There aren't as many bytes as this bin claims to want to allocate.
|
|
return false;
|
|
}
|
|
uint8_t *const data = (uint8_t *)malloc(bin_size);
|
|
|
|
if (!bin_unpack_bin_b(bu, data, bin_size)) {
|
|
free(data);
|
|
return false;
|
|
}
|
|
|
|
*data_ptr = data;
|
|
*data_length_ptr = bin_size;
|
|
return true;
|
|
}
|
|
|
|
bool bin_unpack_bin_max(Bin_Unpack *bu, uint8_t *data, uint16_t *data_length_ptr, uint16_t max_data_length)
|
|
{
|
|
uint32_t bin_size;
|
|
if (!bin_unpack_bin_size(bu, &bin_size) || bin_size > max_data_length) {
|
|
return false;
|
|
}
|
|
|
|
*data_length_ptr = bin_size;
|
|
|
|
return bin_unpack_bin_b(bu, data, bin_size);
|
|
}
|
|
|
|
bool bin_unpack_bin_fixed(Bin_Unpack *bu, uint8_t *data, uint32_t data_length)
|
|
{
|
|
uint32_t bin_size;
|
|
if (!bin_unpack_bin_size(bu, &bin_size) || bin_size != data_length) {
|
|
return false;
|
|
}
|
|
|
|
return bin_unpack_bin_b(bu, data, bin_size);
|
|
}
|
|
|
|
bool bin_unpack_bin_size(Bin_Unpack *bu, uint32_t *size)
|
|
{
|
|
return cmp_read_bin_size(&bu->ctx, size);
|
|
}
|
|
|
|
bool bin_unpack_u08_b(Bin_Unpack *bu, uint8_t *val)
|
|
{
|
|
return bin_unpack_bin_b(bu, val, 1);
|
|
}
|
|
|
|
bool bin_unpack_u16_b(Bin_Unpack *bu, uint16_t *val)
|
|
{
|
|
uint8_t hi = 0;
|
|
uint8_t lo = 0;
|
|
if (!(bin_unpack_u08_b(bu, &hi)
|
|
&& bin_unpack_u08_b(bu, &lo))) {
|
|
return false;
|
|
}
|
|
*val = ((uint16_t)hi << 8) | lo;
|
|
return true;
|
|
}
|
|
|
|
bool bin_unpack_u32_b(Bin_Unpack *bu, uint32_t *val)
|
|
{
|
|
uint16_t hi = 0;
|
|
uint16_t lo = 0;
|
|
if (!(bin_unpack_u16_b(bu, &hi)
|
|
&& bin_unpack_u16_b(bu, &lo))) {
|
|
return false;
|
|
}
|
|
*val = ((uint32_t)hi << 16) | lo;
|
|
return true;
|
|
}
|
|
|
|
bool bin_unpack_u64_b(Bin_Unpack *bu, uint64_t *val)
|
|
{
|
|
uint32_t hi = 0;
|
|
uint32_t lo = 0;
|
|
if (!(bin_unpack_u32_b(bu, &hi)
|
|
&& bin_unpack_u32_b(bu, &lo))) {
|
|
return false;
|
|
}
|
|
*val = ((uint64_t)hi << 32) | lo;
|
|
return true;
|
|
}
|
|
|
|
bool bin_unpack_bin_b(Bin_Unpack *bu, uint8_t *data, uint32_t length)
|
|
{
|
|
return bu->ctx.read(&bu->ctx, data, length);
|
|
}
|