14 files changed, 128 insertions, 136 deletions

diff --git a/auto_tests/tox_test.c b/auto_tests/tox_test.c
index 7efb5465..3928bc9c 100644
--- a/auto_tests/tox_test.c
+++ b/auto_tests/tox_test.c
@@ -647,7 +647,7 @@ START_TEST(test_few_clients)
     ck_assert_msg(err_t == TOX_ERR_FRIEND_QUERY_OK, "Typing fail");
 
     uint32_t packet_number = 160;
-    tox_callback_friend_lossless_packet(tox3, &handle_custom_packet, &packet_number);
+    tox_callback_friend_lossless_packet(tox3, &handle_custom_packet);
     uint8_t data_c[TOX_MAX_CUSTOM_PACKET_SIZE + 1];
     memset(data_c, ((uint8_t)packet_number), sizeof(data_c));
     int ret = tox_friend_send_lossless_packet(tox2, 0, data_c, sizeof(data_c), 0);
@@ -659,7 +659,7 @@ START_TEST(test_few_clients)
         custom_packet = 0;
         tox_iterate(tox1, &to_compare);
         tox_iterate(tox2, &to_compare);
-        tox_iterate(tox3, &to_compare);
+        tox_iterate(tox3, &packet_number);
 
         if (custom_packet == 1) {
             break;
@@ -671,7 +671,7 @@ START_TEST(test_few_clients)
     }
 
     packet_number = 200;
-    tox_callback_friend_lossy_packet(tox3, &handle_custom_packet, &packet_number);
+    tox_callback_friend_lossy_packet(tox3, &handle_custom_packet);
     memset(data_c, ((uint8_t)packet_number), sizeof(data_c));
     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);
@@ -682,7 +682,7 @@ START_TEST(test_few_clients)
         custom_packet = 0;
         tox_iterate(tox1, &to_compare);
         tox_iterate(tox2, &to_compare);
-        tox_iterate(tox3, &to_compare);
+        tox_iterate(tox3, &packet_number);
 
         if (custom_packet == 1) {
             break;
@@ -699,11 +699,11 @@ START_TEST(test_few_clients)
     file_recv = 0;
     max_sending = UINT64_MAX;
     long long unsigned int f_time = time(NULL);
-    tox_callback_file_recv_chunk(tox3, write_file, &to_compare);
-    tox_callback_file_recv_control(tox2, file_print_control, &to_compare);
-    tox_callback_file_chunk_request(tox2, tox_file_chunk_request, &to_compare);
-    tox_callback_file_recv_control(tox3, file_print_control, &to_compare);
-    tox_callback_file_recv(tox3, tox_file_receive, &to_compare);
+    tox_callback_file_recv_chunk(tox3, write_file);
+    tox_callback_file_recv_control(tox2, file_print_control);
+    tox_callback_file_chunk_request(tox2, tox_file_chunk_request);
+    tox_callback_file_recv_control(tox3, file_print_control);
+    tox_callback_file_recv(tox3, tox_file_receive);
     uint64_t totalf_size = 100 * 1024 * 1024;
     uint32_t fnum = tox_file_send(tox2, 0, TOX_FILE_KIND_DATA, totalf_size, 0, (const uint8_t *)"Gentoo.exe",
                                   sizeof("Gentoo.exe"), 0);
@@ -746,11 +746,11 @@ START_TEST(test_few_clients)
 
     file_sending_done = file_accepted = file_size = sendf_ok = size_recv = 0;
     file_recv = 0;
-    tox_callback_file_recv_chunk(tox3, write_file, &to_compare);
-    tox_callback_file_recv_control(tox2, file_print_control, &to_compare);
-    tox_callback_file_chunk_request(tox2, tox_file_chunk_request, &to_compare);
-    tox_callback_file_recv_control(tox3, file_print_control, &to_compare);
-    tox_callback_file_recv(tox3, tox_file_receive, &to_compare);
+    tox_callback_file_recv_chunk(tox3, write_file);
+    tox_callback_file_recv_control(tox2, file_print_control);
+    tox_callback_file_chunk_request(tox2, tox_file_chunk_request);
+    tox_callback_file_recv_control(tox3, file_print_control);
+    tox_callback_file_recv(tox3, tox_file_receive);
     totalf_size = UINT64_MAX;
     fnum = tox_file_send(tox2, 0, TOX_FILE_KIND_DATA, totalf_size, 0, (const uint8_t *)"Gentoo.exe", sizeof("Gentoo.exe"),
                          0);
@@ -794,11 +794,11 @@ START_TEST(test_few_clients)
 
     file_sending_done = file_accepted = file_size = sendf_ok = size_recv = 0;
     file_recv = 0;
-    tox_callback_file_recv_chunk(tox3, write_file, &to_compare);
-    tox_callback_file_recv_control(tox2, file_print_control, &to_compare);
-    tox_callback_file_chunk_request(tox2, tox_file_chunk_request, &to_compare);
-    tox_callback_file_recv_control(tox3, file_print_control, &to_compare);
-    tox_callback_file_recv(tox3, tox_file_receive, &to_compare);
+    tox_callback_file_recv_chunk(tox3, write_file);
+    tox_callback_file_recv_control(tox2, file_print_control);
+    tox_callback_file_chunk_request(tox2, tox_file_chunk_request);
+    tox_callback_file_recv_control(tox3, file_print_control);
+    tox_callback_file_recv(tox3, tox_file_receive);
     totalf_size = 0;
     fnum = tox_file_send(tox2, 0, TOX_FILE_KIND_DATA, totalf_size, 0, (const uint8_t *)"Gentoo.exe", sizeof("Gentoo.exe"),
                          0);
@@ -908,6 +908,8 @@ loop_top:
 
     ck_assert_msg(num_f == NUM_FRIENDS, "bad num friends: %u", num_f);
 
+    uint16_t last_count = 0;
+
     while (1) {
         uint16_t counter = 0;
 
@@ -919,6 +921,11 @@ loop_top:
             }
         }
 
+        if (counter != last_count) {
+            printf("got to %u\n", counter);
+            last_count = counter;
+        }
+
         if (counter == NUM_FRIENDS * 2) {
             break;
         }
