diff options
author | michael bishop <cleverca22@gmail.com> | 2016-09-09 10:30:35 -0300 |
---|---|---|
committer | michael bishop <cleverca22@gmail.com> | 2016-09-10 01:09:37 -0300 |
commit | 05f474b4df8171412237f46c943822edd202b4a9 (patch) | |
tree | 7cf886de28682fe5d4c40de034c9ebfae75d3eae /toxcore/friend_connection.c | |
parent | 406d292107f66a06f8db695645345b13ae8acc8b (diff) |
make the majority of the callbacks stateless and add some status to a testcase
Diffstat (limited to 'toxcore/friend_connection.c')
-rw-r--r-- | toxcore/friend_connection.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/toxcore/friend_connection.c b/toxcore/friend_connection.c index d2d305aa..9e78a0c5 100644 --- a/toxcore/friend_connection.c +++ b/toxcore/friend_connection.c | |||
@@ -454,7 +454,7 @@ static int handle_packet(void *object, int number, const uint8_t *data, uint16_t | |||
454 | return 0; | 454 | return 0; |
455 | } | 455 | } |
456 | 456 | ||
457 | static int handle_lossy_packet(void *object, int number, const uint8_t *data, uint16_t length) | 457 | static int handle_lossy_packet(void *object, int number, const uint8_t *data, uint16_t length, void *userdata) |
458 | { | 458 | { |
459 | if (length == 0) { | 459 | if (length == 0) { |
460 | return -1; | 460 | return -1; |
@@ -472,7 +472,7 @@ static int handle_lossy_packet(void *object, int number, const uint8_t *data, ui | |||
472 | for (i = 0; i < MAX_FRIEND_CONNECTION_CALLBACKS; ++i) { | 472 | for (i = 0; i < MAX_FRIEND_CONNECTION_CALLBACKS; ++i) { |
473 | if (friend_con->callbacks[i].lossy_data_callback) { | 473 | if (friend_con->callbacks[i].lossy_data_callback) { |
474 | friend_con->callbacks[i].lossy_data_callback(friend_con->callbacks[i].lossy_data_callback_object, | 474 | friend_con->callbacks[i].lossy_data_callback(friend_con->callbacks[i].lossy_data_callback_object, |
475 | friend_con->callbacks[i].lossy_data_callback_id, data, length); | 475 | friend_con->callbacks[i].lossy_data_callback_id, data, length, userdata); |
476 | } | 476 | } |
477 | 477 | ||
478 | friend_con = get_conn(fr_c, number); | 478 | friend_con = get_conn(fr_c, number); |
@@ -649,7 +649,7 @@ void set_dht_temp_pk(Friend_Connections *fr_c, int friendcon_id, const uint8_t * | |||
649 | int friend_connection_callbacks(Friend_Connections *fr_c, int friendcon_id, unsigned int index, | 649 | int friend_connection_callbacks(Friend_Connections *fr_c, int friendcon_id, unsigned int index, |
650 | int (*status_callback)(void *object, int id, uint8_t status, void *userdata), | 650 | int (*status_callback)(void *object, int id, uint8_t status, void *userdata), |
651 | int (*data_callback)(void *object, int id, const uint8_t *data, uint16_t len, void *userdata), | 651 | int (*data_callback)(void *object, int id, const uint8_t *data, uint16_t len, void *userdata), |
652 | int (*lossy_data_callback)(void *object, int id, const uint8_t *data, uint16_t length), | 652 | int (*lossy_data_callback)(void *object, int id, const uint8_t *data, uint16_t length, void *userdata), |
653 | void *object, int number) | 653 | void *object, int number) |
654 | { | 654 | { |
655 | Friend_Conn *friend_con = get_conn(fr_c, friendcon_id); | 655 | Friend_Conn *friend_con = get_conn(fr_c, friendcon_id); |