Merge branch 'master' of https://github.com/mannol1/toxcore

2 files changed, 160 insertions, 192 deletions

diff --git a/auto_tests/toxav_basic_test.c b/auto_tests/toxav_basic_test.c
index bf130ecb..5fe17b40 100644
--- a/auto_tests/toxav_basic_test.c
+++ b/auto_tests/toxav_basic_test.c
@@ -31,7 +31,8 @@ typedef enum _CallStatus {
     Ringing,
     Ended,
     Rejected,
-    Cancel
+    Cancel,
+    TimedOut
 
 } CallStatus;
 
@@ -59,7 +60,7 @@ void accept_friend_request(Tox *m, const uint8_t *public_key, const uint8_t *dat
 
 
 /******************************************************************************/
-void callback_recv_invite ( int32_t call_index, void *_arg )
+void callback_recv_invite ( void *av, int32_t call_index, void *_arg )
 {
     Status *cast = _arg;
 
@@ -67,23 +68,23 @@ void callback_recv_invite ( int32_t call_index, void *_arg )
     cast->Bob.status = Ringing;
     cast->Bob.call_index = call_index;
 }
-void callback_recv_ringing ( int32_t call_index, void *_arg )
+void callback_recv_ringing ( void *av, int32_t call_index, void *_arg )
 {
     Status *cast = _arg;
 
     /* Alice always sends invite */
     cast->Alice.status = Ringing;
 }
-void callback_recv_starting ( int32_t call_index, void *_arg )
+void callback_recv_starting ( void *av, int32_t call_index, void *_arg )
 {
     Status *cast = _arg;
 
     /* Alice always sends invite */
     printf("Call started on Alice side...\n");
     cast->Alice.status = InCall;
-    toxav_prepare_transmission(cast->Alice.av, call_index, &muhcaps, 1);
+    toxav_prepare_transmission(av, call_index, &muhcaps, 1);
 }
-void callback_recv_ending ( int32_t call_index, void *_arg )
+void callback_recv_ending ( void *av, int32_t call_index, void *_arg )
 {
     Status *cast = _arg;
 
@@ -96,28 +97,24 @@ void callback_recv_ending ( int32_t call_index, void *_arg )
     }
 }
 
-void callback_recv_error ( int32_t call_index, void *_arg )
-{
-    ck_assert_msg(0, "AV internal error");
-}
 
-void callback_call_started ( int32_t call_index, void *_arg )
+void callback_call_started ( void *av, int32_t call_index, void *_arg )
 {
     Status *cast = _arg;
 
     /* Alice always sends invite */
     printf("Call started on Bob side...\n");
     cast->Bob.status = InCall;
-    toxav_prepare_transmission(cast->Bob.av, call_index, &muhcaps, 1);
+    toxav_prepare_transmission(av, call_index, &muhcaps, 1);
 }
-void callback_call_canceled ( int32_t call_index, void *_arg )
+void callback_call_canceled ( void *av, int32_t call_index, void *_arg )
 {
     Status *cast = _arg;
 
     printf ( "Call Canceled for Bob!\n" );
     cast->Bob.status = Cancel;
 }
-void callback_call_rejected ( int32_t call_index, void *_arg )
+void callback_call_rejected ( void *av, int32_t call_index, void *_arg )
 {
     Status *cast = _arg;
 
@@ -126,7 +123,7 @@ void callback_call_rejected ( int32_t call_index, void *_arg )
     /* If Bob rejects, call is ended for alice and she sends ending */
     cast->Alice.status = Rejected;
 }
-void callback_call_ended ( int32_t call_index, void *_arg )
+void callback_call_ended ( void *av, int32_t call_index, void *_arg )
 {
     Status *cast = _arg;
 
@@ -134,9 +131,17 @@ void callback_call_ended ( int32_t call_index, void *_arg )
     cast->Bob.status = Ended;
 }
 