diff --git a/other/apidsl/tox.in.h b/other/apidsl/tox.in.h
index 959eb0d6..7953d4f6 100644
--- a/other/apidsl/tox.in.h
+++ b/other/apidsl/tox.in.h
@@ -1366,7 +1366,7 @@ namespace friend {
    * This callback is not called when adding friends. It is assumed that when
    * adding friends, their connection status is initially offline.
    */
-  event connection_status {
+  event connection_status const {
     /**
      * @param friend_number The friend number of the friend whose connection status
      *   changed.
@@ -1687,7 +1687,7 @@ namespace file {
    * This event is triggered when a file control command is received from a
    * friend.
    */
-  event recv_control {
+  event recv_control const {
     /**
      * When receiving ${CONTROL.CANCEL}, the client should release the
      * resources associated with the file number and consider the transfer failed.
@@ -1916,7 +1916,7 @@ namespace file {
   /**
    * This event is triggered when Core is ready to send more file data.
    */
-  event chunk_request {
+  event chunk_request const {
     /**
      * If the length parameter is 0, the file transfer is finished, and the client's
      * resources associated with the file number should be released. After a call
@@ -1957,7 +1957,7 @@ namespace file {
   /**
    * This event is triggered when a file transfer request is received.
    */
-  event recv {
+  event recv const {
     /**
      * The client should acquire resources to be associated with the file transfer.
      * Incoming file transfers start in the PAUSED state. After this callback
@@ -1985,7 +1985,7 @@ namespace file {
    * This event is first triggered when a file transfer request is received, and
    * subsequently when a chunk of file data for an accepted request was received.
    */
-  event recv_chunk {
+  event recv_chunk const {
     /**
      * When length is 0, the transfer is finished and the client should release the
      * resources it acquired for the transfer. After a call with length = 0, the
@@ -2109,7 +2109,7 @@ namespace friend {
   }
 
 
-  event lossy_packet {
+  event lossy_packet const {
     /**
      * @param friend_number The friend number of the friend who sent a lossy packet.
      * @param data A byte array containing the received packet data.
@@ -2119,7 +2119,7 @@ namespace friend {
   }
 
 
-  event lossless_packet {
+  event lossless_packet const {
     /**
      * @param friend_number The friend number of the friend who sent the packet.
      * @param data A byte array containing the received packet data.
diff --git a/testing/nTox.c b/testing/nTox.c
index fe62e047..c014e33f 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -1345,12 +1345,12 @@ int main(int argc, char *argv[])
     tox_callback_friend_status_message(m, print_statuschange);
     tox_callback_group_invite(m, print_invite, NULL);
     tox_callback_group_message(m, print_groupmessage, NULL);
-    tox_callback_file_recv_chunk(m, write_file, NULL);
-    tox_callback_file_recv_control(m, file_print_control, NULL);
-    tox_callback_file_recv(m, file_request_accept, NULL);
-    tox_callback_file_chunk_request(m, tox_file_chunk_request, NULL);
+    tox_callback_file_recv_chunk(m, write_file);
+    tox_callback_file_recv_control(m, file_print_control);
+    tox_callback_file_recv(m, file_request_accept);
+    tox_callback_file_chunk_request(m, tox_file_chunk_request);
     tox_callback_group_namelist_change(m, print_groupnamelistchange, NULL);
-    tox_callback_friend_connection_status(m, print_online, NULL);
+    tox_callback_friend_connection_status(m, print_online);
 
     initscr();
     noecho();
diff --git a/testing/tox_shell.c b/testing/tox_shell.c
index 40890453..944b7353 100644
--- a/testing/tox_shell.c
+++ b/testing/tox_shell.c
@@ -99,7 +99,7 @@ int main(int argc, char *argv[])
     }
 
     Tox *tox = tox_new(0, 0);
-    tox_callback_friend_connection_status(tox, print_online, NULL);
+    tox_callback_friend_connection_status(tox, print_online);
     tox_callback_friend_message(tox, print_message);
 
 
diff --git a/testing/tox_sync.c b/testing/tox_sync.c
index 36b01cf4..d90024b5 100644
--- a/testing/tox_sync.c
+++ b/testing/tox_sync.c
@@ -254,11 +254,11 @@ int main(int argc, char *argv[])
     }
 
     Tox *tox = tox_new(0, 0);
-    tox_callback_file_recv_chunk(tox, write_file, NULL);
-    tox_callback_file_recv_control(tox, file_print_control, NULL);
-    tox_callback_file_recv(tox, file_request_accept, NULL);
-    tox_callback_file_chunk_request(tox, tox_file_chunk_request, NULL);
-    tox_callback_friend_connection_status(tox, print_online, NULL);
+    tox_callback_file_recv_chunk(tox, write_file);
+    tox_callback_file_recv_control(tox, file_print_control);
+    tox_callback_file_recv(tox, file_request_accept);
+    tox_callback_file_chunk_request(tox, tox_file_chunk_request);
+    tox_callback_friend_connection_status(tox, print_online);
 
     uint16_t port = atoi(argv[argvoffset + 2]);
     unsigned char *binary_string = hex_string_to_bin(argv[argvoffset + 3]);
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 44664e3f..8616bd8d 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -36,7 +36,7 @@
 #include "util.h"
 
 
-static void set_friend_status(Messenger *m, int32_t friendnumber, uint8_t status);
+static void set_friend_status(Messenger *m, int32_t friendnumber, uint8_t status, void *userdata);
 static int write_cryptpacket_id(const Messenger *m, int32_t friendnumber, uint8_t packet_id, const uint8_t *data,
                                 uint32_t length, uint8_t congestion_control);
 
@@ -170,7 +170,8 @@ static int send_offline_packet(Messenger *m, int friendcon_id)
 
 static int handle_status(void *object, int i, uint8_t status, void *userdata);
 static int handle_packet(void *object, int i, const uint8_t *temp, uint16_t len, void *userdata);
-static int handle_custom_lossy_packet(void *object, int friend_num, const uint8_t *packet, uint16_t length);
+static int handle_custom_lossy_packet(void *object, int friend_num, const uint8_t *packet, uint16_t length,
+                                      void *userdata);
 
 static int32_t init_new_friend(Messenger *m, const uint8_t *real_pk, uint8_t status)
 {
@@ -873,11 +874,9 @@ void m_callback_read_receipt(Messenger *m, void (*function)(Messenger *m, uint32
     m->read_receipt = function;
 }
 
-void m_callback_connectionstatus(Messenger *m, void (*function)(Messenger *m, uint32_t, unsigned int, void *),
-                                 void *userdata)
+void m_callback_connectionstatus(Messenger *m, void (*function)(Messenger *m, uint32_t, unsigned int, void *))
 {
     m->friend_connectionstatuschange = function;
-    m->friend_connectionstatuschange_userdata = userdata;
 }
 
 void m_callback_core_connection(Messenger *m, void (*function)(Messenger *m, unsigned int, void *))
@@ -892,7 +891,7 @@ void m_callback_connectionstatus_internal_av(Messenger *m, void (*function)(Mess
     m->friend_connectionstatuschange_internal_userdata = userdata;
 }
 
-static void check_friend_tcp_udp(Messenger *m, int32_t friendnumber)
+static void check_friend_tcp_udp(Messenger *m, int32_t friendnumber, void *userdata)
 {
     int last_connection_udp_tcp = m->friendlist[friendnumber].last_connection_udp_tcp;
 
@@ -912,7 +911,7 @@ static void check_friend_tcp_udp(Messenger *m, int32_t friendnumber)
 
     if (last_connection_udp_tcp != ret) {
         if (m->friend_connectionstatuschange) {
-            m->friend_connectionstatuschange(m, friendnumber, ret, m->friend_connectionstatuschange_userdata);
+            m->friend_connectionstatuschange(m, friendnumber, ret, userdata);
         }
     }
 
@@ -920,7 +919,7 @@ static void check_friend_tcp_udp(Messenger *m, int32_t friendnumber)
 }
 
 static void break_files(const Messenger *m, int32_t friendnumber);
-static void check_friend_connectionstatus(Messenger *m, int32_t friendnumber, uint8_t status)
+static void check_friend_connectionstatus(Messenger *m, int32_t friendnumber, uint8_t status, void *userdata)
 {
     if (status == NOFRIEND) {
         return;
@@ -942,7 +941,7 @@ static void check_friend_connectionstatus(Messenger *m, int32_t friendnumber, ui
 
         m->friendlist[friendnumber].status = status;
 
-        check_friend_tcp_udp(m, friendnumber);
+        check_friend_tcp_udp(m, friendnumber, userdata);
 
         if (m->friend_connectionstatuschange_internal) {
             m->friend_connectionstatuschange_internal(m, friendnumber, is_online,
@@ -951,9 +950,9 @@ static void check_friend_connectionstatus(Messenger *m, int32_t friendnumber, ui
     }
 }
 
-void set_friend_status(Messenger *m, int32_t friendnumber, uint8_t status)
+void set_friend_status(Messenger *m, int32_t friendnumber, uint8_t status, void *userdata)
 {
-    check_friend_connectionstatus(m, friendnumber, status);
+    check_friend_connectionstatus(m, friendnumber, status, userdata);
     m->friendlist[friendnumber].status = status;
 }
 
@@ -1010,10 +1009,9 @@ int send_group_invite_packet(const Messenger *m, int32_t friendnumber, const uin
  *  Function(Tox *tox, uint32_t friendnumber, uint32_t filenumber, uint32_t filetype, uint64_t filesize, uint8_t *filename, size_t filename_length, void *userdata)
  */
 void callback_file_sendrequest(Messenger *m, void (*function)(Messenger *m,  uint32_t, uint32_t, uint32_t, uint64_t,
-                               const uint8_t *, size_t, void *), void *userdata)
+                               const uint8_t *, size_t, void *))
 {
     m->file_sendrequest = function;
-    m->file_sendrequest_userdata = userdata;
 }
 
 /* Set the callback for file control requests.
@@ -1021,11 +1019,9 @@ void callback_file_sendrequest(Messenger *m, void (*function)(Messenger *m,  uin
  *  Function(Tox *tox, uint32_t friendnumber, uint32_t filenumber, unsigned int control_type, void *userdata)
  *
  */
-void callback_file_control(Messenger *m, void (*function)(Messenger *m, uint32_t, uint32_t, unsigned int, void *),
-                           void *userdata)
+void callback_file_control(Messenger *m, void (*function)(Messenger *m, uint32_t, uint32_t, unsigned int, void *))
 {
     m->file_filecontrol = function;
-    m->file_filecontrol_userdata = userdata;
 }
 
 /* Set the callback for file data.
@@ -1034,10 +1030,9 @@ void callback_file_control(Messenger *m, void (*function)(Messenger *m, uint32_t
  *
  */
 void callback_file_data(Messenger *m, void (*function)(Messenger *m, uint32_t, uint32_t, uint64_t, const uint8_t *,
-                        size_t, void *), void *userdata)
+                        size_t, void *))
 {
     m->file_filedata = function;
-    m->file_filedata_userdata = userdata;
 }
 
 /* Set the callback for file request chunk.
@@ -1045,11 +1040,9 @@ void callback_file_data(Messenger *m, void (*function)(Messenger *m, uint32_t, u
  *  Function(Tox *tox, uint32_t friendnumber, uint32_t filenumber, uint64_t position, size_t length, void *userdata)
  *
  */
-void callback_file_reqchunk(Messenger *m, void (*function)(Messenger *m, uint32_t, uint32_t, uint64_t, size_t, void *),
-                            void *userdata)
+void callback_file_reqchunk(Messenger *m, void (*function)(Messenger *m, uint32_t, uint32_t, uint64_t, size_t, void *))
 {
     m->file_reqchunk = function;
-    m->file_reqchunk_userdata = userdata;
 }
 
 #define MAX_FILENAME_LENGTH 255
@@ -1512,7 +1505,7 @@ uint64_t file_dataremaining(const Messenger *m, int32_t friendnumber, uint8_t fi
            m->friendlist[friendnumber].file_receiving[filenumber].transferred;
 }
 
-static void do_reqchunk_filecb(Messenger *m, int32_t friendnumber)
+static void do_reqchunk_filecb(Messenger *m, int32_t friendnumber, void *userdata)
 {
     if (!m->friendlist[friendnumber].num_sending_files) {
         return;
@@ -1539,7 +1532,7 @@ static void do_reqchunk_filecb(Messenger *m, int32_t friendnumber)
                 /* Check if file was entirely sent. */
                 if (friend_received_packet(m, friendnumber, ft->last_packet_number) == 0) {
                     if (m->file_reqchunk) {
-                        (*m->file_reqchunk)(m, friendnumber, i, ft->transferred, 0, m->file_reqchunk_userdata);
+                        (*m->file_reqchunk)(m, friendnumber, i, ft->transferred, 0, userdata);
                     }
 
                     ft->status = FILESTATUS_NONE;
@@ -1587,7 +1580,7 @@ static void do_reqchunk_filecb(Messenger *m, int32_t friendnumber)
             ft->requested += length;
 
             if (m->file_reqchunk) {
-                (*m->file_reqchunk)(m, friendnumber, i, position, length, m->file_reqchunk_userdata);
+                (*m->file_reqchunk)(m, friendnumber, i, position, length, userdata);
             }
 
             --free_slots;
@@ -1621,7 +1614,7 @@ static void break_files(const Messenger *m, int32_t friendnumber)
 /* return -1 on failure, 0 on success.
  */
 static int handle_filecontrol(Messenger *m, int32_t friendnumber, uint8_t receive_send, uint8_t filenumber,
-                              uint8_t control_type, const uint8_t *data, uint16_t length)
+                              uint8_t control_type, const uint8_t *data, uint16_t length, void *userdata)
 {
     if (receive_send > 1) {
         return -1;
@@ -1660,7 +1653,7 @@ static int handle_filecontrol(Messenger *m, int32_t friendnumber, uint8_t receiv
         }
 
         if (m->file_filecontrol) {
-            (*m->file_filecontrol)(m, friendnumber, real_filenumber, control_type, m->file_filecontrol_userdata);
+            (*m->file_filecontrol)(m, friendnumber, real_filenumber, control_type, userdata);
         }
     } else if (control_type == FILECONTROL_PAUSE) {
         if ((ft->paused & FILE_PAUSE_OTHER) || ft->status != FILESTATUS_TRANSFERRING) {
@@ -1670,12 +1663,12 @@ static int handle_filecontrol(Messenger *m, int32_t friendnumber, uint8_t receiv
         ft->paused |= FILE_PAUSE_OTHER;
 
         if (m->file_filecontrol) {
-            (*m->file_filecontrol)(m, friendnumber, real_filenumber, control_type, m->file_filecontrol_userdata);
+            (*m->file_filecontrol)(m, friendnumber, real_filenumber, control_type, userdata);
         }
     } else if (control_type == FILECONTROL_KILL) {
 
         if (m->file_filecontrol) {
-            (*m->file_filecontrol)(m, friendnumber, real_filenumber, control_type, m->file_filecontrol_userdata);
+            (*m->file_filecontrol)(m, friendnumber, real_filenumber, control_type, userdata);
         }
 
         ft->status = FILESTATUS_NONE;
@@ -1733,7 +1726,8 @@ int m_msi_packet(const Messenger *m, int32_t friendnumber, const uint8_t *data,
     return write_cryptpacket_id(m, friendnumber, PACKET_ID_MSI, data, length, 0);
 }
 
-static int handle_custom_lossy_packet(void *object, int friend_num, const uint8_t *packet, uint16_t length)
+static int handle_custom_lossy_packet(void *object, int friend_num, const uint8_t *packet, uint16_t length,
+                                      void *userdata)
 {
     Messenger *m = object;
 
@@ -1752,17 +1746,16 @@ static int handle_custom_lossy_packet(void *object, int friend_num, const uint8_
     }
 
     if (m->lossy_packethandler) {
-        m->lossy_packethandler(m, friend_num, packet, length, m->lossy_packethandler_userdata);
+        m->lossy_packethandler(m, friend_num, packet, length, userdata);
     }
 
     return 1;
 }
 
 void custom_lossy_packet_registerhandler(Messenger *m, void (*packet_handler_callback)(Messenger *m,
-        uint32_t friendnumber, const uint8_t *data, size_t len, void *object), void *object)
+        uint32_t friendnumber, const uint8_t *data, size_t len, void *object))
 {
     m->lossy_packethandler = packet_handler_callback;
-    m->lossy_packethandler_userdata = object;
 }
 
 int m_callback_rtp_packet(Messenger *m, int32_t friendnumber, uint8_t byte, int (*packet_handler_callback)(Messenger *m,
@@ -1817,7 +1810,8 @@ int send_custom_lossy_packet(const Messenger *m, int32_t friendnumber, const uin
     return 0;
 }
 
-static int handle_custom_lossless_packet(void *object, int friend_num, const uint8_t *packet, uint16_t length)
+static int handle_custom_lossless_packet(void *object, int friend_num, const uint8_t *packet, uint16_t length,
+        void *userdata)
 {
     Messenger *m = object;
 
@@ -1834,17 +1828,16 @@ static int handle_custom_lossless_packet(void *object, int friend_num, const uin
     }
 
     if (m->lossless_packethandler) {
-        m->lossless_packethandler(m, friend_num, packet, length, m->lossless_packethandler_userdata);
+        m->lossless_packethandler(m, friend_num, packet, length, userdata);
     }
 
     return 1;
 }
 
 void custom_lossless_packet_registerhandler(Messenger *m, void (*packet_handler_callback)(Messenger *m,
-        uint32_t friendnumber, const uint8_t *data, size_t len, void *object), void *object)
+        uint32_t friendnumber, const uint8_t *data, size_t len, void *object))
 {
     m->lossless_packethandler = packet_handler_callback;
-    m->lossless_packethandler_userdata = object;
 }
 
 int send_custom_lossless_packet(const Messenger *m, int32_t friendnumber, const uint8_t *data, uint32_t length)
@@ -2026,12 +2019,12 @@ void kill_messenger(Messenger *m)
  *   i: friendlist index of the timed-out friend
  *   t: time
  */
-static void check_friend_request_timed_out(Messenger *m, uint32_t i, uint64_t t)
+static void check_friend_request_timed_out(Messenger *m, uint32_t i, uint64_t t, void *userdata)
 {
     Friend *f = &m->friendlist[i];
 
     if (f->friendrequest_lastsent + f->friendrequest_timeout < t) {
-        set_friend_status(m, i, FRIEND_ADDED);
+        set_friend_status(m, i, FRIEND_ADDED, userdata);
         /* Double the default timeout every time if friendrequest is assumed
          * to have been sent unsuccessfully.
          */
@@ -2047,7 +2040,7 @@ static int handle_status(void *object, int i, uint8_t status, void *userdata)
         send_online_packet(m, i);
     } else { /* Went offline. */
         if (m->friendlist[i].status == FRIEND_ONLINE) {
-            set_friend_status(m, i, FRIEND_CONFIRMED);
+            set_friend_status(m, i, FRIEND_CONFIRMED, userdata);
         }
     }
 
@@ -2067,7 +2060,7 @@ static int handle_packet(void *object, int i, const uint8_t *temp, uint16_t len,
 
     if (m->friendlist[i].status != FRIEND_ONLINE) {
         if (packet_id == PACKET_ID_ONLINE && len == 1) {
-            set_friend_status(m, i, FRIEND_ONLINE);
+            set_friend_status(m, i, FRIEND_ONLINE, userdata);
             send_online_packet(m, i);
         } else {
             return -1;
@@ -2080,7 +2073,7 @@ static int handle_packet(void *object, int i, const uint8_t *temp, uint16_t len,
                 break;
             }
 
-            set_friend_status(m, i, FRIEND_CONFIRMED);
+            set_friend_status(m, i, FRIEND_CONFIRMED, userdata);
             break;
         }
 
@@ -2246,7 +2239,7 @@ static int handle_packet(void *object, int i, const uint8_t *temp, uint16_t len,
 
             if (m->file_sendrequest) {
                 (*m->file_sendrequest)(m, i, real_filenumber, file_type, filesize, filename, filename_length,
-                                       m->file_sendrequest_userdata);
+                                       userdata);
             }
 
             break;
@@ -2265,7 +2258,7 @@ static int handle_packet(void *object, int i, const uint8_t *temp, uint16_t len,
                 break;
             }
 
-            if (handle_filecontrol(m, i, send_receive, filenumber, control_type, data + 3, data_length - 3) == -1) {
+            if (handle_filecontrol(m, i, send_receive, filenumber, control_type, data + 3, data_length - 3, userdata) == -1) {
                 break;
             }
 
@@ -2308,7 +2301,7 @@ static int handle_packet(void *object, int i, const uint8_t *temp, uint16_t len,
             }
 
             if (m->file_filedata) {
-                (*m->file_filedata)(m, i, real_filenumber, position, file_data, file_data_length, m->file_filedata_userdata);
+                (*m->file_filedata)(m, i, real_filenumber, position, file_data, file_data_length, userdata);
             }
 
             ft->transferred += file_data_length;
@@ -2320,7 +2313,7 @@ static int handle_packet(void *object, int i, const uint8_t *temp, uint16_t len,
 
                 /* Full file received. */
                 if (m->file_filedata) {
-                    (*m->file_filedata)(m, i, real_filenumber, position, file_data, file_data_length, m->file_filedata_userdata);
+                    (*m->file_filedata)(m, i, real_filenumber, position, file_data, file_data_length, userdata);
                 }
             }
 
@@ -2345,7 +2338,7 @@ static int handle_packet(void *object, int i, const uint8_t *temp, uint16_t len,
         }
 
         default: {
-            handle_custom_lossless_packet(object, i, temp, len);
+            handle_custom_lossless_packet(object, i, temp, len, userdata);
             break;
         }
     }
@@ -2365,7 +2358,7 @@ static void do_friends(Messenger *m, void *userdata)
                                                 m->friendlist[i].info_size);
 
             if (fr >= 0) {
-                set_friend_status(m, i, FRIEND_REQUESTED);
+                set_friend_status(m, i, FRIEND_REQUESTED, userdata);
                 m->friendlist[i].friendrequest_lastsent = temp_time;
             }
         }
@@ -2376,7 +2369,7 @@ static void do_friends(Messenger *m, void *userdata)
                 /* If we didn't connect to friend after successfully sending him a friend request the request is deemed
                  * unsuccessful so we set the status back to FRIEND_ADDED and try again.
                  */
-                check_friend_request_timed_out(m, i, temp_time);
+                check_friend_request_timed_out(m, i, temp_time, userdata);
             }
         }
 
@@ -2405,9 +2398,9 @@ static void do_friends(Messenger *m, void *userdata)
                 }
             }
 
-            check_friend_tcp_udp(m, i);
+            check_friend_tcp_udp(m, i, userdata);
             do_receipts(m, i, userdata);
-            do_reqchunk_filecb(m, i);
+            do_reqchunk_filecb(m, i, userdata);
 
             m->friendlist[i].last_seen_time = (uint64_t) time(NULL);
         }
diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h
index dc809a22..21d9f7b3 100644
--- a/toxcore/Messenger.h
+++ b/toxcore/Messenger.h
@@ -245,7 +245,6 @@ struct Messenger {
     void (*friend_typingchange)(struct Messenger *m, uint32_t, _Bool, void *);
     void (*read_receipt)(struct Messenger *m, uint32_t, uint32_t, void *);
     void (*friend_connectionstatuschange)(struct Messenger *m, uint32_t, unsigned int, void *);
-    void *friend_connectionstatuschange_userdata;
     void (*friend_connectionstatuschange_internal)(struct Messenger *m, uint32_t, uint8_t, void *);
     void *friend_connectionstatuschange_internal_userdata;
 
@@ -255,21 +254,15 @@ struct Messenger {
 
     void (*file_sendrequest)(struct Messenger *m, uint32_t, uint32_t, uint32_t, uint64_t, const uint8_t *, size_t,
                              void *);
-    void *file_sendrequest_userdata;
     void (*file_filecontrol)(struct Messenger *m, uint32_t, uint32_t, unsigned int, void *);
-    void *file_filecontrol_userdata;
     void (*file_filedata)(struct Messenger *m, uint32_t, uint32_t, uint64_t, const uint8_t *, size_t, void *);
-    void *file_filedata_userdata;
     void (*file_reqchunk)(struct Messenger *m, uint32_t, uint32_t, uint64_t, size_t, void *);
-    void *file_reqchunk_userdata;
 
     void (*msi_packet)(struct Messenger *m, uint32_t, const uint8_t *, uint16_t, void *);
     void *msi_packet_userdata;
 
     void (*lossy_packethandler)(struct Messenger *m, uint32_t, const uint8_t *, size_t, void *);
-    void *lossy_packethandler_userdata;
     void (*lossless_packethandler)(struct Messenger *m, uint32_t, const uint8_t *, size_t, void *);
-    void *lossless_packethandler_userdata;
 
     void (*core_connection_change)(struct Messenger *m, unsigned int, void *);
     unsigned int last_connection_status;
@@ -525,8 +518,7 @@ void m_callback_read_receipt(Messenger *m, void (*function)(Messenger *m, uint32
  *  being previously online" part.
  *  It's assumed that when adding friends, their connection status is offline.
  */
-void m_callback_connectionstatus(Messenger *m, void (*function)(Messenger *m, uint32_t, unsigned int, void *),
-                                 void *userdata);
+void m_callback_connectionstatus(Messenger *m, void (*function)(Messenger *m, uint32_t, unsigned int, void *));
 
 /* Same as previous but for internal A/V core usage only */
 void m_callback_connectionstatus_internal_av(Messenger *m, void (*function)(Messenger *m, uint32_t, uint8_t, void *),
@@ -561,7 +553,7 @@ int send_group_invite_packet(const Messenger *m, int32_t friendnumber, const uin
  *  Function(Tox *tox, uint32_t friendnumber, uint32_t filenumber, uint32_t filetype, uint64_t filesize, uint8_t *filename, size_t filename_length, void *userdata)
  */
 void callback_file_sendrequest(Messenger *m, void (*function)(Messenger *m,  uint32_t, uint32_t, uint32_t, uint64_t,
-                               const uint8_t *, size_t, void *), void *userdata);
+                               const uint8_t *, size_t, void *));
 
 
 /* Set the callback for file control requests.
@@ -569,8 +561,7 @@ void callback_file_sendrequest(Messenger *m, void (*function)(Messenger *m,  uin
  *  Function(Tox *tox, uint32_t friendnumber, uint32_t filenumber, unsigned int control_type, void *userdata)
  *
  */
-void callback_file_control(Messenger *m, void (*function)(Messenger *m, uint32_t, uint32_t, unsigned int, void *),
-                           void *userdata);
+void callback_file_control(Messenger *m, void (*function)(Messenger *m, uint32_t, uint32_t, unsigned int, void *));
 
 /* Set the callback for file data.
  *
@@ -578,15 +569,14 @@ void callback_file_control(Messenger *m, void (*function)(Messenger *m, uint32_t
  *
  */
 void callback_file_data(Messenger *m, void (*function)(Messenger *m, uint32_t, uint32_t, uint64_t, const uint8_t *,
-                        size_t, void *), void *userdata);
+                        size_t, void *));
 
 /* Set the callback for file request chunk.
  *
  *  Function(Tox *tox, uint32_t friendnumber, uint32_t filenumber, uint64_t position, size_t length, void *userdata)
  *
  */
-void callback_file_reqchunk(Messenger *m, void (*function)(Messenger *m, uint32_t, uint32_t, uint64_t, size_t, void *),
-                            void *userdata);
+void callback_file_reqchunk(Messenger *m, void (*function)(Messenger *m, uint32_t, uint32_t, uint64_t, size_t, void *));
 
 
 /* Copy the file transfer file id to file_id
@@ -689,7 +679,7 @@ int m_callback_rtp_packet(Messenger *m, int32_t friendnumber, uint8_t byte, int
  *
  */
 void custom_lossy_packet_registerhandler(Messenger *m, void (*packet_handler_callback)(Messenger *m,
-        uint32_t friendnumber, const uint8_t *data, size_t len, void *object), void *object);
+        uint32_t friendnumber, const uint8_t *data, size_t len, void *object));
 
 /* High level function to send custom lossy packets.
  *
@@ -707,7 +697,7 @@ int send_custom_lossy_packet(const Messenger *m, int32_t friendnumber, const uin
  *
  */
 void custom_lossless_packet_registerhandler(Messenger *m, void (*packet_handler_callback)(Messenger *m,
-        uint32_t friendnumber, const uint8_t *data, size_t len, void *object), void *object);
+        uint32_t friendnumber, const uint8_t *data, size_t len, void *object));
 
 /* High level function to send custom lossless packets.
  *
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
     return 0;
 }
 
-static int handle_lossy_packet(void *object, int number, const uint8_t *data, uint16_t length)
+static int handle_lossy_packet(void *object, int number, const uint8_t *data, uint16_t length, void *userdata)
 {
     if (length == 0) {
         return -1;
@@ -472,7 +472,7 @@ static int handle_lossy_packet(void *object, int number, const uint8_t *data, ui
     for (i = 0; i < MAX_FRIEND_CONNECTION_CALLBACKS; ++i) {
         if (friend_con->callbacks[i].lossy_data_callback) {
             friend_con->callbacks[i].lossy_data_callback(friend_con->callbacks[i].lossy_data_callback_object,
-                    friend_con->callbacks[i].lossy_data_callback_id, data, length);
+                    friend_con->callbacks[i].lossy_data_callback_id, data, length, userdata);
         }
 
         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 *
 int friend_connection_callbacks(Friend_Connections *fr_c, int friendcon_id, unsigned int index,
                                 int (*status_callback)(void *object, int id, uint8_t status, void *userdata),
                                 int (*data_callback)(void *object, int id, const uint8_t *data, uint16_t len, void *userdata),
-                                int (*lossy_data_callback)(void *object, int id, const uint8_t *data, uint16_t length),
+                                int (*lossy_data_callback)(void *object, int id, const uint8_t *data, uint16_t length, void *userdata),
                                 void *object, int number)
 {
     Friend_Conn *friend_con = get_conn(fr_c, friendcon_id);
diff --git a/toxcore/friend_connection.h b/toxcore/friend_connection.h
index 6eb4dd84..c5179a6a 100644
--- a/toxcore/friend_connection.h
+++ b/toxcore/friend_connection.h
@@ -87,7 +87,7 @@ typedef struct {
         void *data_callback_object;
         int data_callback_id;
 
-        int (*lossy_data_callback)(void *object, int id, const uint8_t *data, uint16_t length);
+        int (*lossy_data_callback)(void *object, int id, const uint8_t *data, uint16_t length, void *userdata);
         void *lossy_data_callback_object;
         int lossy_data_callback_id;
     } callbacks[MAX_FRIEND_CONNECTION_CALLBACKS];
@@ -161,7 +161,7 @@ int friend_add_tcp_relay(Friend_Connections *fr_c, int friendcon_id, IP_Port ip_
 int friend_connection_callbacks(Friend_Connections *fr_c, int friendcon_id, unsigned int index,
                                 int (*status_callback)(void *object, int id, uint8_t status, void *userdata),
                                 int (*data_callback)(void *object, int id, const uint8_t *data, uint16_t len, void *userdata),
-                                int (*lossy_data_callback)(void *object, int id, const uint8_t *data, uint16_t length),
+                                int (*lossy_data_callback)(void *object, int id, const uint8_t *data, uint16_t length, void *userdata),
                                 void *object, int number);
 
 /* return the crypt_connection_id for the connection.
diff --git a/toxcore/group.c b/toxcore/group.c
index dbfb31cd..c7844d6d 100644
--- a/toxcore/group.c
+++ b/toxcore/group.c
@@ -662,7 +662,7 @@ static int handle_status(void *object, int friendcon_id, uint8_t status, void *u
 }
 
 static int handle_packet(void *object, int friendcon_id, const uint8_t *data, uint16_t length, void *userdata);
-static int handle_lossy(void *object, int friendcon_id, const uint8_t *data, uint16_t length);
+static int handle_lossy(void *object, int friendcon_id, const uint8_t *data, uint16_t length, void *userdata);
 
 /* Add friend to group chat.
  *
@@ -2174,7 +2174,7 @@ static unsigned int lossy_packet_not_received(Group_c *g, int peer_index, uint16
     return -1;
 }
 
-static int handle_lossy(void *object, int friendcon_id, const uint8_t *data, uint16_t length)
+static int handle_lossy(void *object, int friendcon_id, const uint8_t *data, uint16_t length, void *userdata)
 {
     Group_Chats *g_c = object;
 
diff --git a/toxcore/net_crypto.c b/toxcore/net_crypto.c
index e09d7444..72a34811 100644
--- a/toxcore/net_crypto.c
+++ b/toxcore/net_crypto.c
@@ -1443,7 +1443,7 @@ static int handle_data_packet_helper(Net_Crypto *c, int crypt_connection_id, con
 
         if (conn->connection_lossy_data_callback) {
             conn->connection_lossy_data_callback(conn->connection_lossy_data_callback_object,
-                                                 conn->connection_lossy_data_callback_id, real_data, real_length);
+                                                 conn->connection_lossy_data_callback_id, real_data, real_length, userdata);
         }
     } else {
         return -1;
@@ -2168,7 +2168,8 @@ int connection_data_handler(const Net_Crypto *c, int crypt_connection_id, int (*
  * return 0 on success.
  */
 int connection_lossy_data_handler(Net_Crypto *c, int crypt_connection_id,
-                                  int (*connection_lossy_data_callback)(void *object, int id, const uint8_t *data, uint16_t length), void *object, int id)
+                                  int (*connection_lossy_data_callback)(void *object, int id, const uint8_t *data, uint16_t length, void *userdata),
+                                  void *object, int id)
 {
     Crypto_Connection *conn = get_crypto_connection(c, crypt_connection_id);
 
diff --git a/toxcore/net_crypto.h b/toxcore/net_crypto.h
index c5eb3ecb..e676b864 100644
--- a/toxcore/net_crypto.h
+++ b/toxcore/net_crypto.h
@@ -139,7 +139,7 @@ typedef struct {
     void *connection_data_callback_object;
     int connection_data_callback_id;
 
-    int (*connection_lossy_data_callback)(void *object, int id, const uint8_t *data, uint16_t length);
+    int (*connection_lossy_data_callback)(void *object, int id, const uint8_t *data, uint16_t length, void *userdata);
     void *connection_lossy_data_callback_object;
     int connection_lossy_data_callback_id;
 
@@ -287,7 +287,8 @@ int connection_data_handler(const Net_Crypto *c, int crypt_connection_id, int (*
  * return 0 on success.
  */
 int connection_lossy_data_handler(Net_Crypto *c, int crypt_connection_id,
-                                  int (*connection_lossy_data_callback)(void *object, int id, const uint8_t *data, uint16_t length), void *object,
+                                  int (*connection_lossy_data_callback)(void *object, int id, const uint8_t *data, uint16_t length, void *userdata),
+                                  void *object,
                                   int id);
 
 /* Set the function for this friend that will be callbacked with object and number if
diff --git a/toxcore/tox.c b/toxcore/tox.c
index 5a1103df..40746656 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -871,10 +871,10 @@ TOX_CONNECTION tox_friend_get_connection_status(const Tox *tox, uint32_t friend_
     return ret;
 }
 
-void tox_callback_friend_connection_status(Tox *tox, tox_friend_connection_status_cb *callback, void *user_data)
+void tox_callback_friend_connection_status(Tox *tox, tox_friend_connection_status_cb *callback)
 {
     Messenger *m = tox;
-    m_callback_connectionstatus(m, callback, user_data);
+    m_callback_connectionstatus(m, callback);
 }
 
 bool tox_friend_get_typing(const Tox *tox, uint32_t friend_number, TOX_ERR_FRIEND_QUERY *error)
@@ -1077,10 +1077,10 @@ bool tox_file_seek(Tox *tox, uint32_t friend_number, uint32_t file_number, uint6
     return 0;
 }
 
-void tox_callback_file_recv_control(Tox *tox, tox_file_recv_control_cb *callback, void *user_data)
+void tox_callback_file_recv_control(Tox *tox, tox_file_recv_control_cb *callback)
 {
     Messenger *m = tox;
-    callback_file_control(m, callback, user_data);
+    callback_file_control(m, callback);
 }
 
 bool tox_file_get_file_id(const Tox *tox, uint32_t friend_number, uint32_t file_number, uint8_t *file_id,
@@ -1199,22 +1199,22 @@ bool tox_file_send_chunk(Tox *tox, uint32_t friend_number, uint32_t file_number,
     return 0;
 }
 
-void tox_callback_file_chunk_request(Tox *tox, tox_file_chunk_request_cb *callback, void *user_data)
+void tox_callback_file_chunk_request(Tox *tox, tox_file_chunk_request_cb *callback)
 {
     Messenger *m = tox;
-    callback_file_reqchunk(m, callback, user_data);
+    callback_file_reqchunk(m, callback);
 }
 
-void tox_callback_file_recv(Tox *tox, tox_file_recv_cb *callback, void *user_data)
+void tox_callback_file_recv(Tox *tox, tox_file_recv_cb *callback)
 {
     Messenger *m = tox;
-    callback_file_sendrequest(m, callback, user_data);
+    callback_file_sendrequest(m, callback);
 }
 
-void tox_callback_file_recv_chunk(Tox *tox, tox_file_recv_chunk_cb *callback, void *user_data)
+void tox_callback_file_recv_chunk(Tox *tox, tox_file_recv_chunk_cb *callback)
 {
     Messenger *m = tox;
-    callback_file_data(m, callback, user_data);
+    callback_file_data(m, callback);
 }
 
 static void set_custom_packet_error(int ret, TOX_ERR_FRIEND_CUSTOM_PACKET *error)
@@ -1277,10 +1277,10 @@ bool tox_friend_send_lossy_packet(Tox *tox, uint32_t friend_number, const uint8_
     return 0;
 }
 
-void tox_callback_friend_lossy_packet(Tox *tox, tox_friend_lossy_packet_cb *callback, void *user_data)
+void tox_callback_friend_lossy_packet(Tox *tox, tox_friend_lossy_packet_cb *callback)
 {
     Messenger *m = tox;
-    custom_lossy_packet_registerhandler(m, callback, user_data);
+    custom_lossy_packet_registerhandler(m, callback);
 }
 
 bool tox_friend_send_lossless_packet(Tox *tox, uint32_t friend_number, const uint8_t *data, size_t length,
@@ -1309,10 +1309,10 @@ bool tox_friend_send_lossless_packet(Tox *tox, uint32_t friend_number, const uin
     return 0;
 }
 
-void tox_callback_friend_lossless_packet(Tox *tox, tox_friend_lossless_packet_cb *callback, void *user_data)
+void tox_callback_friend_lossless_packet(Tox *tox, tox_friend_lossless_packet_cb *callback)
 {
     Messenger *m = tox;
-    custom_lossless_packet_registerhandler(m, callback, user_data);
+    custom_lossless_packet_registerhandler(m, callback);
 }
 
 void tox_self_get_dht_id(const Tox *tox, uint8_t *dht_id)
diff --git a/toxcore/tox.h b/toxcore/tox.h
index f0e0b48c..60110ea8 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -1527,7 +1527,7 @@ typedef void tox_friend_connection_status_cb(Tox *tox, uint32_t friend_number, T
  * This callback is not called when adding friends. It is assumed that when
  * adding friends, their connection status is initially offline.
  */
-void tox_callback_friend_connection_status(Tox *tox, tox_friend_connection_status_cb *callback, void *user_data);
+void tox_callback_friend_connection_status(Tox *tox, tox_friend_connection_status_cb *callback);
 
 /**
  * Check whether a friend is currently typing a message.
@@ -1889,7 +1889,7 @@ typedef void tox_file_recv_control_cb(Tox *tox, uint32_t friend_number, uint32_t
  * This event is triggered when a file control command is received from a
  * friend.
  */
-void tox_callback_file_recv_control(Tox *tox, tox_file_recv_control_cb *callback, void *user_data);
+void tox_callback_file_recv_control(Tox *tox, tox_file_recv_control_cb *callback);
 
 typedef enum TOX_ERR_FILE_SEEK {
 
@@ -2193,7 +2193,7 @@ typedef void tox_file_chunk_request_cb(Tox *tox, uint32_t friend_number, uint32_
  *
  * This event is triggered when Core is ready to send more file data.
  */
-void tox_callback_file_chunk_request(Tox *tox, tox_file_chunk_request_cb *callback, void *user_data);
+void tox_callback_file_chunk_request(Tox *tox, tox_file_chunk_request_cb *callback);
 
 
 /*******************************************************************************
@@ -2231,7 +2231,7 @@ typedef void tox_file_recv_cb(Tox *tox, uint32_t friend_number, uint32_t file_nu
  *
  * This event is triggered when a file transfer request is received.
  */
-void tox_callback_file_recv(Tox *tox, tox_file_recv_cb *callback, void *user_data);
+void tox_callback_file_recv(Tox *tox, tox_file_recv_cb *callback);
 
 /**
  * When length is 0, the transfer is finished and the client should release the
@@ -2259,7 +2259,7 @@ typedef void tox_file_recv_chunk_cb(Tox *tox, uint32_t friend_number, uint32_t f
  * This event is first triggered when a file transfer request is received, and
  * subsequently when a chunk of file data for an accepted request was received.
  */
-void tox_callback_file_recv_chunk(Tox *tox, tox_file_recv_chunk_cb *callback, void *user_data);
+void tox_callback_file_recv_chunk(Tox *tox, tox_file_recv_chunk_cb *callback);
 
 
 /*******************************************************************************
@@ -2389,7 +2389,7 @@ typedef void tox_friend_lossy_packet_cb(Tox *tox, uint32_t friend_number, const
  * Set the callback for the `friend_lossy_packet` event. Pass NULL to unset.
  *
  */
-void tox_callback_friend_lossy_packet(Tox *tox, tox_friend_lossy_packet_cb *callback, void *user_data);
+void tox_callback_friend_lossy_packet(Tox *tox, tox_friend_lossy_packet_cb *callback);
 
 /**
  * @param friend_number The friend number of the friend who sent the packet.
@@ -2404,7 +2404,7 @@ typedef void tox_friend_lossless_packet_cb(Tox *tox, uint32_t friend_number, con
  * Set the callback for the `friend_lossless_packet` event. Pass NULL to unset.
  *
  */
-void tox_callback_friend_lossless_packet(Tox *tox, tox_friend_lossless_packet_cb *callback, void *user_data);
+void tox_callback_friend_lossless_packet(Tox *tox, tox_friend_lossless_packet_cb *callback);
 
 
 /*******************************************************************************