StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

This is a combination of 11 commits.

Browse Source 
The first commit's message is:
TOX_STATUS -> TOX_USER_STATUS, is more specific

  This is the 2nd commit message:

I pretty strongly believe tox_iteration needs to be renamed to a verb

There are several other noun functions in the API, but none of them *do* things.
I think even tox_do is better than tox_iteration.

tox_do_interval is one possibility, but I'm open to suggestions.

  This is the 3rd commit message:

private_key -> secret_key

This is more consistent with modern/NaCl/elliptic cryptography, and also "pk", meaning public key, is all over other toxcore code and documentation. This will eliminate ambiguity.

  This is the 4th commit message:

Rename some functions for pseudo-namespace consistency

The enum change results in long enum types, but I think consistency trumps
having a few less characters.

  This is the 5th commit message:

TOX_FILE_KIND -> TOX_FILE_TYPE

This is more of an English thing than a consistency thing, but
TOX_FILE_KIND sounds funnier/stranger to me than TOX_FILE_TYPE.

  This is the 6th commit message:

More specific file control function names

  This is the 7th commit message:

Rename custom packet functions for pseudo-namespace consistency

This also has the issue with long enums... but I still think consistent enum names are better

  This is the 8th commit message:

Rename functions for pseudo-namespace consistency

  This is the 9th commit message:

Consistency with https://github.com/sonOfRa/tox4j/blob/master/doc/core-design.md#naming-conventions and the rest of the api

  This is the 10th commit message:

Fix errors in previous function rename commits

  This is the 11th commit message:

Shorten one error enum name
This commit is contained in:
Dubslow 2015-02-28 15:26:19 -06:00
parent 43fe6e71bd
commit 91274495bc
No known key found for this signature in database
GPG Key ID: 3DB8E05315C220AA
2 changed files with 95 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
toxcore/tox.c
View File

