3 files changed, 55 insertions, 53 deletions

diff --git a/toxav/rtp.c b/toxav/rtp.c
index 63c2cdcb..beef1919 100644
--- a/toxav/rtp.c
+++ b/toxav/rtp.c
@@ -341,7 +341,7 @@ RTPMessage *msg_parse ( const uint8_t *data, int length )
 /**
  * Callback for networking core.
  */
-int rtp_handle_packet ( Messenger *m, uint32_t friendnumber, const uint8_t *data, uint32_t length, void *object )
+int rtp_handle_packet ( Messenger *m, uint32_t friendnumber, const uint8_t *data, uint16_t length, void *object )
 {
     RTPSession *session = object;
     RTPMessage *msg;
@@ -469,7 +469,7 @@ RTPSession *rtp_new ( int payload_type, Messenger *messenger, int friend_num )
         return NULL;
     }
 
-    if ( -1 == custom_lossy_packet_registerhandler(messenger, friend_num, payload_type, rtp_handle_packet, retu)) {
+    if ( -1 == m_callback_rtp_packet(messenger, friend_num, payload_type, rtp_handle_packet, retu)) {
         LOGGER_ERROR("Error setting custom register handler for rtp session");
         free(retu);
         return NULL;
@@ -514,7 +514,7 @@ void rtp_kill ( RTPSession *session, Messenger *messenger )
 {
     if ( !session ) return;
 
-    custom_lossy_packet_registerhandler(messenger, session->dest, session->prefix, NULL, NULL);
+    m_callback_rtp_packet(messenger, session->dest, session->prefix, NULL, NULL);
 
     free ( session->ext_header );
     free ( session->csrc );
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 22adb088..33d087de 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -1333,17 +1333,30 @@ static int handle_custom_lossy_packet(void *object, int friend_num, const uint8_
     if (friend_not_valid(m, friend_num))
         return 1;
 
-    if (m->friendlist[friend_num].lossy_packethandlers[packet[0] % PACKET_ID_LOSSY_RANGE_SIZE].function)
-        return m->friendlist[friend_num].lossy_packethandlers[packet[0] % PACKET_ID_LOSSY_RANGE_SIZE].function(
-                   m, friend_num, packet, length, m->friendlist[friend_num].lossy_packethandlers[packet[0] %
-                           PACKET_ID_LOSSY_RANGE_SIZE].object);
+    if (packet[0] < (PACKET_ID_LOSSY_RANGE_START + PACKET_LOSSY_AV_RESERVED)) {
+        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);
+
+        return 1;
+    }
+
+    if (m->lossy_packethandler)
+        m->lossy_packethandler(m, friend_num, packet, length, m->lossy_packethandler_userdata);
 
     return 1;
 }
 
-int custom_lossy_packet_registerhandler(Messenger *m, int32_t friendnumber, uint8_t byte,
-                                        int (*packet_handler_callback)(Messenger *m, uint32_t friendnumber, const uint8_t *data, uint32_t len, void *object),
-                                        void *object)
+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)
+{
+    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,
+                          uint32_t friendnumber, const uint8_t *data, uint16_t len, void *object), void *object)
 {
     if (friend_not_valid(m, friendnumber))
         return -1;
@@ -1351,14 +1364,16 @@ int custom_lossy_packet_registerhandler(Messenger *m, int32_t friendnumber, uint
     if (byte < PACKET_ID_LOSSY_RANGE_START)
         return -1;
 
-    if (byte >= (PACKET_ID_LOSSY_RANGE_START + PACKET_ID_LOSSY_RANGE_SIZE))
+    if (byte >= (PACKET_ID_LOSSY_RANGE_START + PACKET_LOSSY_AV_RESERVED))
         return -1;
 
-    m->friendlist[friendnumber].lossy_packethandlers[byte % PACKET_ID_LOSSY_RANGE_SIZE].function = packet_handler_callback;
-    m->friendlist[friendnumber].lossy_packethandlers[byte % PACKET_ID_LOSSY_RANGE_SIZE].object = object;
+    m->friendlist[friendnumber].lossy_rtp_packethandlers[byte % PACKET_LOSSY_AV_RESERVED].function =
+        packet_handler_callback;
+    m->friendlist[friendnumber].lossy_rtp_packethandlers[byte % PACKET_LOSSY_AV_RESERVED].object = object;
     return 0;
 }
 
+
 int send_custom_lossy_packet(const Messenger *m, int32_t friendnumber, const uint8_t *data, uint32_t length)
 {
     if (friend_not_valid(m, friendnumber))
@@ -1384,31 +1399,17 @@ static int handle_custom_lossless_packet(void *object, int friend_num, const uin
     if (packet[0] >= (PACKET_ID_LOSSLESS_RANGE_START + PACKET_ID_LOSSLESS_RANGE_SIZE))
         return -1;
 
-    if (m->friendlist[friend_num].lossless_packethandlers[packet[0] % PACKET_ID_LOSSLESS_RANGE_SIZE].function)
-        return m->friendlist[friend_num].lossless_packethandlers[packet[0] % PACKET_ID_LOSSLESS_RANGE_SIZE].function(
-                   m, friend_num, packet, length, m->friendlist[friend_num].lossless_packethandlers[packet[0] %
-                           PACKET_ID_LOSSLESS_RANGE_SIZE].object);
+    if (m->lossless_packethandler)
+        m->lossless_packethandler(m, friend_num, packet, length, m->lossless_packethandler_userdata);
 
     return 1;
 }
 
-int custom_lossless_packet_registerhandler(Messenger *m, int32_t friendnumber, uint8_t byte,
-        int (*packet_handler_callback)(Messenger *m, uint32_t friendnumber, const uint8_t *data, uint32_t len, void *object),
-        void *object)
+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)
 {
-    if (friend_not_valid(m, friendnumber))
-        return -1;
-
-    if (byte < PACKET_ID_LOSSLESS_RANGE_START)
-        return -1;
-
-    if (byte >= (PACKET_ID_LOSSLESS_RANGE_START + PACKET_ID_LOSSLESS_RANGE_SIZE))
-        return -1;
-
-    m->friendlist[friendnumber].lossless_packethandlers[byte % PACKET_ID_LOSSLESS_RANGE_SIZE].function =
-        packet_handler_callback;
-    m->friendlist[friendnumber].lossless_packethandlers[byte % PACKET_ID_LOSSLESS_RANGE_SIZE].object = object;
-    return 0;
+    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)
diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h
index 48235900..5d5e5879 100644
--- a/toxcore/Messenger.h
+++ b/toxcore/Messenger.h
@@ -63,6 +63,7 @@
 /* All packets starting with a byte in this range can be used for anything. */
 #define PACKET_ID_LOSSLESS_RANGE_START 160
 #define PACKET_ID_LOSSLESS_RANGE_SIZE 32
+#define PACKET_LOSSY_AV_RESERVED 8 /* Number of lossy packet types at start of range reserved for A/V. */
 
 typedef struct {
     uint8_t ipv6enabled;
@@ -179,14 +180,9 @@ typedef struct {
     struct File_Transfers file_receiving[MAX_CONCURRENT_FILE_PIPES];
 
     struct {
-        int (*function)(Messenger *m, uint32_t friendnumber, const uint8_t *data, uint32_t len, void *object);
+        int (*function)(Messenger *m, uint32_t friendnumber, const uint8_t *data, uint16_t len, void *object);
         void *object;
-    } lossy_packethandlers[PACKET_ID_LOSSY_RANGE_SIZE];
-
-    struct {
-        int (*function)(Messenger *m, uint32_t friendnumber, const uint8_t *data, uint32_t len, void *object);
-        void *object;
-    } lossless_packethandlers[PACKET_ID_LOSSLESS_RANGE_SIZE];
+    } lossy_rtp_packethandlers[PACKET_LOSSY_AV_RESERVED];
 
     struct Receipts *receipts_start;
     struct Receipts *receipts_end;
@@ -260,6 +256,11 @@ struct Messenger {
     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;
+
     Messenger_Options options;
 };
 
@@ -631,16 +632,21 @@ void m_callback_msi_packet(Messenger *m, void (*function)(Messenger *m, uint32_t
  */
 int m_msi_packet(const Messenger *m, int32_t friendnumber, const uint8_t *data, uint16_t length);
 
-/**********************************************/
-
-/* Set handlers for custom lossy packets (RTP packets for example.)
+/* Set handlers for lossy rtp packets.
  *
  * return -1 on failure.
  * return 0 on success.
  */
-int custom_lossy_packet_registerhandler(Messenger *m, int32_t friendnumber, uint8_t byte,
-                                        int (*packet_handler_callback)(Messenger *m, uint32_t friendnumber, const uint8_t *data, uint32_t len, void *object),
-                                        void *object);
+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);
+
+/**********************************************/
+
+/* Set handlers for custom lossy packets.
+ *
+ */
+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);
 
 /* High level function to send custom lossy packets.
  *
@@ -652,14 +658,9 @@ int send_custom_lossy_packet(const Messenger *m, int32_t friendnumber, const uin
 
 /* Set handlers for custom lossless packets.
  *
- * byte must be in PACKET_ID_LOSSLESS_RANGE_START PACKET_ID_LOSSLESS_RANGE_SIZE range.
- *
- * return -1 on failure.
- * return 0 on success.
  */
-int custom_lossless_packet_registerhandler(Messenger *m, int32_t friendnumber, uint8_t byte,
-        int (*packet_handler_callback)(Messenger *m, uint32_t friendnumber, const uint8_t *data, uint32_t len, void *object),
-        void *object);
+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);
 
 /* High level function to send custom lossless packets.
  *