5 files changed, 70 insertions, 48 deletions

diff --git a/toxav/av_test.c b/toxav/av_test.c
index 507a708e..e24f0a06 100644
--- a/toxav/av_test.c
+++ b/toxav/av_test.c
@@ -211,21 +211,21 @@ void t_toxav_receive_audio_frame_cb(ToxAV *av, uint32_t friend_number,
                                     uint32_t sampling_rate,
                                     void *user_data)
 {
-    CallControl* cc = user_data;
-    frame* f = malloc(sizeof(frame) + sample_count * sizeof(int16_t));
-    memcpy(f->data, pcm, sample_count);
-    f->size = sample_count/channels;
-    
-    pthread_mutex_lock(cc->arb_mutex);
-    free(rb_write(cc->arb, f));
-    pthread_mutex_unlock(cc->arb_mutex);
-    
-//     Pa_WriteStream(adout, pcm, sample_count/channels);
+//     CallControl* cc = user_data;
+//     frame* f = malloc(sizeof(frame) + sample_count * sizeof(int16_t));
+//     memcpy(f->data, pcm, sample_count);
+//     f->size = sample_count/channels;
+//     
+//     pthread_mutex_lock(cc->arb_mutex);
+//     free(rb_write(cc->arb, f));
+//     pthread_mutex_unlock(cc->arb_mutex);
+    
+    Pa_WriteStream(adout, pcm, sample_count/channels);
 }
-void t_accept_friend_request_cb(Tox *m, const uint8_t *public_key, const uint8_t *data, uint16_t length, void *userdata)
+void t_accept_friend_request_cb(Tox *m, const uint8_t *public_key, const uint8_t *data, size_t length, void *userdata)
 {
     if (length == 7 && memcmp("gentoo", data, 7) == 0) {
-        tox_add_friend_norequest(m, public_key);
+        assert(tox_friend_add_norequest(m, public_key, NULL) != ~0);
     }
 }
 
