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-2018 The TokTok team.
|
||||
* Copyright © 2016-2025 The TokTok team.
|
||||
* Copyright © 2013 Tox project.
|
||||
*/
|
||||
|
||||
@ -8,18 +8,22 @@
|
||||
*/
|
||||
#include "friend_requests.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "attributes.h"
|
||||
#include "ccompat.h"
|
||||
#include "crypto_core.h"
|
||||
#include "friend_connection.h"
|
||||
#include "mem.h"
|
||||
#include "network.h"
|
||||
#include "onion.h"
|
||||
#include "onion_announce.h"
|
||||
#include "onion_client.h"
|
||||
|
||||
static_assert(ONION_CLIENT_MAX_DATA_SIZE <= MAX_DATA_REQUEST_SIZE, "ONION_CLIENT_MAX_DATA_SIZE is too big");
|
||||
static_assert(MAX_DATA_REQUEST_SIZE <= ONION_MAX_DATA_SIZE, "MAX_DATA_REQUEST_SIZE is too big");
|
||||
static_assert(SIZE_IPPORT <= ONION_SEND_BASE, "IP_Port does not fit in the onion packet");
|
||||
|
||||
/**
|
||||
* NOTE: The following is just a temporary fix for the multiple friend requests received at the same time problem.
|
||||
* TODO(irungentoo): Make this better (This will most likely tie in with the way we will handle spam).
|
||||
@ -32,6 +36,8 @@ struct Received_Requests {
|
||||
};
|
||||
|
||||
struct Friend_Requests {
|
||||
const Memory *mem;
|
||||
|
||||
uint32_t nospam;
|
||||
fr_friend_request_cb *handle_friendrequest;
|
||||
uint8_t handle_friendrequest_isset;
|
||||
@ -164,12 +170,24 @@ void friendreq_init(Friend_Requests *fr, Friend_Connections *fr_c)
|
||||
set_friend_request_callback(fr_c, &friendreq_handlepacket, fr);
|
||||
}
|
||||
|
||||
Friend_Requests *friendreq_new(void)
|
||||
Friend_Requests *friendreq_new(const Memory *mem)
|
||||
{
|
||||
return (Friend_Requests *)calloc(1, sizeof(Friend_Requests));
|
||||
Friend_Requests *fr = (Friend_Requests *)mem_alloc(mem, sizeof(Friend_Requests));
|
||||
|
||||
if (fr == nullptr) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
fr->mem = mem;
|
||||
|
||||
return fr;
|
||||
}
|
||||
|
||||
void friendreq_kill(Friend_Requests *fr)
|
||||
{
|
||||
free(fr);
|
||||
if (fr == nullptr) {
|
||||
return;
|
||||
}
|
||||
|
||||
mem_delete(fr->mem, fr);
|
||||
}
|
||||
|
Reference in New Issue
Block a user