@ -411,13 +411,13 @@ void tox_self_get_status_message(const Tox *tox, uint8_t *status)
}
}
void tox_self_set_status(Tox *tox, TOX_STATUS user_status)
void tox_self_set_status(Tox *tox, TOX_USER_STATUS user_status)
{
Messenger *m = tox;
m_set_userstatus(m, user_status);
}
TOX_STATUS tox_self_get_status(const Tox *tox)
TOX_USER_STATUS tox_self_get_status(const Tox *tox)
{
const Messenger *m = tox;
return m_get_self_userstatus(m);
@ -561,7 +561,7 @@ size_t tox_friend_list_size(const Tox *tox)
return count_friendlist(m);
}
void tox_friend_list(const Tox *tox, uint32_t *list)
void tox_friend_get_list(const Tox *tox, uint32_t *list)
{
if (list) {
const Messenger *m = tox;
@ -650,7 +650,7 @@ void tox_callback_friend_status_message(Tox *tox, tox_friend_status_message_cb *
m_callback_statusmessage(m, function, user_data);
}
TOX_STATUS tox_friend_get_status(const Tox *tox, uint32_t friend_number, TOX_ERR_FRIEND_QUERY *error)
TOX_USER_STATUS tox_friend_get_status(const Tox *tox, uint32_t friend_number, TOX_ERR_FRIEND_QUERY *error)
{
const Messenger *m = tox;
@ -658,7 +658,7 @@ TOX_STATUS tox_friend_get_status(const Tox *tox, uint32_t friend_number, TOX_ERR
if (ret == USERSTATUS_INVALID) {
SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_QUERY_FRIEND_NOT_FOUND);
return TOX_STATUS_INVALID;
return TOX_USER_STATUS_INVALID;
}
SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_QUERY_OK);
@ -725,41 +725,41 @@ bool tox_self_set_typing(Tox *tox, uint32_t friend_number, bool is_typing, TOX_E
return 1;
}
static void set_message_error(int ret, TOX_ERR_SEND_MESSAGE *error)
static void set_message_error(int ret, TOX_ERR_FRIEND_SEND_MESSAGE *error)
{
switch (ret) {
case 0:
SET_ERROR_PARAMETER(error, TOX_ERR_SEND_MESSAGE_OK);
SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_SEND_MESSAGE_OK);
break;
case -1:
SET_ERROR_PARAMETER(error, TOX_ERR_SEND_MESSAGE_FRIEND_NOT_FOUND);
SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_SEND_MESSAGE_FRIEND_NOT_FOUND);
break;
case -2:
SET_ERROR_PARAMETER(error, TOX_ERR_SEND_MESSAGE_TOO_LONG);
SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_SEND_MESSAGE_TOO_LONG);
break;
case -3:
SET_ERROR_PARAMETER(error, TOX_ERR_SEND_MESSAGE_FRIEND_NOT_CONNECTED);
SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_SEND_MESSAGE_FRIEND_NOT_CONNECTED);
break;
case -4:
SET_ERROR_PARAMETER(error, TOX_ERR_SEND_MESSAGE_SENDQ);
SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_SEND_MESSAGE_SENDQ);
break;
}
}
uint32_t tox_send_message(Tox *tox, uint32_t friend_number, const uint8_t *message, size_t length,
TOX_ERR_SEND_MESSAGE *error)
uint32_t tox_friend_send_message(Tox *tox, uint32_t friend_number, const uint8_t *message, size_t length,
TOX_ERR_FRIEND_SEND_MESSAGE *error)
{
if (!message) {
SET_ERROR_PARAMETER(error, TOX_ERR_SEND_MESSAGE_NULL);
SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_SEND_MESSAGE_NULL);
return 0;
}
if (!length) {
SET_ERROR_PARAMETER(error, TOX_ERR_SEND_MESSAGE_EMPTY);
SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_SEND_MESSAGE_EMPTY);
return 0;
}
@ -769,16 +769,16 @@ uint32_t tox_send_message(Tox *tox, uint32_t friend_number, const uint8_t *messa
return message_id;
}
uint32_t tox_send_action(Tox *tox, uint32_t friend_number, const uint8_t *action, size_t length,
TOX_ERR_SEND_MESSAGE *error)
uint32_t tox_friend_send_action(Tox *tox, uint32_t friend_number, const uint8_t *action, size_t length,
TOX_ERR_FRIEND_SEND_MESSAGE *error)
{
if (!action) {
SET_ERROR_PARAMETER(error, TOX_ERR_SEND_MESSAGE_NULL);
SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_SEND_MESSAGE_NULL);
return 0;
}
if (!length) {
SET_ERROR_PARAMETER(error, TOX_ERR_SEND_MESSAGE_EMPTY);
SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_SEND_MESSAGE_EMPTY);
return 0;
}
@ -788,7 +788,7 @@ uint32_t tox_send_action(Tox *tox, uint32_t friend_number, const uint8_t *action
return message_id;
}
void tox_callback_read_receipt(Tox *tox, tox_read_receipt_cb *function, void *user_data)
void tox_callback_friend_read_receipt(Tox *tox, tox_friend_read_receipt_cb *function, void *user_data)
{
Messenger *m = tox;
m_callback_read_receipt(m, function, user_data);
@ -871,13 +871,13 @@ bool tox_file_control(Tox *tox, uint32_t friend_number, uint32_t file_number, TO
return 0;
}
void tox_callback_file_control(Tox *tox, tox_file_control_cb *function, void *user_data)
void tox_callback_file_recv_control(Tox *tox, tox_file_recv_control_cb *function, void *user_data)
{
Messenger *m = tox;
callback_file_control(m, function, user_data);
}
uint32_t tox_file_send(Tox *tox, uint32_t friend_number, TOX_FILE_KIND kind, uint64_t file_size,
uint32_t tox_file_send(Tox *tox, uint32_t friend_number, TOX_FILE_TYPE kind, uint64_t file_size,
const uint8_t *filename, size_t filename_length, TOX_ERR_FILE_SEND *error)
{
if (!filename) {
@ -979,52 +979,52 @@ void tox_callback_file_receive_chunk(Tox *tox, tox_file_receive_chunk_cb *functi
callback_file_data(m, function, user_data);
}
static void set_custom_packet_error(int ret, TOX_ERR_SEND_CUSTOM_PACKET *error)
static void set_custom_packet_error(int ret, TOX_ERR_FRIEND_CUSTOM_PACKET *error)
{
switch (ret) {
case 0:
SET_ERROR_PARAMETER(error, TOX_ERR_SEND_CUSTOM_PACKET_OK);
SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_CUSTOM_PACKET_OK);
break;
case -1:
SET_ERROR_PARAMETER(error, TOX_ERR_SEND_CUSTOM_PACKET_FRIEND_NOT_FOUND);
SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_CUSTOM_PACKET_FRIEND_NOT_FOUND);
break;
case -2:
SET_ERROR_PARAMETER(error, TOX_ERR_SEND_CUSTOM_PACKET_TOO_LONG);
SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_CUSTOM_PACKET_TOO_LONG);
break;
case -3:
SET_ERROR_PARAMETER(error, TOX_ERR_SEND_CUSTOM_PACKET_INVALID);
SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_CUSTOM_PACKET_INVALID);
break;
case -4:
SET_ERROR_PARAMETER(error, TOX_ERR_SEND_CUSTOM_PACKET_FRIEND_NOT_CONNECTED);
SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_CUSTOM_PACKET_FRIEND_NOT_CONNECTED);
break;
case -5:
SET_ERROR_PARAMETER(error, TOX_ERR_SEND_CUSTOM_PACKET_SENDQ);
SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_CUSTOM_PACKET_SENDQ);
break;
}
}
bool tox_send_lossy_packet(Tox *tox, uint32_t friend_number, const uint8_t *data, size_t length,
TOX_ERR_SEND_CUSTOM_PACKET *error)
bool tox_friend_send_lossy_packet(Tox *tox, uint32_t friend_number, const uint8_t *data, size_t length,
TOX_ERR_FRIEND_CUSTOM_PACKET *error)
{
if (!data) {
SET_ERROR_PARAMETER(error, TOX_ERR_SEND_CUSTOM_PACKET_NULL);
SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_CUSTOM_PACKET_NULL);
return 0;
}
Messenger *m = tox;
if (length == 0) {
SET_ERROR_PARAMETER(error, TOX_ERR_SEND_CUSTOM_PACKET_EMPTY);
SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_CUSTOM_PACKET_EMPTY);
return 0;
}
if (data[0] < (PACKET_ID_LOSSY_RANGE_START + PACKET_LOSSY_AV_RESERVED)) {
SET_ERROR_PARAMETER(error, TOX_ERR_SEND_CUSTOM_PACKET_INVALID);
SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_CUSTOM_PACKET_INVALID);
return 0;
}
@ -1045,18 +1045,18 @@ void tox_callback_friend_lossy_packet(Tox *tox, tox_friend_lossy_packet_cb *func
custom_lossy_packet_registerhandler(m, function, user_data);
}
bool tox_send_lossless_packet(Tox *tox, uint32_t friend_number, const uint8_t *data, size_t length,
TOX_ERR_SEND_CUSTOM_PACKET *error)
bool tox_friend_send_lossless_packet(Tox *tox, uint32_t friend_number, const uint8_t *data, size_t length,
TOX_ERR_FRIEND_CUSTOM_PACKET *error)
{
if (!data) {
SET_ERROR_PARAMETER(error, TOX_ERR_SEND_CUSTOM_PACKET_NULL);
SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_CUSTOM_PACKET_NULL);
return 0;
}
Messenger *m = tox;
if (length == 0) {
SET_ERROR_PARAMETER(error, TOX_ERR_SEND_CUSTOM_PACKET_EMPTY);
SET_ERROR_PARAMETER(error, TOX_ERR_FRIEND_CUSTOM_PACKET_EMPTY);
return 0;
}

