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:
@ -71,22 +71,22 @@ static uint8_t *read_save(const char *save_path, size_t *length)
|
||||
|
||||
static void test_save_compatibility(const char *save_path)
|
||||
{
|
||||
struct Tox_Options options = {0};
|
||||
tox_options_default(&options);
|
||||
Tox_Options *options = tox_options_new(nullptr);
|
||||
ck_assert(options != nullptr);
|
||||
|
||||
size_t size = 0;
|
||||
uint8_t *save_data = read_save(save_path, &size);
|
||||
ck_assert_msg(save_data != nullptr, "error while reading save file '%s'", save_path);
|
||||
|
||||
options.savedata_data = save_data;
|
||||
options.savedata_length = size;
|
||||
options.savedata_type = TOX_SAVEDATA_TYPE_TOX_SAVE;
|
||||
tox_options_set_savedata_type(options, TOX_SAVEDATA_TYPE_TOX_SAVE);
|
||||
tox_options_set_savedata_data(options, save_data, size);
|
||||
|
||||
size_t index = 0;
|
||||
Tox_Err_New err;
|
||||
Tox *tox = tox_new_log(&options, &err, &index);
|
||||
Tox *tox = tox_new_log(options, &err, &index);
|
||||
ck_assert_msg(tox, "failed to create tox, error number: %d", err);
|
||||
|
||||
tox_options_free(options);
|
||||
free(save_data);
|
||||
|
||||
const size_t name_size = tox_self_get_name_size(tox);
|
||||
@ -145,7 +145,10 @@ static bool is_little_endian(void)
|
||||
// cppcheck-suppress constParameter
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
char base_path[4096] = {0};
|
||||
const size_t base_path_size = 4096;
|
||||
char *base_path = (char *)malloc(base_path_size);
|
||||
ck_assert(base_path != nullptr);
|
||||
memset(base_path, 0, 4096);
|
||||
|
||||
if (argc <= 1) {
|
||||
const char *srcdir = getenv("srcdir");
|
||||
@ -154,21 +157,29 @@ int main(int argc, char *argv[])
|
||||
srcdir = ".";
|
||||
}
|
||||
|
||||
snprintf(base_path, sizeof(base_path), "%s", srcdir);
|
||||
snprintf(base_path, base_path_size, "%s", srcdir);
|
||||
} else {
|
||||
snprintf(base_path, sizeof(base_path), "%s", argv[1]);
|
||||
snprintf(base_path, base_path_size, "%s", argv[1]);
|
||||
base_path[strrchr(base_path, '/') - base_path] = '\0';
|
||||
}
|
||||
|
||||
if (is_little_endian()) {
|
||||
char save_path[4096 + sizeof(LOADED_SAVE_FILE_LITTLE)];
|
||||
snprintf(save_path, sizeof(save_path), "%s/%s", base_path, LOADED_SAVE_FILE_LITTLE);
|
||||
const size_t save_path_size = 4096 + sizeof(LOADED_SAVE_FILE_LITTLE);
|
||||
char *save_path = (char *)malloc(save_path_size);
|
||||
ck_assert(save_path != nullptr);
|
||||
snprintf(save_path, save_path_size, "%s/%s", base_path, LOADED_SAVE_FILE_LITTLE);
|
||||
test_save_compatibility(save_path);
|
||||
free(save_path);
|
||||
} else {
|
||||
char save_path[4096 + sizeof(LOADED_SAVE_FILE_BIG)];
|
||||
snprintf(save_path, sizeof(save_path), "%s/%s", base_path, LOADED_SAVE_FILE_BIG);
|
||||
const size_t save_path_size = 4096 + sizeof(LOADED_SAVE_FILE_BIG);
|
||||
char *save_path = (char *)malloc(save_path_size);
|
||||
ck_assert(save_path != nullptr);
|
||||
snprintf(save_path, save_path_size, "%s/%s", base_path, LOADED_SAVE_FILE_BIG);
|
||||
test_save_compatibility(save_path);
|
||||
free(save_path);
|
||||
}
|
||||
|
||||
free(base_path);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user