-void callback_requ_timeout ( int32_t call_index, void *_arg )
+void callback_call_type_change ( void *av, int32_t call_index, void *_arg )
+{
+    printf("Call type changed; new type: %s!\n", toxav_get_peer_transmission_type
+           (av, call_index, 0) == TypeAudio ? "audio" : "video");
+}
+
+void callback_requ_timeout ( void *av, int32_t call_index, void *_arg )
 {
-    ck_assert_msg(0, "No answer!");
+    Status *cast = _arg;
+    printf("Call timed-out!\n");
+    cast->Alice.status = TimedOut;
 }
 
 static void callback_audio(ToxAv *av, int32_t call_index, int16_t *data, int length)
@@ -147,10 +152,31 @@ static void callback_video(ToxAv *av, int32_t call_index, vpx_image_t *img)
 {
 }
 
+void register_callbacks(ToxAv *av, void *data)
+{
+    toxav_register_callstate_callback(av, callback_call_started, av_OnStart, data);
+    toxav_register_callstate_callback(av, callback_call_canceled, av_OnCancel, data);
+    toxav_register_callstate_callback(av, callback_call_rejected, av_OnReject, data);
+    toxav_register_callstate_callback(av, callback_call_ended, av_OnEnd, data);
+    toxav_register_callstate_callback(av, callback_recv_invite, av_OnInvite, data);
+
+    toxav_register_callstate_callback(av, callback_recv_ringing, av_OnRinging, data);
+    toxav_register_callstate_callback(av, callback_recv_starting, av_OnStarting, data);
+    toxav_register_callstate_callback(av, callback_recv_ending, av_OnEnding, data);
+
+    toxav_register_callstate_callback(av, callback_requ_timeout, av_OnRequestTimeout, data);
+    toxav_register_callstate_callback(av, callback_call_type_change, av_OnMediaChange, data);
+
+
+    toxav_register_audio_recv_callback(av, callback_audio);
+    toxav_register_video_recv_callback(av, callback_video);
+}
+
+
 /*************************************************************************************************/
 
 /* Alice calls bob and the call starts.
- * What happens in the call is defined after. To quit the loop use: step++;
+ * What happens during the call is defined after. To quit the loop use: step++;
  */
 #define CALL_AND_START_LOOP(AliceCallType, BobCallType) \
 { int step = 0, running = 1; while (running) {\
@@ -218,23 +244,8 @@ START_TEST(test_AV_flows)
     ck_assert_msg(status_control.Alice.av || status_control.Bob.av, "Failed to create 2 toxav instances");
 
 
-    toxav_register_callstate_callback(callback_call_started, av_OnStart, &status_control);
-    toxav_register_callstate_callback(callback_call_canceled, av_OnCancel, &status_control);
-    toxav_register_callstate_callback(callback_call_rejected, av_OnReject, &status_control);
-    toxav_register_callstate_callback(callback_call_ended, av_OnEnd, &status_control);
-    toxav_register_callstate_callback(callback_recv_invite, av_OnInvite, &status_control);
-
-    toxav_register_callstate_callback(callback_recv_ringing, av_OnRinging, &status_control);
-    toxav_register_callstate_callback(callback_recv_starting, av_OnStarting, &status_control);
-    toxav_register_callstate_callback(callback_recv_ending, av_OnEnding, &status_control);
-
-    toxav_register_callstate_callback(callback_recv_error, av_OnError, &status_control);
-    toxav_register_callstate_callback(callback_requ_timeout, av_OnRequestTimeout, &status_control);
-
-    toxav_register_audio_recv_callback(status_control.Alice.av, callback_audio);
-    toxav_register_video_recv_callback(status_control.Alice.av, callback_video);
-    toxav_register_audio_recv_callback(status_control.Bob.av, callback_audio);
-    toxav_register_video_recv_callback(status_control.Bob.av, callback_video);
+    register_callbacks(status_control.Alice.av, &status_control);
+    register_callbacks(status_control.Bob.av, &status_control);
 
     const int frame_size = (av_DefaultSettings.audio_sample_rate * av_DefaultSettings.audio_frame_duration / 1000);
     int16_t sample_payload[frame_size];
@@ -279,24 +290,6 @@ START_TEST(test_AV_flows)
 
         toxav_send_audio(status_control.Bob.av, status_control.Bob.call_index, prepared_payload, payload_size);
 
-        /* Both receive */
-        /*int16_t storage[frame_size];
-        int recved;
-
-        /* Payload from Bob */
-
-        /*recved = toxav_recv_audio(status_control.Alice.av, status_control.Alice.call_index, frame_size, storage);
-
-        if ( recved ) {
-            //ck_assert_msg(recved == 10 && memcmp(storage, sample_payload, 10) == 0, "Payload from Bob is invalid");
-        }
-
-        recved = toxav_recv_audio(status_control.Bob.av, status_control.Bob.call_index, frame_size, storage);
-
-        if ( recved ) {
-            //ck_assert_msg(recved == 10 && memcmp(storage, sample_payload, 10) == 0, "Payload from Alice is invalid");
-        }*/
-
         if (time(NULL) - cur_time > 10) { /* Transmit for 10 seconds */
             step++; /* This terminates the loop */
             toxav_kill_transmission(status_control.Alice.av, status_control.Alice.call_index);
@@ -334,38 +327,6 @@ START_TEST(test_AV_flows)
 
 //         toxav_send_video(status_control.Bob.av, status_control.Bob.call_index, sample_image);
 
-        /* Both receive */
-        int16_t storage[frame_size];
-        vpx_image_t *video_storage;
-        int recved;
-
-        /* Payload from Bob */
-        /*recved = toxav_recv_audio(status_control.Alice.av, status_control.Alice.call_index, frame_size, storage);
-
-        if ( recved ) {
-            //ck_assert_msg(recved == 10 && memcmp(storage, sample_payload, 10) == 0, "Payload from Bob is invalid");
-        }*/
-
-        /* Video payload */
-//         toxav_recv_video(status_control.Alice.av, status_control.Alice.call_index, &video_storage);
-//
-//         if ( video_storage ) {
-//             /*ck_assert_msg( memcmp(video_storage->planes[VPX_PLANE_Y], sample_payload, 10) == 0 ||
-//                            memcmp(video_storage->planes[VPX_PLANE_U], sample_payload, 10) == 0 ||
-//                            memcmp(video_storage->planes[VPX_PLANE_V], sample_payload, 10) == 0 , "Payload from Bob is invalid");*/
-//             vpx_img_free(video_storage);
-//         }
-
-
-
-
-        /* Payload from Alice */
-        /*recved = toxav_recv_audio(status_control.Bob.av, status_control.Bob.call_index, frame_size, storage);
-
-        if ( recved ) {
-            //ck_assert_msg(recved == 10 && memcmp(storage, sample_payload, 10) == 0, "Payload from Alice is invalid");
-        }*/
-
         if (time(NULL) - cur_time > 10) { /* Transmit for 10 seconds */
             step++; /* This terminates the loop */
             toxav_kill_transmission(status_control.Alice.av, status_control.Alice.call_index);
@@ -405,48 +366,48 @@ START_TEST(test_AV_flows)
 //         toxav_send_video(status_control.Alice.av, status_control.Alice.call_index, sample_image);
 //         toxav_send_video(status_control.Bob.av, status_control.Bob.call_index, sample_image);
 
-        /* Both receive */
-        int16_t storage[frame_size];
-        vpx_image_t *video_storage;
-        int recved;
 
-        /* Payload from Bob */
-        /*recved = toxav_recv_audio(status_control.Alice.av, status_control.Alice.call_index, frame_size, storage);
+        if (time(NULL) - cur_time > 10) { /* Transmit for 10 seconds */
+            step++; /* This terminates the loop */
+            toxav_kill_transmission(status_control.Alice.av, status_control.Alice.call_index);
+            toxav_kill_transmission(status_control.Bob.av, status_control.Bob.call_index);
 
-        if ( recved ) {
-            //ck_assert_msg(recved == 10 && memcmp(storage, sample_payload, 10) == 0, "Payload from Bob is invalid");
-        }*/
+            /* Call over Alice hangs up */
+            toxav_hangup(status_control.Alice.av, status_control.Alice.call_index);
+        }
+    }
+    TERMINATE_SCOPE()
 
-        /* Video payload */
-//         toxav_recv_video(status_control.Alice.av, status_control.Alice.call_index, &video_storage);
-//
-//         if ( video_storage ) {
-//             /*ck_assert_msg( memcmp(video_storage->planes[VPX_PLANE_Y], sample_payload, 10) == 0 ||
-//             memcmp(video_storage->planes[VPX_PLANE_U], sample_payload, 10) == 0 ||
-//             memcmp(video_storage->planes[VPX_PLANE_V], sample_payload, 10) == 0 , "Payload from Bob is invalid");*/
-//             vpx_img_free(video_storage);
-//         }
 
+    uint64_t times_they_are_a_changin = time(NULL);
+    /* Media change */
+    CALL_AND_START_LOOP(TypeAudio, TypeAudio) {
+        /* Both send */
+        payload_size = toxav_prepare_audio_frame(status_control.Alice.av, status_control.Alice.call_index, prepared_payload,
+                       1000, sample_payload, frame_size);
 
+        if ( payload_size < 0 ) {
+            ck_assert_msg ( 0, "Failed to encode payload" );
+        }
 
+        toxav_send_audio(status_control.Alice.av, status_control.Alice.call_index, prepared_payload, payload_size);
 
-        /* Payload from Alice */
-        /*recved = toxav_recv_audio(status_control.Bob.av, status_control.Bob.call_index, frame_size, storage);
+        payload_size = toxav_prepare_audio_frame(status_control.Bob.av, status_control.Bob.call_index, prepared_payload, 1000,
+                       sample_payload, frame_size);
 
-        if ( recved ) {
-            ck_assert_msg(recved == 10 && memcmp(storage, sample_payload, 10) == 0, "Payload from Alice is invalid");
-        }*/
+        if ( payload_size < 0 ) {
+            ck_assert_msg ( 0, "Failed to encode payload" );
+        }
 
-        /* Video payload */
-//         toxav_recv_video(status_control.Bob.av, status_control.Bob.call_index, &video_storage);
-//
-//         if ( video_storage ) {
-//             /*ck_assert_msg( memcmp(video_storage->planes[VPX_PLANE_Y], sample_payload, 10) == 0 ||
-//             memcmp(video_storage->planes[VPX_PLANE_U], sample_payload, 10) == 0 ||
-//             memcmp(video_storage->planes[VPX_PLANE_V], sample_payload, 10) == 0 , "Payload from Alice is invalid");*/
-//             vpx_img_free(video_storage);
-//         }
+        toxav_send_audio(status_control.Bob.av, status_control.Bob.call_index, prepared_payload, payload_size);
 
+        /* Wait 2 seconds and change transmission type */
+        if (time(NULL) - times_they_are_a_changin > 2) {
+            times_they_are_a_changin = time(NULL);
+            toxav_change_type(status_control.Alice.av, status_control.Alice.call_index,
+                              toxav_get_peer_transmission_type(status_control.Bob.av, status_control.Bob.call_index, 0)
+                              == TypeAudio ? TypeVideo : TypeAudio);
+        }
 
         if (time(NULL) - cur_time > 10) { /* Transmit for 10 seconds */
             step++; /* This terminates the loop */
@@ -460,7 +421,6 @@ START_TEST(test_AV_flows)
     TERMINATE_SCOPE()
 
 
-
     /*************************************************************************************************
      * Other flows
      */
@@ -524,7 +484,7 @@ START_TEST(test_AV_flows)
                     toxav_call(status_control.Alice.av, &status_control.Alice.call_index, 0, TypeAudio, 10);
                     step++;
                     break;
-                    \
+
 
                 case 1: /* Alice again */
                     if (status_control.Bob.status == Ringing) {
@@ -547,6 +507,39 @@ START_TEST(test_AV_flows)
         printf("\n");
     }
 
+    /*
+        * Timeout
+        */
+    {
+        int step = 0;
+        int running = 1;
+
+        while (running) {
+            tox_do(bootstrap_node);
+            tox_do(Alice);
+            tox_do(Bob);
+
+            switch ( step ) {
+                case 0:
+                    printf("Alice is calling...\n");
+                    toxav_call(status_control.Alice.av, &status_control.Alice.call_index, 0, TypeAudio, 10);
+                    step++;
+                    break;
+
+                case 1:
+                    if (status_control.Alice.status == TimedOut) running = 0;
+
+                    break;
+            }
+
+            c_sleep(20);
+        }
+
+        printf("\n");
+    }
+
+
+
 
     printf("Calls ended!\n");
 }
diff --git a/auto_tests/toxav_many_test.c b/auto_tests/toxav_many_test.c
index 3195d1ed..5276c2f9 100644
--- a/auto_tests/toxav_many_test.c
+++ b/auto_tests/toxav_many_test.c
@@ -44,6 +44,7 @@ typedef struct _Party {
 
 typedef struct _ACall {
     pthread_t tid;
+    int idx;
 
     Party Caller;
     Party Callee;
@@ -53,6 +54,8 @@ typedef struct _Status {
     ACall calls[3]; /* Make 3 calls for this test */
 } Status;
 
+Status status_control;
+
 void accept_friend_request(Tox *m, const uint8_t *public_key, const uint8_t *data, uint16_t length, void *userdata)
 {
     if (length == 7 && memcmp("gentoo", data, 7) == 0) {
@@ -62,58 +65,49 @@ void accept_friend_request(Tox *m, const uint8_t *public_key, const uint8_t *dat
 
 
 /******************************************************************************/
-void callback_recv_invite ( int32_t call_index, void *_arg )
+void callback_recv_invite ( void *av, int32_t call_index, void *_arg )
 {
     /*
        Status *cast = _arg;
 
        cast->calls[call_index].Callee.status = Ringing;*/
 }
-void callback_recv_ringing ( int32_t call_index, void *_arg )
+void callback_recv_ringing ( void *av, int32_t call_index, void *_arg )
 {
     Status *cast = _arg;
-
     cast->calls[call_index].Caller.status = Ringing;
 }
-void callback_recv_starting ( int32_t call_index, void *_arg )
+void callback_recv_starting ( void *av, int32_t call_index, void *_arg )
 {
     Status *cast = _arg;
-
     cast->calls[call_index].Caller.status = InCall;
 }
-void callback_recv_ending ( int32_t call_index, void *_arg )
+void callback_recv_ending ( void *av, int32_t call_index, void *_arg )
 {
     Status *cast = _arg;
-
     cast->calls[call_index].Caller.status = Ended;
 }
 
-void callback_recv_error ( int32_t call_index, void *_arg )
-{
-    ck_assert_msg(0, "AV internal error");
-}
-
-void callback_call_started ( int32_t call_index, void *_arg )
+void callback_call_started ( void *av, int32_t call_index, void *_arg )
 {
     /*
        Status *cast = _arg;
 
        cast->calls[call_index].Callee.status = InCall;*/
 }
-void callback_call_canceled ( int32_t call_index, void *_arg )
+void callback_call_canceled ( void *av, int32_t call_index, void *_arg )
 {
     /*
        Status *cast = _arg;
 
        cast->calls[call_index].Callee.status = Cancel;*/
 }
-void callback_call_rejected ( int32_t call_index, void *_arg )
+void callback_call_rejected ( void *av, int32_t call_index, void *_arg )
 {
     Status *cast = _arg;
-
     cast->calls[call_index].Caller.status = Rejected;
 }
-void callback_call_ended ( int32_t call_index, void *_arg )
+void callback_call_ended ( void *av, int32_t call_index, void *_arg )
 {
     /*
        Status *cast = _arg;
@@ -121,7 +115,7 @@ void callback_call_ended ( int32_t call_index, void *_arg )
        cast->calls[call_index].Callee.status = Ended;*/
 }
 
-void callback_requ_timeout ( int32_t call_index, void *_arg )
+void callback_requ_timeout ( void *av, int32_t call_index, void *_arg )
 {
     ck_assert_msg(0, "No answer!");
 }
@@ -133,8 +127,27 @@ static void callback_audio(ToxAv *av, int32_t call_index, int16_t *data, int len
 static void callback_video(ToxAv *av, int32_t call_index, vpx_image_t *img)
 {
 }
+void register_callbacks(ToxAv *av, void *data)
+{
+    toxav_register_callstate_callback(av, callback_call_started, av_OnStart, data);
+    toxav_register_callstate_callback(av, callback_call_canceled, av_OnCancel, data);
+    toxav_register_callstate_callback(av, callback_call_rejected, av_OnReject, data);
+    toxav_register_callstate_callback(av, callback_call_ended, av_OnEnd, data);
+    toxav_register_callstate_callback(av, callback_recv_invite, av_OnInvite, data);
+
+    toxav_register_callstate_callback(av, callback_recv_ringing, av_OnRinging, data);
+    toxav_register_callstate_callback(av, callback_recv_starting, av_OnStarting, data);
+    toxav_register_callstate_callback(av, callback_recv_ending, av_OnEnding, data);
+
+    toxav_register_callstate_callback(av, callback_requ_timeout, av_OnRequestTimeout, data);
+
+
+    toxav_register_audio_recv_callback(av, callback_audio);
+    toxav_register_video_recv_callback(av, callback_video);
+}
 /*************************************************************************************************/
 
+int call_running[3];
 
 void *in_thread_call (void *arg)
 {
@@ -142,23 +155,22 @@ void *in_thread_call (void *arg)
 
     ACall *this_call = arg;
     uint64_t start = 0;
-    int step = 0, running = 1;
+    int step = 0;
     int call_idx;
 
+    call_running[this_call->idx] = 1;
+
     const int frame_size = (av_DefaultSettings.audio_sample_rate * av_DefaultSettings.audio_frame_duration / 1000);
     int16_t sample_payload[frame_size];
     randombytes((uint8_t *)sample_payload, sizeof(int16_t) * frame_size);
 
     uint8_t prepared_payload[RTP_PAYLOAD_SIZE];
 
-    toxav_register_audio_recv_callback(this_call->Caller.av, callback_audio);
-    toxav_register_video_recv_callback(this_call->Caller.av, callback_video);
-    toxav_register_audio_recv_callback(this_call->Callee.av, callback_audio);
-    toxav_register_video_recv_callback(this_call->Callee.av, callback_video);
-
+    register_callbacks(this_call->Caller.av, &status_control);
+    register_callbacks(this_call->Callee.av, arg);
 
     /* NOTE: CALLEE WILL ALWAHYS NEED CALL_IDX == 0 */
-    while (running) {
+    while (call_running[this_call->idx]) {
 
         switch ( step ) {
             case 0: /* CALLER */
@@ -205,20 +217,6 @@ void *in_thread_call (void *arg)
                         int16_t storage[RTP_PAYLOAD_SIZE];
                         int recved;
 
-                        /* Payload from CALLER */
-                        /*recved = toxav_recv_audio(this_call->Callee.av, 0, frame_size, storage);
-
-                        if ( recved ) {
-                            //ck_assert_msg(recved == 10 && memcmp(storage, sample_payload, 10) == 0, "Payload from CALLER is invalid");
-                        }*/
-
-                        /* Payload from CALLEE */
-                        /*recved = toxav_recv_audio(this_call->Caller.av, call_idx, frame_size, storage);
-
-                        if ( recved ) {
-                            //ck_assert_msg(recved == 10 && memcmp(storage, sample_payload, 10) == 0, "Payload from CALLEE is invalid");
-                        }*/
-
                         c_sleep(20);
                     }
 
@@ -240,7 +238,7 @@ void *in_thread_call (void *arg)
                 if (this_call->Caller.status == Ended) {
                     c_sleep(1000); /* race condition */
                     this_call->Callee.status = Ended;
-                    running = 0;
+                    call_running[this_call->idx] = 0;
                 }
 
                 break;
@@ -322,52 +320,29 @@ START_TEST(test_AV_three_calls)
 
     ToxAv *uniqcallerav = toxav_new(caller, 3);
 
-    Status status_control = {
-        0,
-        {none, uniqcallerav, 0},
-        {none, toxav_new(callees[0], 1), 0},
-
-        0,
-        {none, uniqcallerav},
-        {none, toxav_new(callees[1], 1), 1},
-
-        0,
-        {none, uniqcallerav},
-        {none, toxav_new(callees[2], 1), 2}
-    };
-
-
-    toxav_register_callstate_callback(callback_call_started, av_OnStart, &status_control);
-    toxav_register_callstate_callback(callback_call_canceled, av_OnCancel, &status_control);
-    toxav_register_callstate_callback(callback_call_rejected, av_OnReject, &status_control);
-    toxav_register_callstate_callback(callback_call_ended, av_OnEnd, &status_control);
-    toxav_register_callstate_callback(callback_recv_invite, av_OnInvite, &status_control);
-
-    toxav_register_callstate_callback(callback_recv_ringing, av_OnRinging, &status_control);
-    toxav_register_callstate_callback(callback_recv_starting, av_OnStarting, &status_control);
-    toxav_register_callstate_callback(callback_recv_ending, av_OnEnding, &status_control);
+    for (i = 0; i < 3; i ++) {
+        status_control.calls[i].idx = i;
 
-    toxav_register_callstate_callback(callback_recv_error, av_OnError, &status_control);
-    toxav_register_callstate_callback(callback_requ_timeout, av_OnRequestTimeout, &status_control);
+        status_control.calls[i].Caller.av = uniqcallerav;
+        status_control.calls[i].Caller.id = 0;
+        status_control.calls[i].Caller.status = none;
 
+        status_control.calls[i].Callee.av = toxav_new(callees[i], 1);
+        status_control.calls[i].Callee.id = i;
+        status_control.calls[i].Callee.status = none;
+    }
 
     pthread_mutex_init(&muhmutex, NULL);
 
-
     for ( i = 0; i < 3; i++ )
         pthread_create(&status_control.calls[i].tid, NULL, in_thread_call, &status_control.calls[i]);
 
-
     /* Now start 3 calls and they'll run for 10 s */
 
     for ( i = 0; i < 3; i++ )
         pthread_detach(status_control.calls[i].tid);
 
-    while (
-        status_control.calls[0].Callee.status != Ended && status_control.calls[0].Caller.status != Ended &&
-        status_control.calls[1].Callee.status != Ended && status_control.calls[1].Caller.status != Ended &&
-        status_control.calls[2].Callee.status != Ended && status_control.calls[2].Caller.status != Ended
-    ) {
+    while (call_running[0] || call_running[1] || call_running[2]) {
         pthread_mutex_lock(&muhmutex);
 
         tox_do(bootstrap_node);