Public header ready to go

1 files changed, 24 insertions, 31 deletions

diff --git a/toxav/rtp.c b/toxav/rtp.c
index e23fa132..80fcc630 100644
--- a/toxav/rtp.c
+++ b/toxav/rtp.c
@@ -30,10 +30,6 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include "../toxcore/util.h"
-#include "../toxcore/network.h"
-#include "../toxcore/net_crypto.h"
-#include "../toxcore/Messenger.h"
 
 #define PAYLOAD_ID_VALUE_OPUS 1
 #define PAYLOAD_ID_VALUE_VP8  2
@@ -241,8 +237,8 @@ RTPHeader* extract_header ( const uint8_t* payload, int length )
     
     _retu->flags = *_it; ++_it;
     
-    /* This indicates if the first 2 bytes are valid.
-     * Now it my happen that this is out of order but
+    /* This indicates if the first 2 bits are valid.
+     * Now it may happen that this is out of order but
      * it cuts down chances of parsing some invalid value
      */
     
@@ -299,7 +295,7 @@ RTPHeader* extract_header ( const uint8_t* payload, int length )
  * @return RTPExtHeader* Extracted extension header.
  * @retval NULL Error occurred while extracting extension header.
  */
-RTPExtHeader* extract_ext_header ( const uint8_t* payload, size_t length )
+RTPExtHeader* extract_ext_header ( const uint8_t* payload, uint16_t length )
 {
     const uint8_t* _it = payload;
     
@@ -551,7 +547,7 @@ int rtp_handle_packet ( void* object, IP_Port ip_port, uint8_t* data, uint32_t l
     /* Hopefully this goes well 
      * NOTE: Is this even used?
      */
-    memcpy(&_msg->from, &ip_port, sizeof(tox_IP_Port));
+    memcpy(&_msg->from, &ip_port, sizeof(IP_Port));
     
     /* Check if message came in late */
     if ( check_late_message(_session, _msg) < 0 ) { /* Not late */
@@ -689,7 +685,7 @@ int rtp_release_session_recv ( RTPSession* session )
 
 
 /**
- * @brief Get's oldes message in the list.
+ * @brief Gets oldest message in the list.
  * 
  * @param session Where the list is.
  * @return RTPMessage* The message. You _must_ call rtp_msg_free() to free it.
@@ -727,7 +723,7 @@ RTPMessage* rtp_recv_msg ( RTPSession* session )
  * @retval -1 On error.
  * @retval 0 On success.
  */
-int rtp_send_msg ( RTPSession* session, Tox* messenger, const uint8_t* data, uint16_t length )
+int rtp_send_msg ( RTPSession* session, Messenger* messenger, const uint8_t* data, uint16_t length )
 {
     RTPMessage* msg = rtp_new_message (session, data, length);
     
@@ -743,8 +739,8 @@ int rtp_send_msg ( RTPSession* session, Tox* messenger, const uint8_t* data, uin
     increase_nonce ( _calculated, msg->header->sequnum );
     
     /* Need to skip 2 bytes that are for sequnum */
-    int encrypted_length = encrypt_data_symmetric(
-        (uint8_t*) session->encrypt_key, _calculated, msg->data + 2, msg->length - 2, _send_data + 3 );
+    int encrypted_length = encrypt_data_symmetric( /* TODO: msg->length - 2 (fix this properly)*/
+        (uint8_t*) session->encrypt_key, _calculated, msg->data + 2, msg->length, _send_data + 3 );
     
     int full_length = encrypted_length + 3;
     
@@ -752,7 +748,8 @@ int rtp_send_msg ( RTPSession* session, Tox* messenger, const uint8_t* data, uin
     _send_data[2] = msg->data[1];
     
     
-    if ( full_length != sendpacket ( ((Messenger*)messenger)->net, *((IP_Port*) &session->dest), _send_data, full_length) ) {
+    /*if ( full_length != sendpacket ( messenger->net, *((IP_Port*) &session->dest), _send_data, full_length) ) {*/
+    if ( full_length != send_custom_user_packet(messenger, session->dest, _send_data, full_length) ) {
         printf("Rtp error: %s\n", strerror(errno));
         return -1;
     }
@@ -816,30 +813,26 @@ void rtp_free_msg ( RTPSession* session, RTPMessage* msg )
  * @retval NULL Error occurred.
  */
 RTPSession* rtp_init_session ( int            payload_type, 
-                               Tox*           messenger, 
+                               Messenger*     messenger, 
                                int            friend_num, 
                                const uint8_t* encrypt_key, 
                                const uint8_t* decrypt_key, 
                                const uint8_t* encrypt_nonce, 
-                               const uint8_t* decrypt_nonce 
-)
+                               const uint8_t* decrypt_nonce )
 {    
-    Messenger* _messenger_casted = (Messenger*) messenger;
-    
-    IP_Port _dest = get_friend_ipport(_messenger_casted, friend_num );
-    
-    /* This should be enough eh? */
-    if ( _dest.port == 0) {
-        return NULL;
-    }
-    
     RTPSession* _retu = calloc(1, sizeof(RTPSession));
     assert(_retu);
     
-    networking_registerhandler(_messenger_casted->net, payload_type, rtp_handle_packet, _retu);
+    /*networking_registerhandler(messenger->net, payload_type, rtp_handle_packet, _retu);*/
+    if ( -1 == custom_user_packet_registerhandler(messenger, friend_num, payload_type, rtp_handle_packet, _retu) )
+    {
+        fprintf(stderr, "Error setting custom register handler for rtp session\n");
+        free(_retu);
+        return NULL;
+    }
     
-    _retu->version = RTP_VERSION;   /* It's always 2 */
-    _retu->padding = 0;             /* If some additional data is needed about the packet */
+    _retu->version   = RTP_VERSION;   /* It's always 2 */
+    _retu->padding   = 0;             /* If some additional data is needed about the packet */
     _retu->extension = 0;           /* If extension to header is needed */
     _retu->cc        = 1;           /* Amount of contributors */
     _retu->csrc      = NULL;        /* Container */
@@ -847,7 +840,7 @@ RTPSession* rtp_init_session ( int            payload_type,
     _retu->marker    = 0;
     _retu->payload_type = payload_table[payload_type];        
     
-    _retu->dest = *((tox_IP_Port*)&_dest);
+    _retu->dest = friend_num;
     
     _retu->rsequnum = _retu->sequnum = 1;
     
@@ -894,12 +887,12 @@ RTPSession* rtp_init_session ( int            payload_type,
  * @retval -1 Error occurred.
  * @retval 0 Success.
  */
-int rtp_terminate_session ( RTPSession* session, Tox* messenger )
+int rtp_terminate_session ( RTPSession* session, Messenger* messenger )
 {
     if ( !session )
         return -1;
     
-    networking_registerhandler(((Messenger*)messenger)->net, session->prefix, NULL, NULL);
+    custom_user_packet_registerhandler(messenger, session->dest, session->prefix, NULL, NULL);
     
     free ( session->ext_header );
     free ( session->csrc );