forked from Green-Sky/tomato
Squashed 'external/toxcore/c-toxcore/' changes from 8f0d505f9a..6d634674a9
6d634674a9 cleanup: Remove old type-ordered event getters. d1d48d1dfc feat: add ngc events 994ffecc6b refactor: Make event dispatch ordered by receive time. 812f931d5f fix: Make sure there's enough space for CONSUME1 in fuzzers. 50f1b30fa9 test: Add fuzz tests to the coverage run. df76f5cf47 chore: Move from gcov to llvm source-based coverage. 072e3beb3f fix: issues with packet broadcast error reporting 6b6718e4d2 cleanup: Make group packet entry creation less error-prone 5b9c420ce1 refactor: packet broadcast functions now return errors af4cb31028 refactor: Use `operator==` for equality tests of `Node_format`. 9592d590cf refactor(test): Slightly nicer C++ interface to tox Random. c66e10fb7a refactor: Minor refactoring of get_close_nodes functions. ebc9643862 fix: don't pass garbage data buffer to packet send functions 32b68cffca cleanup: Some more test cleanups, removing overly smart code. 0426624dcb refactor: Assign malloc return to a local variable first. afc38f2458 test: Add more unit tests for `add_to_list`. 05ce5c1ab9 test: Add "infer" CI check to github, remove from circle. REVERT: 8f0d505f9a feat: add ngc events REVERT: 9b8216e70c refactor: Make event dispatch ordered by receive time. git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: 6d634674a929edb0ab70689dcbcb195b3547be13
This commit is contained in:
@ -339,6 +339,31 @@ int gca_unpack_announces_list(const Logger *log, const uint8_t *data, uint16_t l
|
||||
return announces_count;
|
||||
}
|
||||
|
||||
non_null()
|
||||
static GC_Announces *gca_new_announces(
|
||||
GC_Announces_List *gc_announces_list,
|
||||
const GC_Public_Announce *public_announce)
|
||||
{
|
||||
GC_Announces *announces = (GC_Announces *)calloc(1, sizeof(GC_Announces));
|
||||
|
||||
if (announces == nullptr) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
announces->index = 0;
|
||||
announces->prev_announce = nullptr;
|
||||
|
||||
if (gc_announces_list->root_announces != nullptr) {
|
||||
gc_announces_list->root_announces->prev_announce = announces;
|
||||
}
|
||||
|
||||
announces->next_announce = gc_announces_list->root_announces;
|
||||
gc_announces_list->root_announces = announces;
|
||||
memcpy(announces->chat_id, public_announce->chat_public_key, CHAT_ID_SIZE);
|
||||
|
||||
return announces;
|
||||
}
|
||||
|
||||
GC_Peer_Announce *gca_add_announce(const Mono_Time *mono_time, GC_Announces_List *gc_announces_list,
|
||||
const GC_Public_Announce *public_announce)
|
||||
{
|
||||
@ -350,22 +375,11 @@ GC_Peer_Announce *gca_add_announce(const Mono_Time *mono_time, GC_Announces_List
|
||||
|
||||
// No entry for this chat_id exists so we create one
|
||||
if (announces == nullptr) {
|
||||
announces = (GC_Announces *)calloc(1, sizeof(GC_Announces));
|
||||
announces = gca_new_announces(gc_announces_list, public_announce);
|
||||
|
||||
if (announces == nullptr) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
announces->index = 0;
|
||||
announces->prev_announce = nullptr;
|
||||
|
||||
if (gc_announces_list->root_announces != nullptr) {
|
||||
gc_announces_list->root_announces->prev_announce = announces;
|
||||
}
|
||||
|
||||
announces->next_announce = gc_announces_list->root_announces;
|
||||
gc_announces_list->root_announces = announces;
|
||||
memcpy(announces->chat_id, public_announce->chat_public_key, CHAT_ID_SIZE);
|
||||
}
|
||||
|
||||
const uint64_t cur_time = mono_time_get(mono_time);
|
||||
@ -396,8 +410,7 @@ bool gca_is_valid_announce(const GC_Announce *announce)
|
||||
|
||||
GC_Announces_List *new_gca_list(void)
|
||||
{
|
||||
GC_Announces_List *announces_list = (GC_Announces_List *)calloc(1, sizeof(GC_Announces_List));
|
||||
return announces_list;
|
||||
return (GC_Announces_List *)calloc(1, sizeof(GC_Announces_List));
|
||||
}
|
||||
|
||||
void kill_gca(GC_Announces_List *announces_list)
|
||||
|
Reference in New Issue
Block a user