1 files changed, 10 insertions, 9 deletions

diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index def05449..90a3a9e8 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -413,7 +413,7 @@ int m_delfriend(Messenger *m, int32_t friendnumber)
     }
 
     if (m->friend_connectionstatuschange_internal) {
-        m->friend_connectionstatuschange_internal(m, friendnumber, 0, m->friend_connectionstatuschange_internal_userdata);
+        m->friend_connectionstatuschange_internal(m, friendnumber, 0, m->friend_connectionstatuschange_internal_userdata, NULL);
     }
 
     clear_receipts(m, friendnumber);
@@ -885,7 +885,8 @@ void m_callback_core_connection(Messenger *m, void (*function)(Messenger *m, uns
     m->core_connection_change = function;
 }
 
-void m_callback_connectionstatus_internal_av(Messenger *m, void (*function)(Messenger *m, uint32_t, uint8_t, void *),
+void m_callback_connectionstatus_internal_av(Messenger *m, void (*function)(Messenger *m, uint32_t, uint8_t, void *,
+        void *),
         void *userdata)
 {
     m->friend_connectionstatuschange_internal = function;
@@ -946,7 +947,7 @@ static void check_friend_connectionstatus(Messenger *m, int32_t friendnumber, ui
 
         if (m->friend_connectionstatuschange_internal) {
             m->friend_connectionstatuschange_internal(m, friendnumber, is_online,
-                    m->friend_connectionstatuschange_internal_userdata);
+                    m->friend_connectionstatuschange_internal_userdata, userdata);
         }
     }
 }
@@ -1711,11 +1712,11 @@ static int handle_filecontrol(Messenger *m, int32_t friendnumber, uint8_t receiv
  *
  *  Function(Messenger *m, int friendnumber, uint8_t *data, uint16_t length, void *userdata)
  */
-void m_callback_msi_packet(Messenger *m, void (*function)(Messenger *m, uint32_t, const uint8_t *, uint16_t, void *),
-                           void *userdata)
+void m_callback_msi_packet(Messenger *m, void (*function)(Messenger *m, uint32_t, const uint8_t *, uint16_t, void *,
+                           void *), void *object)
 {
     m->msi_packet = function;
-    m->msi_packet_userdata = userdata;
+    m->msi_packet_userdata = object;
 }
 
 /* Send an msi packet.
@@ -1741,7 +1742,7 @@ static int handle_custom_lossy_packet(void *object, int friend_num, const uint8_
         if (m->friendlist[friend_num].lossy_rtp_packethandlers[packet[0] % PACKET_LOSSY_AV_RESERVED].function) {
             return m->friendlist[friend_num].lossy_rtp_packethandlers[packet[0] % PACKET_LOSSY_AV_RESERVED].function(
                        m, friend_num, packet, length, m->friendlist[friend_num].lossy_rtp_packethandlers[packet[0] %
-                               PACKET_LOSSY_AV_RESERVED].object);
+                               PACKET_LOSSY_AV_RESERVED].object, userdata);
         }
 
         return 1;
@@ -1761,7 +1762,7 @@ void custom_lossy_packet_registerhandler(Messenger *m, void (*packet_handler_cal
 }
 
 int m_callback_rtp_packet(Messenger *m, int32_t friendnumber, uint8_t byte, int (*packet_handler_callback)(Messenger *m,
-                          uint32_t friendnumber, const uint8_t *data, uint16_t len, void *object), void *object)
+                          uint32_t friendnumber, const uint8_t *data, uint16_t len, void *object, void *userdata), void *object)
 {
     if (friend_not_valid(m, friendnumber)) {
         return -1;
@@ -2333,7 +2334,7 @@ static int handle_packet(void *object, int i, const uint8_t *temp, uint16_t len,
             }
 
             if (m->msi_packet) {
-                (*m->msi_packet)(m, i, data, data_length, m->msi_packet_userdata);
+                (*m->msi_packet)(m, i, data, data_length, m->msi_packet_userdata, userdata);
             }
 
             break;