cleanup: Move definitions of tox_private.h functions to tox_private.c.

Also moved lock/unlock to tox_private so they can be used across these 2
tox/tox_private translation units.
This commit is contained in:
iphydf 2022-03-30 18:47:20 +00:00
parent 9b2e887826
commit cc0c4a5fe1
No known key found for this signature in database
GPG Key ID: 3855DBA2D74403C9
6 changed files with 302 additions and 283 deletions

View File

@ -284,6 +284,7 @@ set(toxcore_SOURCES ${toxcore_SOURCES}
toxcore/tox_api.c
toxcore/tox.c
toxcore/tox.h
toxcore/tox_private.c
toxcore/tox_private.h)
set(toxcore_API_HEADERS ${toxcore_API_HEADERS} ${toxcore_SOURCE_DIR}/toxcore/tox.h^tox)

View File

@ -569,6 +569,7 @@ cc_library(
srcs = [
"tox.c",
"tox_api.c",
"tox_private.c",
],
hdrs = [
"tox.h",

View File

@ -69,6 +69,7 @@ libtoxcore_la_SOURCES = ../third_party/cmp/cmp.c \
../toxcore/tox_events.c \
../toxcore/tox_unpack.h \
../toxcore/tox_unpack.c \
../toxcore/tox_private.c \
../toxcore/tox_private.h \
../toxcore/tox_struct.h \
../toxcore/tox_api.c \

File diff suppressed because it is too large Load Diff

138
toxcore/tox_private.c Normal file
View File

@ -0,0 +1,138 @@
/* SPDX-License-Identifier: GPL-3.0-or-later
* Copyright © 2016-2022 The TokTok team.
* Copyright © 2013 Tox project.
*/
/**
* The Tox private API (for tests).
*/
#include "tox_private.h"
#include <assert.h>
#include "ccompat.h"
#include "network.h"
#include "tox_struct.h"
#define SET_ERROR_PARAMETER(param, x) \
do { \
if (param != nullptr) { \
*param = x; \
} \
} while (0)
void tox_lock(const Tox *tox)
{
if (tox->mutex != nullptr) {
pthread_mutex_lock(tox->mutex);
}
}
void tox_unlock(const Tox *tox)
{
if (tox->mutex != nullptr) {
pthread_mutex_unlock(tox->mutex);
}
}
void tox_callback_friend_lossy_packet_per_pktid(Tox *tox, tox_friend_lossy_packet_cb *callback, uint8_t pktid)
{
assert(tox != nullptr);
if (pktid >= PACKET_ID_RANGE_LOSSY_START && pktid <= PACKET_ID_RANGE_LOSSY_END) {
tox->friend_lossy_packet_callback_per_pktid[pktid] = callback;
}
}
void tox_callback_friend_lossless_packet_per_pktid(Tox *tox, tox_friend_lossless_packet_cb *callback, uint8_t pktid)
{
assert(tox != nullptr);
if ((pktid >= PACKET_ID_RANGE_LOSSLESS_CUSTOM_START && pktid <= PACKET_ID_RANGE_LOSSLESS_CUSTOM_END)
|| pktid == PACKET_ID_MSI) {
tox->friend_lossless_packet_callback_per_pktid[pktid] = callback;
}
}
void tox_set_av_object(Tox *tox, void *object)
{
assert(tox != nullptr);
tox_lock(tox);
tox->toxav_object = object;
tox_unlock(tox);
}
void *tox_get_av_object(const Tox *tox)
{
assert(tox != nullptr);
tox_lock(tox);
void *object = tox->toxav_object;
tox_unlock(tox);
return object;
}
void tox_callback_dht_get_nodes_response(Tox *tox, tox_dht_get_nodes_response_cb *callback)
{
assert(tox != nullptr);
tox->dht_get_nodes_response_callback = callback;
}
bool tox_dht_get_nodes(const Tox *tox, const uint8_t *public_key, const char *ip, uint16_t port,
const uint8_t *target_public_key, Tox_Err_Dht_Get_Nodes *error)
{
assert(tox != nullptr);
tox_lock(tox);
if (tox->m->options.udp_disabled) {
SET_ERROR_PARAMETER(error, TOX_ERR_DHT_GET_NODES_UDP_DISABLED);
tox_unlock(tox);
return false;
}
if (public_key == nullptr || ip == nullptr || target_public_key == nullptr) {
SET_ERROR_PARAMETER(error, TOX_ERR_DHT_GET_NODES_NULL);
tox_unlock(tox);
return false;
}
if (port == 0) {
SET_ERROR_PARAMETER(error, TOX_ERR_DHT_GET_NODES_BAD_PORT);
tox_unlock(tox);
return false;
}
IP_Port *root;
const int32_t count = net_getipport(ip, &root, TOX_SOCK_DGRAM);
if (count < 1) {
SET_ERROR_PARAMETER(error, TOX_ERR_DHT_GET_NODES_BAD_IP);
net_freeipport(root);
tox_unlock(tox);
return false;
}
bool success = false;
for (int32_t i = 0; i < count; ++i) {
root[i].port = net_htons(port);
if (dht_getnodes(tox->m->dht, &root[i], public_key, target_public_key)) {
success = true;
}
}
tox_unlock(tox);
net_freeipport(root);
if (!success) {
SET_ERROR_PARAMETER(error, TOX_ERR_DHT_GET_NODES_FAIL);
return false;
}
SET_ERROR_PARAMETER(error, TOX_ERR_DHT_GET_NODES_OK);
return true;
}

View File

@ -18,6 +18,9 @@
extern "C" {
#endif
void tox_lock(const Tox *tox);
void tox_unlock(const Tox *tox);
/**
* Set the callback for the `friend_lossy_packet` event for a specific packet ID.
* Pass NULL to unset.
@ -48,26 +51,19 @@ void *tox_get_av_object(const Tox *tox);
*
******************************************************************************/
/**
* The minimum size of an IP string buffer in bytes.
*/
#define TOX_DHT_NODE_IP_STRING_SIZE 96
//!TOKSTYLE-
uint32_t tox_dht_node_ip_string_size(void);
//!TOKSTYLE+
/**
* The size of a DHT node public key in bytes.
*/
#define TOX_DHT_NODE_PUBLIC_KEY_SIZE 32
//!TOKSTYLE-
uint32_t tox_dht_node_public_key_size(void);
//!TOKSTYLE+
/**
* @param public_key The node's public key.