@@ -237,11 +237,17 @@ void initialize_tox(Tox** bootstrap, ToxAV** AliceAV, CallControl* AliceCC, ToxA
     Tox* Alice;
     Tox* Bob;
     
-    *bootstrap = tox_new(0);
-    Alice = tox_new(0);
-    Bob = tox_new(0);
-    
-    assert(bootstrap && Alice && Bob);
+    {
+        TOX_ERR_NEW error;
+        *bootstrap = tox_new(NULL, NULL, 0, &error);
+        assert(error == TOX_ERR_NEW_OK);
+        
+        Alice = tox_new(NULL, NULL, 0, &error);
+        assert(error == TOX_ERR_NEW_OK);
+        
+        Bob = tox_new(NULL, NULL, 0, &error);
+        assert(error == TOX_ERR_NEW_OK);
+    }
     
     printf("Created 3 instances of Tox\n");
     
@@ -249,26 +255,30 @@ void initialize_tox(Tox** bootstrap, ToxAV** AliceAV, CallControl* AliceCC, ToxA
     long long unsigned int cur_time = time(NULL);
     
     uint32_t to_compare = 974536;
-    uint8_t address[TOX_FRIEND_ADDRESS_SIZE];
+    uint8_t address[TOX_ADDRESS_SIZE];
     
     tox_callback_friend_request(Alice, t_accept_friend_request_cb, &to_compare);
-    tox_get_address(Alice, address);
+    tox_self_get_address(Alice, address);
+    
     
-    assert(tox_add_friend(Bob, address, (uint8_t *)"gentoo", 7) >= 0);
+    assert(tox_friend_add(Bob, address, (uint8_t *)"gentoo", 7, NULL) != ~0);
     
     uint8_t off = 1;
     
     while (1) {
-        tox_do(*bootstrap);
-        tox_do(Alice);
-        tox_do(Bob);
+        tox_iterate(*bootstrap);
+        tox_iterate(Alice);
+        tox_iterate(Bob);
         
-        if (tox_isconnected(*bootstrap) && tox_isconnected(Alice) && tox_isconnected(Bob) && off) {
+        if (tox_self_get_connection_status(*bootstrap) && 
+            tox_self_get_connection_status(Alice) && 
+            tox_self_get_connection_status(Bob) && off) {
             printf("Toxes are online, took %llu seconds\n", time(NULL) - cur_time);
             off = 0;
         }
         
-        if (tox_get_friend_connection_status(Alice, 0) == 1 && tox_get_friend_connection_status(Bob, 0) == 1)
+        if (tox_friend_get_connection_status(Alice, 0, NULL) == TOX_CONNECTION_UDP && 
+            tox_friend_get_connection_status(Bob, 0, NULL) == TOX_CONNECTION_UDP)
             break;
         
         c_sleep(20);
@@ -300,11 +310,11 @@ void initialize_tox(Tox** bootstrap, ToxAV** AliceAV, CallControl* AliceCC, ToxA
 }
 int iterate_tox(Tox* bootstrap, ToxAV* AliceAV, ToxAV* BobAV)
 {
-    tox_do(bootstrap);
-    tox_do(toxav_get_tox(AliceAV));
-    tox_do(toxav_get_tox(BobAV));
+    tox_iterate(bootstrap);
+    tox_iterate(toxav_get_tox(AliceAV));
+    tox_iterate(toxav_get_tox(BobAV));
     
-    return MIN(tox_do_interval(toxav_get_tox(AliceAV)), tox_do_interval(toxav_get_tox(BobAV)));
+    return MIN(tox_iteration_interval(toxav_get_tox(AliceAV)), tox_iteration_interval(toxav_get_tox(BobAV)));
 }
 void* iterate_toxav (void * data)
 {   
diff --git a/toxav/group.c b/toxav/group.c
index 3c09878a..817ee6e6 100644
--- a/toxav/group.c
+++ b/toxav/group.c
@@ -23,9 +23,11 @@
 #endif
 
 #include "group.h"
+#include "../toxcore/util.h"
 #include "../toxcore/logger.h"
 
 #define GROUP_JBUF_SIZE 6
+#define GROUP_JBUF_DEAD_SECONDS 4
 
 typedef struct {
     uint16_t sequnum;
@@ -39,6 +41,7 @@ typedef struct {
     uint32_t capacity;
     uint16_t bottom;
     uint16_t top;
+    uint64_t last_queued_time;
 } Group_JitterBuffer;
 
 static Group_JitterBuffer *create_queue(unsigned int capacity)
@@ -90,11 +93,19 @@ static int queue(Group_JitterBuffer *q, Group_Audio_Packet *pk)
 
     unsigned int num = sequnum % q->size;
 
+    if (!is_timeout(q->last_queued_time, GROUP_JBUF_DEAD_SECONDS)) {
+        if ((uint32_t)(sequnum - q->bottom) > (1 << 15)) {
+            /* Drop old packet. */
+            return -1;
+        }
+    }
+
     if ((uint32_t)(sequnum - q->bottom) > q->size) {
         clear_queue(q);
         q->bottom = sequnum - q->capacity;
         q->queue[num] = pk;
         q->top = sequnum + 1;
+        q->last_queued_time = unix_time();
         return 0;
     }
 
@@ -106,6 +117,7 @@ static int queue(Group_JitterBuffer *q, Group_Audio_Packet *pk)
     if ((sequnum - q->bottom) >= (q->top - q->bottom))
         q->top = sequnum + 1;
 
+    q->last_queued_time = unix_time();
     return 0;
 }
 
diff --git a/toxav/msi.c b/toxav/msi.c
index 29e053ec..c313e288 100644
--- a/toxav/msi.c
+++ b/toxav/msi.c
@@ -88,10 +88,10 @@ static int invoke_callback(MSICall* call, MSICallbackID cb);
 static MSICall *get_call ( MSISession *session, uint32_t friend_id );
 MSICall *new_call ( MSISession *session, uint32_t friend_id );
 void kill_call ( MSICall *call );
-void on_peer_status(Messenger *m, int friend_id, uint8_t status, void *data);
+void on_peer_status(Messenger *m, uint32_t friend_id, uint8_t status, void *data);
 void handle_push ( MSICall *call, const MSIMessage *msg );
 void handle_pop ( MSICall *call, const MSIMessage *msg );
-void handle_msi_packet ( Messenger *m, int friend_id, const uint8_t *data, uint16_t length, void *object );
+void handle_msi_packet ( Messenger *m, uint32_t friend_id, const uint8_t *data, uint16_t length, void *object );
 
 
 /**
@@ -572,7 +572,7 @@ CLEAR_CONTAINER:
     free(call);
     session->calls = NULL;
 }
-void on_peer_status(Messenger *m, int friend_id, uint8_t status, void *data)
+void on_peer_status(Messenger* m, uint32_t friend_id, uint8_t status, void* data)
 {
     (void)m;
     MSISession *session = data;
@@ -744,7 +744,7 @@ void handle_pop ( MSICall *call, const MSIMessage *msg )
     
     kill_call ( call );
 }
-void handle_msi_packet ( Messenger *m, int friend_id, const uint8_t *data, uint16_t length, void *object )
+void handle_msi_packet ( Messenger* m, uint32_t friend_id, const uint8_t* data, uint16_t length, void* object )
 {
     LOGGER_DEBUG("Got msi message");
     
diff --git a/toxav/rtp.c b/toxav/rtp.c
index 665ebf86..e1e6dbac 100644
--- a/toxav/rtp.c
+++ b/toxav/rtp.c
@@ -25,6 +25,7 @@
 
 #include "../toxcore/logger.h"
 #include "../toxcore/util.h"
+#include "../toxcore/Messenger.h"
 
 #include "rtp.h"
 #include <stdlib.h>
@@ -77,11 +78,9 @@ RTPMessage *msg_parse ( const uint8_t *data, int length );
 uint8_t *parse_header_out ( const RTPHeader* header, uint8_t* payload );
 uint8_t *parse_ext_header_out ( const RTPExtHeader* header, uint8_t* payload );
 void build_header ( RTPSession* session, RTPHeader* header );
-void send_rtcp_report ( RTCPSession* session, Messenger* m, int32_t friendnumber );
-int handle_rtp_packet ( Messenger *m, int32_t friendnumber, const uint8_t *data, uint32_t length, void *object );
-int handle_rtcp_packet ( Messenger *m, int32_t friendnumber, const uint8_t *data, uint32_t length, void *object );
-
-
+void send_rtcp_report ( RTCPSession* session, Messenger* m, uint32_t friendnumber );
+int handle_rtp_packet ( Messenger *m, uint32_t friendnumber, const uint8_t *data, uint16_t length, void *object );
+int handle_rtcp_packet ( Messenger *m, uint32_t friendnumber, const uint8_t *data, uint16_t length, void *object );
 
 
 RTPSession *rtp_new ( int payload_type, Messenger *messenger, int friend_num )
@@ -121,7 +120,7 @@ RTPSession *rtp_new ( int payload_type, Messenger *messenger, int friend_num )
         return NULL;
     }
     
-    retu->rtcp_session->prefix = 222 + payload_type % 192;
+    retu->rtcp_session->prefix = payload_type + 2;
     retu->rtcp_session->pl_stats = rb_new(4);
     retu->rtcp_session->rtp_session = retu;
     
@@ -201,15 +200,15 @@ int rtp_start_receiving(RTPSession* session)
     if (session == NULL)
         return -1;
     
-    if (custom_lossy_packet_registerhandler(session->m, session->dest, session->prefix,
+    if (m_callback_rtp_packet(session->m, session->dest, session->prefix,
         handle_rtp_packet, session) == -1) {
         LOGGER_WARNING("Failed to register rtp receive handler");
         return -1;
     }
-    if (custom_lossy_packet_registerhandler(session->m, session->dest, session->rtcp_session->prefix,
+    if (m_callback_rtp_packet(session->m, session->dest, session->rtcp_session->prefix,
         handle_rtcp_packet, session->rtcp_session) == -1) {
         LOGGER_WARNING("Failed to register rtcp receive handler");
-        custom_lossy_packet_registerhandler(session->m, session->dest, session->prefix, NULL, NULL);
+        m_callback_rtp_packet(session->m, session->dest, session->prefix, NULL, NULL);
         return -1;
     }
     
@@ -220,8 +219,8 @@ int rtp_stop_receiving(RTPSession* session)
     if (session == NULL)
         return -1;
     
-    custom_lossy_packet_registerhandler(session->m, session->dest, session->prefix, NULL, NULL);
-    custom_lossy_packet_registerhandler(session->m, session->dest, session->rtcp_session->prefix, NULL, NULL); /* RTCP */
+    m_callback_rtp_packet(session->m, session->dest, session->prefix, NULL, NULL);
+    m_callback_rtp_packet(session->m, session->dest, session->rtcp_session->prefix, NULL, NULL); /* RTCP */
     
     return 0;
 }
@@ -251,6 +250,7 @@ int rtp_send_msg ( RTPSession *session, const uint8_t *data, uint16_t length )
 
     memcpy ( it, data, length );
     
+    
     if ( -1 == send_custom_lossy_packet(session->m, session->dest, parsed, parsed_len) ) {
         LOGGER_WARNING("Failed to send full packet (len: %d)! std error: %s", length, strerror(errno));
         return -1;
@@ -514,7 +514,7 @@ void build_header ( RTPSession *session, RTPHeader *header )
 
     header->length = 12 /* Minimum header len */ + ( session->cc * size_32 );
 }
-void send_rtcp_report(RTCPSession* session, Messenger* m, int32_t friendnumber)
+void send_rtcp_report(RTCPSession* session, Messenger* m, uint32_t friendnumber)
 {
     if (session->last_expected_packets == 0)
         return;
@@ -538,7 +538,7 @@ void send_rtcp_report(RTCPSession* session, Messenger* m, int32_t friendnumber)
         session->last_sent_report_ts = current_time_monotonic();
     }
 }
-int handle_rtp_packet ( Messenger *m, int32_t friendnumber, const uint8_t *data, uint32_t length, void *object )
+int handle_rtp_packet ( Messenger* m, uint32_t friendnumber, const uint8_t* data, uint16_t length, void* object )
 {
     RTPSession *session = object;
     RTPMessage *msg;
@@ -574,7 +574,7 @@ int handle_rtp_packet ( Messenger *m, int32_t friendnumber, const uint8_t *data,
     queue_message(session, msg);
     return 0;
 }
-int handle_rtcp_packet ( Messenger *m, int32_t friendnumber, const uint8_t *data, uint32_t length, void *object )
+int handle_rtcp_packet ( Messenger* m, uint32_t friendnumber, const uint8_t* data, uint16_t length, void* object )
 {
     if (length < 9)
         return -1;
diff --git a/toxav/toxav.c b/toxav/toxav.c
index dbc06587..2e6326fd 100644
--- a/toxav/toxav.c
+++ b/toxav/toxav.c
@@ -904,7 +904,7 @@ ToxAVCall* call_new(ToxAV* av, uint32_t friend_number, TOXAV_ERR_CALL* error)
         goto END;
     }
     
-    if (m_get_friend_connectionstatus(av->m, friend_number) != 1) {
+    if (m_get_friend_connectionstatus(av->m, friend_number) < 1) {
         rc = TOXAV_ERR_CALL_FRIEND_NOT_CONNECTED;
         goto END;
     }