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

Convert core code depending on the api

Browse Source
This commit is contained in:
Dubslow 2015-03-11 17:26:25 -05:00
parent 91274495bc
commit 3bf259f69d
9 changed files with 102 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
auto_tests/tox_test.c
View File

@ -93,13 +93,13 @@ void handle_custom_packet(Tox *m, uint32_t friend_num, const uint8_t *data, size
uint8_t filenum;
uint32_t file_accepted;
uint64_t file_size;
void tox_file_receive(Tox *tox, uint32_t friend_number, uint32_t file_number, TOX_FILE_KIND kind, uint64_t filesize,
void tox_file_receive(Tox *tox, uint32_t friend_number, uint32_t file_number, TOX_FILE_TYPE kind, uint64_t filesize,
const uint8_t *filename, size_t filename_length, void *userdata)
{
if (*((uint32_t *)userdata) != 974536)
return;
if (kind != TOX_FILE_KIND_DATA) {
if (kind != TOX_FILE_TYPE_DATA) {
ck_abort_msg("Bad kind");
return;
}
@ -113,10 +113,10 @@ void tox_file_receive(Tox *tox, uint32_t friend_number, uint32_t file_number, TO
TOX_ERR_FILE_CONTROL error;
if (tox_file_control(tox, friend_number, file_number, TOX_FILE_CONTROL_RESUME, &error)) {
if (tox_file_send_control(tox, friend_number, file_number, TOX_FILE_CONTROL_RESUME, &error)) {
++file_accepted;
} else {
ck_abort_msg("tox_file_control failed. %i", error);
ck_abort_msg("tox_file_send_control failed. %i", error);
}
}
@ -221,7 +221,7 @@ START_TEST(test_one)
{
TOX_ERR_GET_PORT error;
ck_assert_msg(tox_get_udp_port(tox1, &error) == 33445, "First Tox instance did not bind to udp port 33445.\n");
ck_assert_msg(tox_self_get_udp_port(tox1, &error) == 33445, "First Tox instance did not bind to udp port 33445.\n");
ck_assert_msg(error == TOX_ERR_GET_PORT_OK, "wrong error");
}
@ -293,7 +293,7 @@ START_TEST(test_few_clients)
{
TOX_ERR_GET_PORT error;
ck_assert_msg(tox_get_udp_port(tox1, &error) == 33445, "First Tox instance did not bind to udp port 33445.\n");
ck_assert_msg(tox_self_get_udp_port(tox1, &error) == 33445, "First Tox instance did not bind to udp port 33445.\n");
ck_assert_msg(error == TOX_ERR_GET_PORT_OK, "wrong error");
}
@ -309,9 +309,9 @@ START_TEST(test_few_clients)
uint8_t off = 1;
while (1) {
tox_iteration(tox1);
tox_iteration(tox2);
tox_iteration(tox3);
tox_iterate(tox1);
tox_iterate(tox2);
tox_iterate(tox3);
if (tox_get_connection_status(tox1) && tox_get_connection_status(tox2) && tox_get_connection_status(tox3)) {
if (off) {
@ -334,17 +334,17 @@ START_TEST(test_few_clients)
tox_callback_friend_message(tox3, print_message, &to_compare);
uint8_t msgs[TOX_MAX_MESSAGE_LENGTH + 1];
memset(msgs, 'G', sizeof(msgs));
TOX_ERR_SEND_MESSAGE errm;
tox_send_message(tox2, 0, msgs, TOX_MAX_MESSAGE_LENGTH + 1, &errm);
ck_assert_msg(errm == TOX_ERR_SEND_MESSAGE_TOO_LONG, "TOX_MAX_MESSAGE_LENGTH is too small\n");
tox_send_message(tox2, 0, msgs, TOX_MAX_MESSAGE_LENGTH, &errm);
ck_assert_msg(errm == TOX_ERR_SEND_MESSAGE_OK, "TOX_MAX_MESSAGE_LENGTH is too big\n");
TOX_ERR_FRIEND_SEND_MESSAGE errm;
tox_friend_send_message(tox2, 0, msgs, TOX_MAX_MESSAGE_LENGTH + 1, &errm);
ck_assert_msg(errm == TOX_ERR_FRIEND_SEND_MESSAGE_TOO_LONG, "TOX_MAX_MESSAGE_LENGTH is too small\n");
tox_friend_send_message(tox2, 0, msgs, TOX_MAX_MESSAGE_LENGTH, &errm);
ck_assert_msg(errm == TOX_ERR_FRIEND_SEND_MESSAGE_OK, "TOX_MAX_MESSAGE_LENGTH is too big\n");
while (1) {
messages_received = 0;
tox_iteration(tox1);
tox_iteration(tox2);
tox_iteration(tox3);
tox_iterate(tox1);
tox_iterate(tox2);
tox_iterate(tox3);
if (messages_received)
break;
@ -361,9 +361,9 @@ START_TEST(test_few_clients)
while (1) {
name_changes = 0;
tox_iteration(tox1);
tox_iteration(tox2);
tox_iteration(tox3);
tox_iterate(tox1);
tox_iterate(tox2);
tox_iterate(tox3);
if (name_changes)
break;
@ -381,9 +381,9 @@ START_TEST(test_few_clients)
while (1) {
typing_changes = 0;
tox_iteration(tox1);
tox_iteration(tox2);
tox_iteration(tox3);
tox_iterate(tox1);
tox_iterate(tox2);
tox_iterate(tox3);
if (typing_changes == 2)
@ -399,9 +399,9 @@ START_TEST(test_few_clients)
while (1) {
typing_changes = 0;
tox_iteration(tox1);
tox_iteration(tox2);
tox_iteration(tox3);
tox_iterate(tox1);
tox_iterate(tox2);
tox_iterate(tox3);
if (typing_changes == 1)
break;
@ -419,16 +419,16 @@ START_TEST(test_few_clients)
tox_callback_friend_lossless_packet(tox3, &handle_custom_packet, &packet_number);
uint8_t data_c[TOX_MAX_CUSTOM_PACKET_SIZE + 1];
memset(data_c, ((uint8_t)packet_number), sizeof(data_c));
int ret = tox_send_lossless_packet(tox2, 0, data_c, sizeof(data_c), 0);
ck_assert_msg(ret == 0, "tox_send_lossless_packet bigger fail %i", ret);
ret = tox_send_lossless_packet(tox2, 0, data_c, TOX_MAX_CUSTOM_PACKET_SIZE, 0);
ck_assert_msg(ret == 1, "tox_send_lossless_packet fail %i", ret);
int ret = tox_friend_send_lossless_packet(tox2, 0, data_c, sizeof(data_c), 0);
ck_assert_msg(ret == 0, "tox_friend_send_lossless_packet bigger fail %i", ret);
ret = tox_friend_send_lossless_packet(tox2, 0, data_c, TOX_MAX_CUSTOM_PACKET_SIZE, 0);
ck_assert_msg(ret == 1, "tox_friend_send_lossless_packet fail %i", ret);
while (1) {
custom_packet = 0;
tox_iteration(tox1);
tox_iteration(tox2);
tox_iteration(tox3);
tox_iterate(tox1);
tox_iterate(tox2);
tox_iterate(tox3);
if (custom_packet == 1)
break;
@ -441,16 +441,16 @@ START_TEST(test_few_clients)
packet_number = 200;
tox_callback_friend_lossy_packet(tox3, &handle_custom_packet, &packet_number);
memset(data_c, ((uint8_t)packet_number), sizeof(data_c));
ret = tox_send_lossy_packet(tox2, 0, data_c, sizeof(data_c), 0);
ck_assert_msg(ret == 0, "tox_send_lossy_packet bigger fail %i", ret);
ret = tox_send_lossy_packet(tox2, 0, data_c, TOX_MAX_CUSTOM_PACKET_SIZE, 0);
ck_assert_msg(ret == 1, "tox_send_lossy_packet fail %i", ret);
ret = tox_friend_send_lossy_packet(tox2, 0, data_c, sizeof(data_c), 0);
ck_assert_msg(ret == 0, "tox_friend_send_lossy_packet bigger fail %i", ret);
ret = tox_friend_send_lossy_packet(tox2, 0, data_c, TOX_MAX_CUSTOM_PACKET_SIZE, 0);
ck_assert_msg(ret == 1, "tox_friend_send_lossy_packet fail %i", ret);
while (1) {
custom_packet = 0;
tox_iteration(tox1);
tox_iteration(tox2);
tox_iteration(tox3);
tox_iterate(tox1);
tox_iterate(tox2);
tox_iterate(tox3);
if (custom_packet == 1)
break;
@ -463,20 +463,20 @@ START_TEST(test_few_clients)
file_accepted = file_size = file_recv = sendf_ok = size_recv = 0;
long long unsigned int f_time = time(NULL);
tox_callback_file_receive_chunk(tox3, write_file, &to_compare);
tox_callback_file_control(tox2, file_print_control, &to_compare);
tox_callback_file_recv_control(tox2, file_print_control, &to_compare);
tox_callback_file_request_chunk(tox2, tox_file_request_chunk, &to_compare);
tox_callback_file_control(tox3, file_print_control, &to_compare);
tox_callback_file_recv_control(tox3, file_print_control, &to_compare);
tox_callback_file_receive(tox3, tox_file_receive, &to_compare);
uint64_t totalf_size = 100 * 1024 * 1024;
uint32_t fnum = tox_file_send(tox2, 0, TOX_FILE_KIND_DATA, totalf_size, (uint8_t *)"Gentoo.exe", sizeof("Gentoo.exe"),
uint32_t fnum = tox_file_send(tox2, 0, TOX_FILE_TYPE_DATA, totalf_size, (uint8_t *)"Gentoo.exe", sizeof("Gentoo.exe"),
0);
ck_assert_msg(fnum != UINT32_MAX, "tox_new_file_sender fail");
while (1) {
tox_iteration(tox1);
tox_iteration(tox2);
tox_iteration(tox3);
tox_iterate(tox1);
tox_iterate(tox2);
tox_iterate(tox3);
if (file_sending_done) {
if (sendf_ok && file_recv && totalf_size == file_size && size_recv == file_size && sending_pos == size_recv) {
@ -526,7 +526,7 @@ START_TEST(test_many_clients)
{
TOX_ERR_GET_PORT error;
ck_assert_msg(tox_get_udp_port(toxes[0], &error) == 33445, "First Tox instance did not bind to udp port 33445.\n");
ck_assert_msg(tox_self_get_udp_port(toxes[0], &error) == 33445, "First Tox instance did not bind to udp port 33445.\n");
ck_assert_msg(error == TOX_ERR_GET_PORT_OK, "wrong error");
}
@ -573,7 +573,7 @@ loop_top:
}
for (i = 0; i < NUM_TOXES; ++i) {
tox_iteration(toxes[i]);
tox_iterate(toxes[i]);
}
c_sleep(50);
@ -654,7 +654,7 @@ START_TEST(test_many_group)
{
TOX_ERR_GET_PORT error;
ck_assert_msg(tox_get_udp_port(toxes[0], &error) == 33445, "First Tox instance did not bind to udp port 33445.\n");
ck_assert_msg(tox_self_get_udp_port(toxes[0], &error) == 33445, "First Tox instance did not bind to udp port 33445.\n");
ck_assert_msg(error == TOX_ERR_GET_PORT_OK, "wrong error");
}
@ -678,7 +678,7 @@ START_TEST(test_many_group)
break;
for (i = 0; i < NUM_GROUP_TOX; ++i) {
tox_iteration(toxes[i]);
tox_iterate(toxes[i]);
}
c_sleep(50);
@ -696,7 +696,7 @@ START_TEST(test_many_group)
while (1) {
for (i = 0; i < NUM_GROUP_TOX; ++i) {
tox_iteration(toxes[i]);
tox_iterate(toxes[i]);
}
if (!invite_counter) {
@ -734,7 +734,7 @@ START_TEST(test_many_group)
for (j = 0; j < 20; ++j) {
for (i = 0; i < NUM_GROUP_TOX; ++i) {
tox_iteration(toxes[i]);
tox_iterate(toxes[i]);
}
c_sleep(50);
@ -747,7 +747,7 @@ START_TEST(test_many_group)
for (j = 0; j < 10; ++j) {
for (i = 0; i < NUM_GROUP_TOX; ++i) {
tox_iteration(toxes[i]);
tox_iterate(toxes[i]);
}
c_sleep(50);

26
auto_tests/toxav_basic_test.c
View File

@ -232,7 +232,7 @@ void register_callbacks(ToxAv *av, void *data)
*/
#define CALL_AND_START_LOOP(AliceCallType, BobCallType) \
{ int step = 0, running = 1; while (running) {\
tox_iteration(bootstrap_node); tox_iteration(Alice); tox_iteration(Bob); \
tox_iterate(bootstrap_node); tox_iterate(Alice); tox_iterate(Bob); \
toxav_do(status_control.Bob.av); toxav_do(status_control.Alice.av); \
switch ( step ) {\
case 0: /* Alice */ printf("Alice is calling...\n");\
@ -267,9 +267,9 @@ START_TEST(test_AV_flows)
uint8_t off = 1;
while (1) {
tox_iteration(bootstrap_node);
tox_iteration(Alice);
tox_iteration(Bob);
tox_iterate(bootstrap_node);
tox_iterate(Alice);
tox_iterate(Bob);
if (tox_get_connection_status(bootstrap_node) && tox_get_connection_status(Alice) && tox_get_connection_status(Bob)
&& off) {
@ -484,9 +484,9 @@ START_TEST(test_AV_flows)
int running = 1;
while (running) {
tox_iteration(bootstrap_node);
tox_iteration(Alice);
tox_iteration(Bob);
tox_iterate(bootstrap_node);
tox_iterate(Alice);
tox_iterate(Bob);
switch ( step ) {
case 0: /* Alice */
@ -525,9 +525,9 @@ START_TEST(test_AV_flows)
int running = 1;
while (running) {
tox_iteration(bootstrap_node);
tox_iteration(Alice);
tox_iteration(Bob);
tox_iterate(bootstrap_node);
tox_iterate(Alice);
tox_iterate(Bob);
toxav_do(status_control.Alice.av);
toxav_do(status_control.Bob.av);
@ -570,9 +570,9 @@ START_TEST(test_AV_flows)
int running = 1;
while (running) {
tox_iteration(bootstrap_node);
tox_iteration(Alice);
tox_iteration(Bob);
tox_iterate(bootstrap_node);
tox_iterate(Alice);
tox_iterate(Bob);
toxav_do(status_control.Alice.av);
toxav_do(status_control.Bob.av);

16
auto_tests/toxav_many_test.c
View File

@ -294,11 +294,11 @@ START_TEST(test_AV_three_calls)
uint8_t off = 1;
while (1) {
tox_iteration(bootstrap_node);
tox_iteration(caller);
tox_iterate(bootstrap_node);
tox_iterate(caller);
for (i = 0; i < 3; i ++) {
tox_iteration(callees[i]);
tox_iterate(callees[i]);
}
@ -351,11 +351,11 @@ START_TEST(test_AV_three_calls)
while (call_running[0] || call_running[1] || call_running[2]) {
pthread_mutex_lock(&muhmutex);
tox_iteration(bootstrap_node);
tox_iteration(caller);
tox_iteration(callees[0]);
tox_iteration(callees[1]);
tox_iteration(callees[2]);
tox_iterate(bootstrap_node);
tox_iterate(caller);
tox_iterate(callees[0]);
tox_iterate(callees[1]);
tox_iterate(callees[2]);
for ( i = 0; i < 3; i++ )
toxav_do(status_control.calls[0].Caller.av);

2
testing/irc_syncbot.c
View File

@ -342,7 +342,7 @@ int main(int argc, char *argv[])
}
}
tox_iteration(tox);
tox_iterate(tox);
usleep(1000 * 50);
}

20
testing/nTox.c
View File

@ -158,7 +158,7 @@ uint32_t add_filesender(Tox *m, uint16_t friendnum, char *filename)
fseek(tempfile, 0, SEEK_END);
uint64_t filesize = ftell(tempfile);
fseek(tempfile, 0, SEEK_SET);
uint32_t filenum = tox_file_send(m, friendnum, TOX_FILE_KIND_DATA, filesize, (uint8_t *)filename, strlen(filename) + 1,
uint32_t filenum = tox_file_send(m, friendnum, TOX_FILE_TYPE_DATA, filesize, (uint8_t *)filename, strlen(filename) + 1,
0);
if (filenum == -1)
@ -389,13 +389,13 @@ void line_eval(Tox *m, char *line)
new_lines(numstring);
} else if (inpt_command == 'd') {
tox_iteration(m);
tox_iterate(m);
} else if (inpt_command == 'm') { //message command: /m friendnumber messsage
char *posi[1];
int num = strtoul(line + prompt_offset, posi, 0);
if (**posi != 0) {
if (tox_send_message(m, num, (uint8_t *) *posi + 1, strlen(*posi + 1), NULL) < 1) {
if (tox_friend_send_message(m, num, (uint8_t *) *posi + 1, strlen(*posi + 1), NULL) < 1) {
char sss[256];
sprintf(sss, "[i] could not send message to friend num %u", num);
new_lines(sss);
@ -607,7 +607,7 @@ void line_eval(Tox *m, char *line)
if (conversation_default != 0) {
if (conversation_default > 0) {
int friendnumber = conversation_default - 1;
uint32_t res = tox_send_message(m, friendnumber, (uint8_t *)line, strlen(line), NULL);
uint32_t res = tox_friend_send_message(m, friendnumber, (uint8_t *)line, strlen(line), NULL);
if (res == 0) {
char sss[128];
@ -1127,12 +1127,12 @@ void print_groupnamelistchange(Tox *m, int groupnumber, int peernumber, uint8_t
print_groupchatpeers(m, groupnumber);
}
}
void file_request_accept(Tox *tox, uint32_t friend_number, uint32_t file_number, TOX_FILE_KIND type,
void file_request_accept(Tox *tox, uint32_t friend_number, uint32_t file_number, TOX_FILE_TYPE type,
uint64_t file_size, const uint8_t *filename, size_t filename_length, void *user_data)
{
if (type != TOX_FILE_KIND_DATA) {
if (type != TOX_FILE_TYPE_DATA) {
new_lines("Refused invalid file type.");
tox_file_control(tox, friend_number, file_number, TOX_FILE_CONTROL_CANCEL, 0);
tox_file_send_control(tox, friend_number, file_number, TOX_FILE_CONTROL_CANCEL, 0);
return;
}
@ -1140,7 +1140,7 @@ void file_request_accept(Tox *tox, uint32_t friend_number, uint32_t file_number,
sprintf(msg, "[t] %u is sending us: %s of size %llu", friend_number, filename, (long long unsigned int)file_size);
new_lines(msg);
if (tox_file_control(tox, friend_number, file_number, TOX_FILE_CONTROL_RESUME, 0)) {
if (tox_file_send_control(tox, friend_number, file_number, TOX_FILE_CONTROL_RESUME, 0)) {
sprintf(msg, "Accepted file transfer. (saving file as: %u.%u.bin)", friend_number, file_number);
new_lines(msg);
} else
@ -1270,7 +1270,7 @@ int main(int argc, char *argv[])
tox_callback_group_invite(m, print_invite, NULL);
tox_callback_group_message(m, print_groupmessage, NULL);
tox_callback_file_receive_chunk(m, write_file, NULL);
tox_callback_file_control(m, file_print_control, NULL);
tox_callback_file_recv_control(m, file_print_control, NULL);
tox_callback_file_receive(m, file_request_accept, NULL);
tox_callback_file_request_chunk(m, tox_file_request_chunk, NULL);
tox_callback_group_namelist_change(m, print_groupnamelistchange, NULL);
@ -1326,7 +1326,7 @@ int main(int argc, char *argv[])
}
}
tox_iteration(m);
tox_iterate(m);
do_refresh();
int c = timeout_getch(m);

4
testing/tox_shell.c
View File

@ -148,10 +148,10 @@ int main(int argc, char *argv[])
if (ret <= 0)
break;
tox_send_message(tox, num, buf, ret, 0);
tox_friend_send_message(tox, num, buf, ret, 0);
}
tox_iteration(tox);
tox_iterate(tox);
c_sleep(1);
}

18
testing/tox_sync.c
View File

@ -88,7 +88,7 @@ uint32_t add_filesender(Tox *m, uint16_t friendnum, char *filename)
fseek(tempfile, 0, SEEK_END);
uint64_t filesize = ftell(tempfile);
fseek(tempfile, 0, SEEK_SET);
uint32_t filenum = tox_file_send(m, friendnum, TOX_FILE_KIND_DATA, filesize, (uint8_t *)filename, strlen(filename) + 1,
uint32_t filenum = tox_file_send(m, friendnum, TOX_FILE_TYPE_DATA, filesize, (uint8_t *)filename, strlen(filename) + 1,
0);
if (filenum == -1)
@ -124,12 +124,12 @@ int not_sending()
static char path[1024];
void file_request_accept(Tox *tox, uint32_t friend_number, uint32_t file_number, TOX_FILE_KIND type,
void file_request_accept(Tox *tox, uint32_t friend_number, uint32_t file_number, TOX_FILE_TYPE type,
uint64_t file_size, const uint8_t *filename, size_t filename_length, void *user_data)
{
if (type != TOX_FILE_KIND_DATA) {
if (type != TOX_FILE_TYPE_DATA) {
printf("Refused invalid file type.");
tox_file_control(tox, friend_number, file_number, TOX_FILE_CONTROL_CANCEL, 0);
tox_file_send_control(tox, friend_number, file_number, TOX_FILE_CONTROL_CANCEL, 0);
return;
}
@ -151,7 +151,7 @@ void file_request_accept(Tox *tox, uint32_t friend_number, uint32_t file_number,
if (tempfile != 0) {
fclose(tempfile);
tox_file_control(tox, friend_number, file_number, TOX_FILE_CONTROL_CANCEL, 0);
tox_file_send_control(tox, friend_number, file_number, TOX_FILE_CONTROL_CANCEL, 0);
return;
}
@ -159,11 +159,11 @@ void file_request_accept(Tox *tox, uint32_t friend_number, uint32_t file_number,
file_recv[file_index].file = fopen(fullpath, "wb");
if (file_recv[file_index].file == 0) {
tox_file_control(tox, friend_number, file_number, TOX_FILE_CONTROL_CANCEL, 0);
tox_file_send_control(tox, friend_number, file_number, TOX_FILE_CONTROL_CANCEL, 0);
return;
}
if (tox_file_control(tox, friend_number, file_number, TOX_FILE_CONTROL_RESUME, 0)) {
if (tox_file_send_control(tox, friend_number, file_number, TOX_FILE_CONTROL_RESUME, 0)) {
printf("Accepted file transfer. (file: %s)\n", fullpath);
}
@ -231,7 +231,7 @@ int main(int argc, char *argv[])
Tox *tox = tox_new(0, 0, 0, 0);
tox_callback_file_receive_chunk(tox, write_file, NULL);
tox_callback_file_control(tox, file_print_control, NULL);
tox_callback_file_recv_control(tox, file_print_control, NULL);
tox_callback_file_receive(tox, file_request_accept, NULL);
tox_callback_file_request_chunk(tox, tox_file_request_chunk, NULL);
tox_callback_friend_connection_status(tox, print_online, NULL);
@ -306,7 +306,7 @@ int main(int argc, char *argv[])
}
}
tox_iteration(tox);
tox_iterate(tox);
c_sleep(1);
}

10
toxcore/tox.c
View File

@ -302,7 +302,7 @@ uint32_t tox_iteration_interval(const Tox *tox)
return messenger_run_interval(m);
}
void tox_iteration(Tox *tox)
void tox_iterate(Tox *tox)
{
Messenger *m = tox;
do_messenger(m);
@ -822,7 +822,7 @@ bool tox_hash(uint8_t *hash, const uint8_t *data, size_t length)
return 1;
}
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)
{
Messenger *m = tox;
@ -1077,7 +1077,7 @@ void tox_callback_friend_lossless_packet(Tox *tox, tox_friend_lossless_packet_cb
custom_lossless_packet_registerhandler(m, function, user_data);
}
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)
{
if (dht_id) {
const Messenger *m = tox;
@ -1085,7 +1085,7 @@ void tox_get_dht_id(const Tox *tox, uint8_t *dht_id)
}
}
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)
{
const Messenger *m = tox;
uint16_t port = htons(m->net->port);
@ -1099,7 +1099,7 @@ uint16_t tox_get_udp_port(const Tox *tox, TOX_ERR_GET_PORT *error)
return port;
}
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)
{
/* TCP server not yet implemented in clients. */
SET_ERROR_PARAMETER(error, TOX_ERR_GET_PORT_NOT_BOUND);

2
toxcore/tox.h
View File

@ -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_do_iteration(Tox *tox);
void tox_iterate(Tox *tox);
/*******************************************************************************