4 files changed, 26 insertions, 17 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;
diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h
index 2317eb8b..6f99f15b 100644
--- a/toxcore/Messenger.h
+++ b/toxcore/Messenger.h
@@ -200,8 +200,11 @@ typedef struct {
     unsigned int num_sending_files;
     struct File_Transfers file_receiving[MAX_CONCURRENT_FILE_PIPES];
 
+    /* ToxAV, *object is the internal session data for the active call, userdata is the *pointer provided in
+     * tox_iterate()
+     */
     struct {
-        int (*function)(Messenger *m, uint32_t friendnumber, const uint8_t *data, uint16_t len, void *object);
+        int (*function)(Messenger *m, uint32_t friendnumber, const uint8_t *data, uint16_t len, void *object, void *userdata);
         void *object;
     } lossy_rtp_packethandlers[PACKET_LOSSY_AV_RESERVED];
 
@@ -245,7 +248,8 @@ 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_internal)(struct Messenger *m, uint32_t, uint8_t, void *);
+    void (*friend_connectionstatuschange_internal)(struct Messenger *m, uint32_t, uint8_t, void *, void *);
+    /* ToxAV internal session data */
     void *friend_connectionstatuschange_internal_userdata;
 
     void *group_chat_object; /* Set by new_groupchats()*/
@@ -258,7 +262,7 @@ struct Messenger {
     void (*file_filedata)(struct Messenger *m, uint32_t, uint32_t, uint64_t, const uint8_t *, size_t, void *);
     void (*file_reqchunk)(struct Messenger *m, uint32_t, uint32_t, uint64_t, size_t, void *);
 
-    void (*msi_packet)(struct Messenger *m, uint32_t, const uint8_t *, uint16_t, void *);
+    void (*msi_packet)(struct Messenger *m, uint32_t, const uint8_t *, uint16_t, void *, void *);
     void *msi_packet_userdata;
 
     void (*lossy_packethandler)(struct Messenger *m, uint32_t, const uint8_t *, size_t, void *);
@@ -523,7 +527,8 @@ void m_callback_read_receipt(Messenger *m, void (*function)(Messenger *m, uint32
 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 *),
+void m_callback_connectionstatus_internal_av(Messenger *m, void (*function)(Messenger *m, uint32_t, uint8_t, void *,
+        void *),
         void *userdata);
 
 
@@ -657,8 +662,8 @@ uint64_t file_dataremaining(const Messenger *m, int32_t friendnumber, uint8_t fi
  *
  *  Function(Messenger *m, uint32_t 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 *toxav_session);
 
 /* Send an msi packet.
  *
@@ -673,7 +678,7 @@ int m_msi_packet(const Messenger *m, int32_t friendnumber, const uint8_t *data,
  * return 0 on success.
  */
 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);
 
 /**********************************************/
 
diff --git a/toxcore/tox.h b/toxcore/tox.h
index a8488aeb..61c4227a 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -1237,6 +1237,10 @@ typedef enum TOX_ERR_FRIEND_DELETE {
  * function, this client will appear offline to the friend and no communication
  * can occur between the two.
  *
+ * WARNING, calling tox_friend_delete while there's an active ToxAV call will
+ * result in undefined behavior. It's the client's responsibility to end all
+ * ToxAV calls before deleting a friend.
+ *
  * @param friend_number Friend number for the friend to be deleted.
  *
  * @return true on success.
diff --git a/toxcore/util.h b/toxcore/util.h
index 840f0a3e..d7ad7beb 100644
--- a/toxcore/util.h
+++ b/toxcore/util.h
@@ -30,7 +30,6 @@
 #include <stdint.h>
 
 #define MIN(a,b) (((a)<(b))?(a):(b))
-#define PAIR(TYPE1__, TYPE2__) struct { TYPE1__ first; TYPE2__ second; }
 
 void unix_time_update(void);
 uint64_t unix_time(void);