114
toxcore/tox.h
View File

@ -260,26 +260,26 @@ bool tox_version_is_compatible(uint32_t major, uint32_t minor, uint32_t patch);
/**
* Represents the possible statuses a client can have.
*/
typedef enum TOX_STATUS {
typedef enum TOX_USER_STATUS {
/**
* User is online and available.
*/
TOX_STATUS_NONE,
TOX_USER_STATUS_NONE,
/**
* User is away. Clients can set this e.g. after a user defined
* inactivity time.
*/
TOX_STATUS_AWAY,
TOX_USER_STATUS_AWAY,
/**
* User is busy. Signals to other clients that this client does not
* currently wish to communicate.
*/
TOX_STATUS_BUSY,
TOX_USER_STATUS_BUSY,
/**
* Invalid status used when function returns an error.
*/
TOX_STATUS_INVALID
} TOX_STATUS;
TOX_USER_STATUS_INVALID
} TOX_USER_STATUS;
/*******************************************************************************
@ -652,7 +652,7 @@ uint32_t tox_iteration_interval(const Tox *tox);
* The main loop that needs to be run in intervals of tox_iteration_interval()
* milliseconds.
*/
void tox_iteration(Tox *tox);
void tox_do_iteration(Tox *tox);
/*******************************************************************************
@ -695,12 +695,12 @@ uint32_t tox_self_get_nospam(const Tox *tox);
void tox_self_get_public_key(const Tox *tox, uint8_t *public_key);
/**
* Copy the private key from the Tox object.
* Copy the secret key from the Tox object.
*
* @param private_key A memory region of at least TOX_PUBLIC_KEY_SIZE bytes. If
* @param secret_key A memory region of at least TOX_PUBLIC_KEY_SIZE bytes. If
* this parameter is NULL, this function has no effect.
*/
void tox_self_get_private_key(const Tox *tox, uint8_t *private_key);
void tox_self_get_secret_key(const Tox *tox, uint8_t *secret_key);
/*******************************************************************************
@ -801,12 +801,12 @@ void tox_self_get_status_message(const Tox *tox, uint8_t *status);
*
* @param user_status One of the user statuses listed in the enumeration above.
*/
void tox_self_set_status(Tox *tox, TOX_STATUS user_status);
void tox_self_set_status(Tox *tox, TOX_USER_STATUS user_status);
/**
* Returns the client's user status.
*/
TOX_STATUS tox_self_get_status(const Tox *tox);
TOX_USER_STATUS tox_self_get_status(const Tox *tox);
/*******************************************************************************
@ -992,7 +992,7 @@ size_t tox_friend_list_size(const Tox *tox);
* @param list A memory region with enough space to hold the friend list. If
* this parameter is NULL, this function has no effect.
*/
void tox_friend_list(const Tox *tox, uint32_t *list);
void tox_friend_get_list(const Tox *tox, uint32_t *list);
@ -1114,7 +1114,7 @@ void tox_callback_friend_status_message(Tox *tox, tox_friend_status_message_cb *
* The status returned is equal to the last status received through the
* `friend_status` callback.
*/
TOX_STATUS tox_friend_get_status(const Tox *tox, uint32_t friend_number, TOX_ERR_FRIEND_QUERY *error);
TOX_USER_STATUS tox_friend_get_status(const Tox *tox, uint32_t friend_number, TOX_ERR_FRIEND_QUERY *error);
/**
* The function type for the `friend_status` callback.
@ -1123,7 +1123,7 @@ TOX_STATUS tox_friend_get_status(const Tox *tox, uint32_t friend_number, TOX_ERR
* changed.
* @param status The new user status.
*/
typedef void tox_friend_status_cb(Tox *tox, uint32_t friend_number, TOX_STATUS status, void *user_data);
typedef void tox_friend_status_cb(Tox *tox, uint32_t friend_number, TOX_USER_STATUS status, void *user_data);
/**
* Set the callback for the `friend_status` event. Pass NULL to unset.
@ -1228,30 +1228,30 @@ typedef enum TOX_ERR_SET_TYPING {
bool tox_self_set_typing(Tox *tox, uint32_t friend_number, bool is_typing, TOX_ERR_SET_TYPING *error);
typedef enum TOX_ERR_SEND_MESSAGE {
TOX_ERR_SEND_MESSAGE_OK,
TOX_ERR_SEND_MESSAGE_NULL,
typedef enum TOX_ERR_FRIEND_SEND_MESSAGE {
TOX_ERR_FRIEND_SEND_MESSAGE_OK,
TOX_ERR_FRIEND_SEND_MESSAGE_NULL,
/**
* The friend number did not designate a valid friend.
*/
TOX_ERR_SEND_MESSAGE_FRIEND_NOT_FOUND,
TOX_ERR_FRIEND_SEND_MESSAGE_FRIEND_NOT_FOUND,
/**
* This client is currently not connected to the friend.
*/
TOX_ERR_SEND_MESSAGE_FRIEND_NOT_CONNECTED,
TOX_ERR_FRIEND_SEND_MESSAGE_FRIEND_NOT_CONNECTED,
/**
* An allocation error occurred while increasing the send queue size.
*/
TOX_ERR_SEND_MESSAGE_SENDQ,
TOX_ERR_FRIEND_SEND_MESSAGE_SENDQ,
/**
* Message length exceeded TOX_MAX_MESSAGE_LENGTH.
*/
TOX_ERR_SEND_MESSAGE_TOO_LONG,
TOX_ERR_FRIEND_SEND_MESSAGE_TOO_LONG,
/**
* Attempted to send a zero-length message.
*/
TOX_ERR_SEND_MESSAGE_EMPTY
} TOX_ERR_SEND_MESSAGE;
TOX_ERR_FRIEND_SEND_MESSAGE_EMPTY
} TOX_ERR_FRIEND_SEND_MESSAGE;
/**
* Send a text chat message to an online friend.
@ -1270,8 +1270,8 @@ typedef enum TOX_ERR_SEND_MESSAGE {
* incremented by 1 each time a message is sent. If UINT32_MAX messages were
* sent, the next message ID is 0.
*/
uint32_t tox_send_message(Tox *tox, uint32_t friend_number, const uint8_t *message, size_t length,
TOX_ERR_SEND_MESSAGE *error);
uint32_t tox_friend_send_message(Tox *tox, uint32_t friend_number, const uint8_t *message, size_t length,
TOX_ERR_FRIEND_SEND_MESSAGE *error);
/**
@ -1283,10 +1283,10 @@ uint32_t tox_send_message(Tox *tox, uint32_t friend_number, const uint8_t *messa
* means that sending a message will cause the next message ID from sending an
* action will be incremented.
*
* @see tox_send_message for more details.
* @see tox_friend_send_message for more details.
*/
uint32_t tox_send_action(Tox *tox, uint32_t friend_number, const uint8_t *action, size_t length,
TOX_ERR_SEND_MESSAGE *error);
uint32_t tox_friend_send_action(Tox *tox, uint32_t friend_number, const uint8_t *action, size_t length,
TOX_ERR_FRIEND_SEND_MESSAGE *error);
/**
@ -1296,7 +1296,7 @@ uint32_t tox_send_action(Tox *tox, uint32_t friend_number, const uint8_t *action
* @param message_id The message ID as returned from tox_send_message or
* tox_send_action corresponding to the message sent.
*/
typedef void tox_read_receipt_cb(Tox *tox, uint32_t friend_number, uint32_t message_id, void *user_data);
typedef void tox_friend_read_receipt_cb(Tox *tox, uint32_t friend_number, uint32_t message_id, void *user_data);
/**
* Set the callback for the `read_receipt` event. Pass NULL to unset.
@ -1307,7 +1307,7 @@ typedef void tox_read_receipt_cb(Tox *tox, uint32_t friend_number, uint32_t mess
* received here may not correspond to any message sent through tox_send_message
* or tox_send_action. In that case, the receipt should be discarded.
*/
void tox_callback_read_receipt(Tox *tox, tox_read_receipt_cb *function, void *user_data);
void tox_callback_friend_read_receipt(Tox *tox, tox_friend_read_receipt_cb *function, void *user_data);
/*******************************************************************************
@ -1390,12 +1390,12 @@ void tox_callback_friend_action(Tox *tox, tox_friend_action_cb *function, void *
******************************************************************************/
typedef enum TOX_FILE_KIND {
typedef enum TOX_FILE_TYPE {
/**
* Arbitrary file data. Clients can choose to handle it based on the file name
* or magic or any other way they choose.
*/
TOX_FILE_KIND_DATA,
TOX_FILE_TYPE_DATA,
/**
* Avatar data. This consists of tox_hash(image) + image.
*
@ -1412,8 +1412,8 @@ typedef enum TOX_FILE_KIND {
* saved hash and send TOX_FILE_CONTROL_CANCEL to terminate the avatar
* transfer if it matches.
*/
TOX_FILE_KIND_AVATAR
} TOX_FILE_KIND;
TOX_FILE_TYPE_AVATAR
} TOX_FILE_TYPE;
/**
@ -1502,7 +1502,7 @@ typedef enum TOX_ERR_FILE_CONTROL {
*
* @return true on success.
*/
bool tox_file_control(Tox *tox, uint32_t friend_number, uint32_t file_number, TOX_FILE_CONTROL control,
bool tox_file_send_control(Tox *tox, uint32_t friend_number, uint32_t file_number, TOX_FILE_CONTROL control,
TOX_ERR_FILE_CONTROL *error);
@ -1517,7 +1517,7 @@ bool tox_file_control(Tox *tox, uint32_t friend_number, uint32_t file_number, TO
* associated with.
* @param control The file control command received.
*/
typedef void tox_file_control_cb(Tox *tox, uint32_t friend_number, uint32_t file_number, TOX_FILE_CONTROL control,
typedef void tox_file_recv_control_cb(Tox *tox, uint32_t friend_number, uint32_t file_number, TOX_FILE_CONTROL control,
void *user_data);
/**
@ -1526,7 +1526,7 @@ typedef void tox_file_control_cb(Tox *tox, uint32_t friend_number, uint32_t file
* This event is triggered when a file control command is received from a
* friend.
*/
void tox_callback_file_control(Tox *tox, tox_file_control_cb *function, void *user_data);
void tox_callback_file_recv_control(Tox *tox, tox_file_recv_control_cb *function, void *user_data);
/*******************************************************************************
@ -1618,7 +1618,7 @@ typedef enum TOX_ERR_FILE_SEND {
* number is per friend. File numbers are reused after a transfer terminates.
* on failure, this function returns UINT32_MAX.
*/
uint32_t tox_file_send(Tox *tox, uint32_t friend_number, TOX_FILE_KIND kind, uint64_t file_size,
uint32_t tox_file_send(Tox *tox, uint32_t friend_number, TOX_FILE_TYPE kind, uint64_t file_size,
const uint8_t *filename, size_t filename_length, TOX_ERR_FILE_SEND *error);
@ -1731,7 +1731,7 @@ void tox_callback_file_request_chunk(Tox *tox, tox_file_request_chunk_cb *functi
* @param file_number The friend-specific file number the data received is
* associated with.
*/
typedef void tox_file_receive_cb(Tox *tox, uint32_t friend_number, uint32_t file_number, TOX_FILE_KIND kind,
typedef void tox_file_receive_cb(Tox *tox, uint32_t friend_number, uint32_t file_number, TOX_FILE_TYPE kind,
uint64_t file_size, const uint8_t *filename, size_t filename_length, void *user_data);
/**
@ -1794,35 +1794,35 @@ void tox_callback_file_receive_chunk(Tox *tox, tox_file_receive_chunk_cb *functi
******************************************************************************/
typedef enum TOX_ERR_SEND_CUSTOM_PACKET {
TOX_ERR_SEND_CUSTOM_PACKET_OK,
TOX_ERR_SEND_CUSTOM_PACKET_NULL,
typedef enum TOX_ERR_FRIEND_CUSTOM_PACKET {
TOX_ERR_FRIEND_CUSTOM_PACKET_OK,
TOX_ERR_FRIEND_CUSTOM_PACKET_NULL,
/**
* The friend number did not designate a valid friend.
*/
TOX_ERR_SEND_CUSTOM_PACKET_FRIEND_NOT_FOUND,
TOX_ERR_FRIEND_CUSTOM_PACKET_FRIEND_NOT_FOUND,
/**
* This client is currently not connected to the friend.
*/
TOX_ERR_SEND_CUSTOM_PACKET_FRIEND_NOT_CONNECTED,
TOX_ERR_FRIEND_CUSTOM_PACKET_FRIEND_NOT_CONNECTED,
/**
* The first byte of data was not in the specified range for the packet type.
* This range is 200-254 for lossy, and 160-191 for lossless packets.
*/
TOX_ERR_SEND_CUSTOM_PACKET_INVALID,
TOX_ERR_FRIEND_CUSTOM_PACKET_INVALID,
/**
* Attempted to send an empty packet.
*/
TOX_ERR_SEND_CUSTOM_PACKET_EMPTY,
TOX_ERR_FRIEND_CUSTOM_PACKET_EMPTY,
/**
* Packet data length exceeded TOX_MAX_CUSTOM_PACKET_SIZE.
*/
TOX_ERR_SEND_CUSTOM_PACKET_TOO_LONG,
TOX_ERR_FRIEND_CUSTOM_PACKET_TOO_LONG,
/**
* Send queue size exceeded.
*/
TOX_ERR_SEND_CUSTOM_PACKET_SENDQ
} TOX_ERR_SEND_CUSTOM_PACKET;
TOX_ERR_FRIEND_CUSTOM_PACKET_SENDQ
} TOX_ERR_FRIEND_CUSTOM_PACKET;
/**
@ -1845,8 +1845,8 @@ typedef enum TOX_ERR_SEND_CUSTOM_PACKET {
*
* @return true on success.
*/
bool tox_send_lossy_packet(Tox *tox, uint32_t friend_number, const uint8_t *data, size_t length,
TOX_ERR_SEND_CUSTOM_PACKET *error);
bool tox_friend_send_lossy_packet(Tox *tox, uint32_t friend_number, const uint8_t *data, size_t length,
TOX_ERR_FRIEND_CUSTOM_PACKET *error);
/**
* The function type for the `friend_lossy_packet` callback.
@ -1880,8 +1880,8 @@ void tox_callback_friend_lossy_packet(Tox *tox, tox_friend_lossy_packet_cb *func
*
* @return true on success.
*/
bool tox_send_lossless_packet(Tox *tox, uint32_t friend_number, const uint8_t *data, size_t length,
TOX_ERR_SEND_CUSTOM_PACKET *error);
bool tox_friend_send_lossless_packet(Tox *tox, uint32_t friend_number, const uint8_t *data, size_t length,
TOX_ERR_FRIEND_CUSTOM_PACKET *error);
/**
* The function type for the `friend_lossless_packet` callback.
@ -1919,7 +1919,7 @@ void tox_callback_friend_lossless_packet(Tox *tox, tox_friend_lossless_packet_cb
* @param dht_id A memory region of at least TOX_PUBLIC_KEY_SIZE bytes. If this
* parameter is NULL, this function has no effect.
*/
void tox_get_dht_id(const Tox *tox, uint8_t *dht_id);
void tox_self_get_dht_id(const Tox *tox, uint8_t *dht_id);
typedef enum TOX_ERR_GET_PORT {
@ -1933,13 +1933,13 @@ typedef enum TOX_ERR_GET_PORT {
/**
* Return the UDP port this Tox instance is bound to.
*/
uint16_t tox_get_udp_port(const Tox *tox, TOX_ERR_GET_PORT *error);
uint16_t tox_self_get_udp_port(const Tox *tox, TOX_ERR_GET_PORT *error);
/**
* Return the TCP port this Tox instance is bound to. This is only relevant if
* the instance is acting as a TCP relay.
*/
uint16_t tox_get_tcp_port(const Tox *tox, TOX_ERR_GET_PORT *error);
uint16_t tox_self_get_tcp_port(const Tox *tox, TOX_ERR_GET_PORT *error);
#include "tox_old.h"