Merge upstream fo real now?

4 files changed, 1518 insertions, 11 deletions

diff --git a/toxav/Makefile.inc b/toxav/Makefile.inc
index 2d48d210..65098f1f 100644
--- a/toxav/Makefile.inc
+++ b/toxav/Makefile.inc
@@ -34,5 +34,4 @@ libtoxav_la_LIBADD =  libtoxcore.la \
                       $(PTHREAD_LIBS) \
                       $(AV_LIBS)
 
-
 endif
\ No newline at end of file
diff --git a/toxav/msi.c b/toxav/msi.c
index aab13471..8e12e363 100755
--- a/toxav/msi.c
+++ b/toxav/msi.c
@@ -207,7 +207,22 @@ static inline__ const uint8_t *stringify_response ( MSIResponse response )
 }
 
 
+<<<<<<< HEAD
 
+=======
+#define ON_HEADER(iterator, header, descriptor, size_const) \
+( memcmp(iterator, descriptor, size_const) == 0){ /* Okay */ \
+    iterator += size_const; /* Set iterator at beginning of value part */ \
+    if ( *iterator != value_byte ) { assert(0); return -1; }\
+    iterator ++;\
+    uint16_t _value_size = (uint16_t) *(iterator ) << 8 | \
+    (uint16_t) *(iterator + 1); \
+    header.header_value = calloc(sizeof(uint8_t), _value_size); \
+    header.size = _value_size; \
+    memcpy(header.header_value, iterator + 2, _value_size);\
+    iterator = iterator + 2 + _value_size; /* set iterator at new header or end_byte */ \
+}
+>>>>>>> upstream/master
 
 /**
  * @brief Parse raw 'data' received from socket into MSIMessage struct.
@@ -1085,11 +1100,11 @@ int handle_recv_start ( MSISession *session, MSICall* call, MSIMessage *msg )
 
     call->state = call_active;
 
-    call->key_peer = calloc ( sizeof ( uint8_t ), crypto_secretbox_KEYBYTES );
-    memcpy ( call->key_peer, msg->cryptokey.header_value, crypto_secretbox_KEYBYTES );
+    call->key_peer = calloc ( sizeof ( uint8_t ), crypto_box_KEYBYTES );
+    memcpy ( call->key_peer, msg->cryptokey.header_value, crypto_box_KEYBYTES );
 
-    call->nonce_peer = calloc ( sizeof ( uint8_t ), crypto_secretbox_NONCEBYTES );
-    memcpy ( call->nonce_peer, msg->nonce.header_value,  crypto_secretbox_NONCEBYTES );
+    call->nonce_peer = calloc ( sizeof ( uint8_t ), crypto_box_NONCEBYTES );
+    memcpy ( call->nonce_peer, msg->nonce.header_value,  crypto_box_NONCEBYTES );
 
     flush_peer_type ( call, msg, 0 );
 
@@ -1183,6 +1198,7 @@ int handle_recv_starting ( MSISession *session, MSICall* call, MSIMessage *msg )
     }
 
     /* Generate local key/nonce to send */
+<<<<<<< HEAD
     call->key_local = calloc ( sizeof ( uint8_t ), crypto_secretbox_KEYBYTES );
     new_symmetric_key ( call->key_local );
 
@@ -1195,13 +1211,33 @@ int handle_recv_starting ( MSISession *session, MSICall* call, MSIMessage *msg )
 
     call->nonce_peer = calloc ( sizeof ( uint8_t ), crypto_secretbox_NONCEBYTES );
     memcpy ( call->nonce_peer, msg->nonce.header_value,  crypto_secretbox_NONCEBYTES );
+=======
+    session->call->key_local = calloc ( sizeof ( uint8_t ), crypto_box_KEYBYTES );
+    new_symmetric_key ( session->call->key_local );
+
+    session->call->nonce_local = calloc ( sizeof ( uint8_t ), crypto_box_NONCEBYTES );
+    new_nonce ( session->call->nonce_local );
+
+    /* Save peer key/nonce */
+    session->call->key_peer = calloc ( sizeof ( uint8_t ), crypto_box_KEYBYTES );
+    memcpy ( session->call->key_peer, msg->cryptokey.header_value, crypto_box_KEYBYTES );
+
+    session->call->nonce_peer = calloc ( sizeof ( uint8_t ), crypto_box_NONCEBYTES );
+    memcpy ( session->call->nonce_peer, msg->nonce.header_value,  crypto_box_NONCEBYTES );
+>>>>>>> upstream/master
 
     call->state = call_active;
 
     MSIMessage *_msg_start = msi_new_message ( TYPE_REQUEST, stringify_request ( start ) );
+<<<<<<< HEAD
     msi_msg_set_cryptokey ( _msg_start, call->key_local, crypto_secretbox_KEYBYTES );
     msi_msg_set_nonce ( _msg_start, call->nonce_local, crypto_secretbox_NONCEBYTES );
     send_message ( session, call, _msg_start, msg->friend_id );
+=======
+    msi_msg_set_cryptokey ( _msg_start, session->call->key_local, crypto_box_KEYBYTES );
+    msi_msg_set_nonce ( _msg_start, session->call->nonce_local, crypto_box_NONCEBYTES );
+    send_message ( session, _msg_start, msg->friend_id );
+>>>>>>> upstream/master
     free_message ( _msg_start );
 
     flush_peer_type ( call, msg, 0 );
@@ -1593,6 +1629,7 @@ int msi_answer ( MSISession* session, int32_t call_index, MSICallType call_type
 
     /* Now set the local encryption key and pass it with STARTING message */
 
+<<<<<<< HEAD
     session->calls[call_index]->key_local = calloc ( sizeof ( uint8_t ), crypto_secretbox_KEYBYTES );
     new_symmetric_key ( session->calls[call_index]->key_local );
 
@@ -1601,6 +1638,16 @@ int msi_answer ( MSISession* session, int32_t call_index, MSICallType call_type
 
     msi_msg_set_cryptokey ( _msg_starting, session->calls[call_index]->key_local, crypto_secretbox_KEYBYTES );
     msi_msg_set_nonce ( _msg_starting, session->calls[call_index]->nonce_local, crypto_secretbox_NONCEBYTES );
+=======
+    session->call->key_local = calloc ( sizeof ( uint8_t ), crypto_box_KEYBYTES );
+    new_symmetric_key ( session->call->key_local );
+
+    session->call->nonce_local = calloc ( sizeof ( uint8_t ), crypto_box_NONCEBYTES );
+    new_nonce ( session->call->nonce_local );
+
+    msi_msg_set_cryptokey ( _msg_starting, session->call->key_local, crypto_box_KEYBYTES );
+    msi_msg_set_nonce ( _msg_starting, session->call->nonce_local, crypto_box_NONCEBYTES );
+>>>>>>> upstream/master
 
     send_message ( session, session->calls[call_index], _msg_starting, session->calls[call_index]->peers[session->calls[call_index]->peer_count - 1] );
     free_message ( _msg_starting );
@@ -1689,4 +1736,4 @@ int msi_stopcall ( MSISession* session, int32_t call_index )
     terminate_call ( session, session->calls[call_index] );
 
     return 0;
-}
\ No newline at end of file
+}
diff --git a/toxav/msi.h b/toxav/msi.h
index e9e1b4d7..2d4929a6 100755
--- a/toxav/msi.h
+++ b/toxav/msi.h
@@ -72,21 +72,22 @@ typedef struct _MSICall {                  /* Call info structure */
 
     uint8_t             id[CALL_ID_LEN];   /* Random value identifying the call */
 
-    uint8_t             *key_local;        /* The key for encryption */
-    uint8_t             *key_peer;         /* The key for decryption */
+    uint8_t            *key_local;         /* The key for encryption */
+    uint8_t            *key_peer;          /* The key for decryption */
 
-    uint8_t             *nonce_local;      /* Local nonce */
-    uint8_t             *nonce_peer;       /* Peer nonce  */
+    uint8_t            *nonce_local;       /* Local nonce */
+    uint8_t            *nonce_peer;        /* Peer nonce  */
 
     int                 ringing_tout_ms;   /* Ringing timeout in ms */
 
     int                 request_timer_id;  /* Timer id for outgoing request/action */
     int                 ringing_timer_id;  /* Timer id for ringing timeout */
 
+
     pthread_mutex_t     mutex;             /* It's to be assumed that call will have
                                             * separate thread so add mutex
                                             */
-    uint32_t            *peers;
+    uint32_t           *peers;
     uint16_t            peer_count;
 
     int32_t             call_idx;          /* Index of this call in MSISession */
diff --git a/toxav/phone.c b/toxav/phone.c
new file mode 100755
index 00000000..74f743f7
--- /dev/null
+++ b/toxav/phone.c
@@ -0,0 +1,1460 @@
+/**  phone.c
+ *
+ *   NOTE NOTE NOTE NOTE NOTE NOTE
+ *
+ *   This file is for testing/reference purposes only, hence
+ *   it is _poorly_ designed and it does not fully reflect the
+ *   quaility of msi nor rtp. Although toxmsi* and toxrtp* are tested
+ *   there is always possibility of crashes. If crash occures,
+ *   contact me ( mannol ) on either irc channel #tox-dev @ freenode.net:6667
+ *   or eniz_vukovic@hotmail.com
+ *
+ *   NOTE NOTE NOTE NOTE NOTE NOTE
+ *
+ *   Copyright (C) 2013 Tox project All Rights Reserved.
+ *
+ *   This file is part of Tox.
+ *
+ *   Tox is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Tox is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Tox. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+#define _BSD_SOURCE
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include <assert.h>
+#include <math.h>
+#include <pthread.h>
+
+//#include "media.h"
+#include "toxav.h"
+#include "event.h"
+#include "../toxcore/tox.h"
+
+#define AUDIO_FRAME_SIZE (av_DefaultSettings.audio_sample_rate * av_DefaultSettings.audio_frame_duration / 1000)
+
+#ifdef TOX_FFMPEG
+/* Video encoding/decoding */
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libswscale/swscale.h>
+#include <libavdevice/avdevice.h>
+#include <libavutil/opt.h>
+#endif
+
+#include <AL/al.h>
+#include <AL/alc.h>
+#include <SDL/SDL.h>
+#include <SDL/SDL_thread.h>
+
+/* the quit event for SDL */
+#define FF_QUIT_EVENT (SDL_USEREVENT + 2)
+
+#ifdef __linux__
+#define VIDEO_DRIVER "video4linux2"
+#define DEFAULT_WEBCAM "/dev/video0"
+#endif
+
+#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)
+#define VIDEO_DRIVER "vfwcap"
+#define DEFAULT_WEBCAM "0"
+#endif
+
+
+/* Define client version */
+#define _USERAGENT "v.0.3.0"
+
+
+struct SDL_Surface *screen;
+
+typedef struct {
+    struct SDL_Overlay *bmp;
+    int width, height;
+} VideoPicture;
+
+
+typedef struct av_friend_s {
+    int _id;
+    int _active; /* 0=false; 1=true; */
+} av_friend_t;
+
+typedef struct av_session_s {
+    /* Encoding/decoding/capturing/playing */
+    ToxAv *av;
+
+    VideoPicture    video_picture;
+    struct ALCdevice *audio_capture_device;
+
+    /* context for converting image format to something SDL can use*/
+    struct SwsContext   *sws_SDL_r_ctx;
+
+    /* context for converting webcam image format to something the video encoder can use */
+    struct SwsContext   *sws_ctx;
+
+    /* Thread running control */
+    int running_decaud, running_encaud,
+        running_decvid, running_encvid;
+
+    pthread_mutex_t _mutex;
+
+    Tox *_messenger;
+    av_friend_t  *_friends;
+    int _friend_cout;
+    char _my_public_id[200];
+#ifdef TOX_FFMPEG
+    AVInputFormat *video_input_format;
+    AVFormatContext *video_format_ctx;
+    uint8_t video_stream;
+    AVCodecContext *webcam_decoder_ctx;
+    AVCodec *webcam_decoder;
+#endif
+} av_session_t;
+av_session_t *_phone;
+
+void av_allocate_friend(av_session_t *_phone, int _id, int _active)
+{
+    static int _new_id = 0;
+
+    if ( !_phone->_friends ) {
+        _phone->_friends = calloc(sizeof(av_friend_t), 1);
+        _phone->_friend_cout = 1;
+    } else {
+        _phone->_friend_cout ++;
+        _phone->_friends = realloc(_phone->_friends, sizeof(av_friend_t) * _phone->_friend_cout);
+    }
+
+    if ( _id == -1 ) {
+        _phone->_friends->_id = _new_id;
+        _new_id ++;
+    } else _phone->_friends->_id = _id;
+
+    _phone->_friends->_active = _active;
+}
+av_friend_t *av_get_friend(av_session_t *_phone, int _id)
+{
+    av_friend_t *_friends = _phone->_friends;
+
+    if ( !_friends ) return NULL;
+
+    int _it = 0;
+
+    for (; _it < _phone->_friend_cout; _it ++)
+        if ( _friends[_it]._id == _id )
+            return _friends + _it;
+
+    return NULL;
+}
+
+
+/***************** MISC *****************/
+
+void INFO (const char *_format, ...)
+{
+    printf("\r[!] ");
+    va_list _arg;
+    va_start (_arg, _format);
+    vfprintf (stdout, _format, _arg);
+    va_end (_arg);
+    printf("\n\r >> ");
+    fflush(stdout);
+}
+
+unsigned char *hex_string_to_bin(char hex_string[])
+{
+    size_t i, len = strlen(hex_string);
+    unsigned char *val = calloc(sizeof(unsigned char), len);
+    char *pos = hex_string;
+
+    for (i = 0; i < len; ++i, pos += 2)
+        sscanf(pos, "%2hhx", &val[i]);
+
+    return val;
+}
+
+int getinput( char *_buff, size_t _limit, int *_len )
+{
+    if ( fgets(_buff, _limit, stdin) == NULL )
+        return -1;
+
+    *_len = strlen(_buff) - 1;
+
+    /* Get rid of newline */
+    _buff[*_len] = '\0';
+
+    return 0;
+}
+
+char *trim_spaces ( char *buff )
+{
+
+    int _i = 0, _len = strlen(buff);
+
+    char *container = calloc(sizeof(char), _len);
+    int _ci = 0;
+
+    for ( ; _i < _len; _i++ ) {
+        while ( _i < _len && buff[_i] == ' ' )
+            _i++;
+
+        if ( _i < _len ) {
+            container[_ci] = buff[_i];
+            _ci ++;
+        }
+    }
+
+    memcpy( buff, container, _ci );
+    buff[_ci] = '\0';
+    free(container);
+    return buff;
+}
+
+#define FRADDR_TOSTR_CHUNK_LEN 8
+
+static void fraddr_to_str(uint8_t *id_bin, char *id_str)
+{
+    uint i, delta = 0, pos_extra = 0, sum_extra = 0;
+
+    for (i = 0; i < TOX_FRIEND_ADDRESS_SIZE; i++) {
+        sprintf(&id_str[2 * i + delta], "%02hhX", id_bin[i]);
+
+        if ((i + 1) == TOX_CLIENT_ID_SIZE)
+            pos_extra = 2 * (i + 1) + delta;
+
+        if (i >= TOX_CLIENT_ID_SIZE)
+            sum_extra |= id_bin[i];
+
+        if (!((i + 1) % FRADDR_TOSTR_CHUNK_LEN)) {
+            id_str[2 * (i + 1) + delta] = ' ';
+            delta++;
+        }
+    }
+
+    id_str[2 * i + delta] = 0;
+
+    if (!sum_extra)
+        id_str[pos_extra] = 0;
+}
+
+/*********************************************
+ *********************************************
+ *********************************************
+ *********************************************
+ *********************************************
+ *********************************************
+ *********************************************
+ *********************************************
+ */
+
+
+/*
+ * How av stuff _should_ look like
+ */
+/*
+int display_received_frame(av_session_t* _phone, vpx_image_t *image)
+{
+    CodecState* cs = get_cs_temp(_phone->av);
+    AVPicture pict;
+    SDL_LockYUVOverlay(_phone->video_picture.bmp);
+
+    pict.data[0] = _phone->video_picture.bmp->pixels[0];
+    pict.data[1] = _phone->video_picture.bmp->pixels[2];
+    pict.data[2] = _phone->video_picture.bmp->pixels[1];
+    pict.linesize[0] = _phone->video_picture.bmp->pitches[0];
+    pict.linesize[1] = _phone->video_picture.bmp->pitches[2];
+    pict.linesize[2] = _phone->video_picture.bmp->pitches[1];
+    */
+/* Convert the image into YUV format that SDL uses *//*
+sws_scale(_phone->sws_SDL_r_ctx, (uint8_t const * const *)r_video_frame->data, r_video_frame->linesize, 0,
+          cs->video_decoder_ctx->height, pict.data, pict.linesize );
+
+SDL_UnlockYUVOverlay(_phone->video_picture.bmp);
+SDL_Rect rect;
+rect.x = 0;
+rect.y = 0;
+rect.w = cs->video_decoder_ctx->width;
+rect.h = cs->video_decoder_ctx->height;
+SDL_DisplayYUVOverlay(_phone->video_picture.bmp, &rect);
+return 1;
+}
+*/
+#ifdef TOX_FFMPEG
+void *encode_video_thread(void *arg)
+{
+    INFO("Started encode video thread!");
+
+    av_session_t *_phone = arg;
+
+    _phone->running_encvid = 1;
+    //CodecState *cs = get_cs_temp(_phone->av);
+    AVPacket pkt1, *packet = &pkt1;
+    //int p = 0;
+    //int got_packet;
+    int video_frame_finished;
+    AVFrame *s_video_frame;
+    AVFrame *webcam_frame;
+    s_video_frame = avcodec_alloc_frame();
+    webcam_frame = avcodec_alloc_frame();
+    //AVPacket enc_video_packet;
+
+    uint8_t *buffer;
+    int numBytes;
+    /* Determine required buffer size and allocate buffer */
+    numBytes = avpicture_get_size(PIX_FMT_YUV420P, _phone->webcam_decoder_ctx->width, _phone->webcam_decoder_ctx->height);
+    buffer = (uint8_t *)av_calloc(numBytes * sizeof(uint8_t), 1);
+    avpicture_fill((AVPicture *)s_video_frame, buffer, PIX_FMT_YUV420P, _phone->webcam_decoder_ctx->width,
+                   _phone->webcam_decoder_ctx->height);
+    _phone->sws_ctx = sws_getContext(_phone->webcam_decoder_ctx->width, _phone->webcam_decoder_ctx->height,
+                                     _phone->webcam_decoder_ctx->pix_fmt, _phone->webcam_decoder_ctx->width, _phone->webcam_decoder_ctx->height,
+                                     PIX_FMT_YUV420P,
+                                     SWS_BILINEAR, NULL, NULL, NULL);
+
+
+    vpx_image_t *image =
+        vpx_img_alloc(NULL, VPX_IMG_FMT_I420, _phone->webcam_decoder_ctx->width, _phone->webcam_decoder_ctx->height, 1);
+
+    //uint32_t frame_counter = 0;
+    while (_phone->running_encvid) {
+
+        if (av_read_frame(_phone->video_format_ctx, packet) < 0) {
+            printf("error reading frame\n");
+
+            if (_phone->video_format_ctx->pb->error != 0)
+                break;
+
+            continue;
+        }
+
+        if (packet->stream_index == _phone->video_stream) {
+            if (avcodec_decode_video2(_phone->webcam_decoder_ctx, webcam_frame, &video_frame_finished, packet) < 0) {
+                printf("couldn't decode\n");
+                continue;
+            }
+
+            av_free_packet(packet);
+            sws_scale(_phone->sws_ctx, (uint8_t const * const *)webcam_frame->data, webcam_frame->linesize, 0,
+                      _phone->webcam_decoder_ctx->height, s_video_frame->data, s_video_frame->linesize);
+            /* create a new I-frame every 60 frames */
+            //++p;
+            /*
+            if (p == 60) {
+
+                s_video_frame->pict_type = AV_PICTURE_TYPE_BI ;
+            } else if (p == 61) {
+                s_video_frame->pict_type = AV_PICTURE_TYPE_I ;
+                p = 0;
+            } else {
+                s_video_frame->pict_type = AV_PICTURE_TYPE_P ;
+            }*/
+
+            if (video_frame_finished) {
+                memcpy(image->planes[VPX_PLANE_Y], s_video_frame->data[0],
+                       s_video_frame->linesize[0] * _phone->webcam_decoder_ctx->height);
+                memcpy(image->planes[VPX_PLANE_U], s_video_frame->data[1],
+                       s_video_frame->linesize[1] * _phone->webcam_decoder_ctx->height / 2);
+                memcpy(image->planes[VPX_PLANE_V], s_video_frame->data[2],
+                       s_video_frame->linesize[2] * _phone->webcam_decoder_ctx->height / 2);
+                toxav_send_video (_phone->av, image);
+                //if (avcodec_encode_video2(cs->video_encoder_ctx, &enc_video_packet, s_video_frame, &got_packet) < 0) {
+                /*if (vpx_codec_encode(&cs->v_encoder, image, frame_counter, 1, 0, 0) != VPX_CODEC_OK) {
+                    printf("could not encode video frame\n");
+                    continue;
+                }
+                ++frame_counter;
+
+                vpx_codec_iter_t iter = NULL;
+                vpx_codec_cx_pkt_t *pkt;
+                while( (pkt = vpx_codec_get_cx_data(&cs->v_encoder, &iter)) ) {
+                    if (pkt->kind == VPX_CODEC_CX_FRAME_PKT)
+                        toxav_send_rtp_payload(_phone->av, TypeVideo, pkt->data.frame.buf, pkt->data.frame.sz);
+                }*/
+                //if (!got_packet) {
+                //    continue;
+                //}
+
+                //if (!enc_video_packet.data) fprintf(stderr, "video packet data is NULL\n");
+
+                //toxav_send_rtp_payload(_phone->av, TypeVideo, enc_video_packet.data, enc_video_packet.size);
+
+                //av_free_packet(&enc_video_packet);
+            }
+        } else {
+            av_free_packet(packet);
+        }
+    }
+
+    vpx_img_free(image);
+
+    /* clean up codecs */
+    //pthread_mutex_lock(&cs->ctrl_mutex);
+    av_free(buffer);
+    av_free(webcam_frame);
+    av_free(s_video_frame);
+    sws_freeContext(_phone->sws_ctx);
+    //avcodec_close(webcam_decoder_ctx);
+    //avcodec_close(cs->video_encoder_ctx);
+    //pthread_mutex_unlock(&cs->ctrl_mutex);
+
+    _phone->running_encvid = -1;
+
+    pthread_exit ( NULL );
+}
+#endif
+
+void *encode_audio_thread(void *arg)
+{
+    INFO("Started encode audio thread!");
+    av_session_t *_phone = arg;
+    _phone->running_encaud = 1;
+
+    int ret = 0;
+    int16_t frame[4096];
+    int frame_size = AUDIO_FRAME_SIZE;
+    ALint sample = 0;
+    alcCaptureStart((ALCdevice *)_phone->audio_capture_device);
+    while (_phone->running_encaud) {
+        
+        alcGetIntegerv((ALCdevice *)_phone->audio_capture_device, ALC_CAPTURE_SAMPLES, (ALCsizei)sizeof(ALint), &sample);
+        
+        if (sample >= frame_size) {
+            alcCaptureSamples((ALCdevice *)_phone->audio_capture_device, frame, frame_size);
+
+            ret = toxav_send_audio(_phone->av, frame, frame_size);
+
+            if (ret < 0) printf("Could not encode or send audio packet\n");
+
+        } else {
+            usleep(1000);
+        }
+    }
+
+    /* clean up codecs *
+    pthread_mutex_lock(&cs->ctrl_mutex);* /
+    alcCaptureStop((ALCdevice*)_phone->audio_capture_device);
+    alcCaptureCloseDevice((ALCdevice*)_phone->audio_capture_device);
+    / *pthread_mutex_unlock(&cs->ctrl_mutex);*/
+    _phone->running_encaud = -1;
+    pthread_exit ( NULL );
+}
+
+void convert_to_rgb(vpx_image_t *img, unsigned char *out)
+{
+    const int w = img->d_w;
+    const int w2 = w / 2;
+    const int pstride = w * 3;
+    const int h = img->d_h;
+    const int h2 = h / 2;
+
+    const int strideY = img->stride[0];
+    const int strideU = img->stride[1];
+    const int strideV = img->stride[2];
+    int posy, posx;
+
+    for (posy = 0; posy < h2; posy++) {
+        unsigned char *dst = out + pstride * (posy * 2);
+        unsigned char *dst2 = out + pstride * (posy * 2 + 1);
+        const unsigned char *srcY = img->planes[0] + strideY * posy * 2;
+        const unsigned char *srcY2 = img->planes[0] + strideY * (posy * 2 + 1);
+        const unsigned char *srcU = img->planes[1] + strideU * posy;
+        const unsigned char *srcV = img->planes[2] + strideV * posy;
+
+        for (posx = 0; posx < w2; posx++) {
+            unsigned char Y, U, V;
+            short R, G, B;
+            short iR, iG, iB;
+
+            U = *(srcU++);
+            V = *(srcV++);
+            iR = (351 * (V - 128)) / 256;
+            iG = - (179 * (V - 128)) / 256 - (86 * (U - 128)) / 256;
+            iB = (444 * (U - 128)) / 256;
+
+            Y = *(srcY++);
+            R = Y + iR ;
+            G = Y + iG ;
+            B = Y + iB ;
+            R = (R < 0 ? 0 : (R > 255 ? 255 : R));
+            G = (G < 0 ? 0 : (G > 255 ? 255 : G));
+            B = (B < 0 ? 0 : (B > 255 ? 255 : B));
+            *(dst++) = R;
+            *(dst++) = G;
+            *(dst++) = B;
+
+            Y = *(srcY2++);
+            R = Y + iR ;
+            G = Y + iG ;
+            B = Y + iB ;
+            R = (R < 0 ? 0 : (R > 255 ? 255 : R));
+            G = (G < 0 ? 0 : (G > 255 ? 255 : G));
+            B = (B < 0 ? 0 : (B > 255 ? 255 : B));
+            *(dst2++) = R;
+            *(dst2++) = G;
+            *(dst2++) = B;
+
+            Y = *(srcY++) ;
+            R = Y + iR ;
+            G = Y + iG ;
+            B = Y + iB ;
+            R = (R < 0 ? 0 : (R > 255 ? 255 : R));
+            G = (G < 0 ? 0 : (G > 255 ? 255 : G));
+            B = (B < 0 ? 0 : (B > 255 ? 255 : B));
+            *(dst++) = R;
+            *(dst++) = G;
+            *(dst++) = B;
+
+            Y = *(srcY2++);
+            R = Y + iR ;
+            G = Y + iG ;
+            B = Y + iB ;
+            R = (R < 0 ? 0 : (R > 255 ? 255 : R));
+            G = (G < 0 ? 0 : (G > 255 ? 255 : G));
+            B = (B < 0 ? 0 : (B > 255 ? 255 : B));
+            *(dst2++) = R;
+            *(dst2++) = G;
+            *(dst2++) = B;
+        }
+    }
+}
+
+#define mask32(BYTE) (*(uint32_t *)(uint8_t [4]){ [BYTE] = 0xff })
+
+void *decode_video_thread(void *arg)
+{
+    INFO("Started decode video thread!");
+    av_session_t *_phone = arg;
+    _phone->running_decvid = 1;
+
+    //CodecState *cs = get_cs_temp(_phone->av);
+    //cs->video_stream = 0;
+
+    //int recved_size;
+    //uint8_t dest[RTP_PAYLOAD_SIZE];
+
+    //int dec_frame_finished;
+    //AVFrame *r_video_frame;
+    //r_video_frame = avcodec_alloc_frame();
+    //AVPacket dec_video_packet;
+    //av_new_packet (&dec_video_packet, 65536);
+    int width = 0;
+    int height = 0;
+
+    while (_phone->running_decvid) {
+        //recved_size = toxav_recv_rtp_payload(_phone->av, TypeVideo, dest);
+        //if (recved_size) {
+        vpx_image_t *image = NULL;
+
+        if (toxav_recv_video(_phone->av, &image) == 0 && image) {
+            //memcpy(dec_video_packet.data, dest, recved_size);
+            //dec_video_packet.size = recved_size;
+
+            //avcodec_decode_video2(cs->video_decoder_ctx, r_video_frame, &dec_frame_finished, &dec_video_packet);
+
+            //if (dec_frame_finished) {
+
+            /* Check if size has changed */
+            if (image->d_w != width || image->d_h != height) {
+
+                width = image->d_w;
+                height = image->d_h;
+
+                printf("w: %d h: %d \n", width, height);
+
+                screen = SDL_SetVideoMode(width, height, 0, 0);
+
+                //if (_phone->video_picture.bmp)
+                //   SDL_FreeYUVOverlay(_phone->video_picture.bmp);
+
+                //_phone->video_picture.bmp = SDL_CreateYUVOverlay(width, height, SDL_YV12_OVERLAY, screen);
+                // _phone->sws_SDL_r_ctx = sws_getContext(width, height, cs->video_decoder_ctx->pix_fmt, width, height, PIX_FMT_YUV420P,
+                //                                      SWS_BILINEAR, NULL, NULL, NULL);
+            }
+
+            uint8_t *rgb_image = malloc(width * height * 3);
+            convert_to_rgb(image, rgb_image);
+            SDL_Surface *img_surface = SDL_CreateRGBSurfaceFrom(rgb_image, width, height, 24, width * 3, mask32(0), mask32(1),
+                                       mask32(2), 0);
+
+            if (SDL_BlitSurface(img_surface, NULL, screen, NULL) == 0)
+                SDL_UpdateRect(screen, 0, 0, 0, 0);
+
+            /*
+            SDL_LockYUVOverlay(_phone->video_picture.bmp);
+            memcpy(_phone->video_picture.bmp->pixels[0], image->planes[VPX_PLANE_Y], _phone->video_picture.bmp->pitches[0] * height);
+            memcpy(_phone->video_picture.bmp->pixels[1], image->planes[VPX_PLANE_V], _phone->video_picture.bmp->pitches[1] * height / 2);
+            memcpy(_phone->video_picture.bmp->pixels[2], image->planes[VPX_PLANE_U], _phone->video_picture.bmp->pitches[2] * height / 2);
+
+            SDL_Rect rect;
+            rect.x = 0;
+            rect.y = 0;
+            rect.w = width;
+            rect.h = height;
+            SDL_DisplayYUVOverlay(_phone->video_picture.bmp, &rect);*/
+            free(rgb_image);
+            //display_received_frame(_phone, image);
+
+        } //else {
+
+        /* TODO: request the sender to create a new i-frame immediately */
+        //printf("Bad video packet\n");
+        //}
+        //}
+
+        usleep(1000);
+    }
+
+    /* clean up codecs */
+    //av_free(r_video_frame);
+
+    //pthread_mutex_lock(&cs->ctrl_mutex);
+    //avcodec_close(cs->video_decoder_ctx);
+    //pthread_mutex_unlock(&cs->ctrl_mutex);
+
+    _phone->running_decvid = -1;
+
+    pthread_exit ( NULL );
+}
+
+void *decode_audio_thread(void *arg)
+{
+    INFO("Started decode audio thread!");
+    av_session_t *_phone = arg;
+    _phone->running_decaud = 1;
+
+    //int recved_size;
+    //uint8_t dest [RTP_PAYLOAD_SIZE];
+
+    int frame_size = AUDIO_FRAME_SIZE;
+    //int data_size;
+
+    ALCdevice *dev;
+    ALCcontext *ctx;
+    ALuint source, *buffers;
+    dev = alcOpenDevice(NULL);
+    ctx = alcCreateContext(dev, NULL);
+    alcMakeContextCurrent(ctx);
+    int openal_buffers = 5;
+
+    buffers = calloc(sizeof(ALuint) * openal_buffers, 1);
+    alGenBuffers(openal_buffers, buffers);
+    alGenSources((ALuint)1, &source);
+    alSourcei(source, AL_LOOPING, AL_FALSE);
+
+    ALuint buffer;
+    ALint ready;
+
+    uint16_t zeros[frame_size];
+    memset(zeros, 0, frame_size);
+    int16_t PCM[frame_size];
+
+    int i;
+
+    for (i = 0; i < openal_buffers; ++i) {
+        alBufferData(buffers[i], AL_FORMAT_MONO16, zeros, frame_size, 48000);
+    }
+
+    alSourceQueueBuffers(source, openal_buffers, buffers);
+    alSourcePlay(source);
+
+    if (alGetError() != AL_NO_ERROR) {
+        fprintf(stderr, "Error starting audio\n");
+        goto ending;
+    }
+
+    int dec_frame_len = 0;
+
+    while (_phone->running_decaud) {
+
+        alGetSourcei(source, AL_BUFFERS_PROCESSED, &ready);
+
+        if (ready <= 0)
+            continue;
+
+        dec_frame_len = toxav_recv_audio(_phone->av, frame_size, PCM);
+
+        /* Play the packet */
+        if (dec_frame_len > 0) {
+            alSourceUnqueueBuffers(source, 1, &buffer);
+            alBufferData(buffer, AL_FORMAT_MONO16, PCM, dec_frame_len * 2 * 1, 48000);
+            int error = alGetError();
+
+            if (error != AL_NO_ERROR) {
+                fprintf(stderr, "Error setting buffer %d\n", error);
+                break;
+            }
+
+            alSourceQueueBuffers(source, 1, &buffer);
+
+            if (alGetError() != AL_NO_ERROR) {
+                fprintf(stderr, "Error: could not buffer audio\n");
+                break;
+            }
+
+            alGetSourcei(source, AL_SOURCE_STATE, &ready);
+
+            if (ready != AL_PLAYING) alSourcePlay(source);
+        }
+
+        usleep(1000);
+    }
+
+
+ending:
+    /* clean up codecs */
+    //pthread_mutex_lock(&cs->ctrl_mutex);
+    /*
+    alDeleteSources(1, &source);
+    alDeleteBuffers(openal_buffers, buffers);
+    alcMakeContextCurrent(NULL);
+    alcDestroyContext(ctx);
+    alcCloseDevice(dev);
+    */
+    //pthread_mutex_unlock(&cs->ctrl_mutex);
+
+    _phone->running_decaud = -1;
+
+    pthread_exit ( NULL );
+}
+
+
+
+void *one_threaded_audio(void *arg)
+{
+    INFO("Started audio thread!");
+    av_session_t *_phone = arg;
+    _phone->running_decaud = 1;
+    
+    //int recved_size;
+    //uint8_t dest [RTP_PAYLOAD_SIZE];
+    
+    int frame_size = AUDIO_FRAME_SIZE;
+    
+    int16_t frame[4096];
+    ALint sample = 0;
+    alcCaptureStart((ALCdevice *)_phone->audio_capture_device);
+    
+    ALCdevice *dev;
+    ALCcontext *ctx;
+    ALuint source, *buffers;
+    dev = alcOpenDevice(NULL);
+    ctx = alcCreateContext(dev, NULL);
+    alcMakeContextCurrent(ctx);
+    int openal_buffers = 5;
+    
+    buffers = calloc(sizeof(ALuint) * openal_buffers, 1);
+    alGenBuffers(openal_buffers, buffers);
+    alGenSources((ALuint)1, &source);
+    alSourcei(source, AL_LOOPING, AL_FALSE);
+    
+    ALuint buffer;
+    ALint ready;
+    
+    uint16_t zeros[frame_size];
+    memset(zeros, 0, frame_size);
+    int16_t PCM[frame_size];
+    
+    int i;
+    
+    for (i = 0; i < openal_buffers; ++i) {
+        alBufferData(buffers[i], AL_FORMAT_MONO16, zeros, frame_size, 48000);
+    }
+    
+    alSourceQueueBuffers(source, openal_buffers, buffers);
+    alSourcePlay(source);
+    
+    if (alGetError() != AL_NO_ERROR) {
+        fprintf(stderr, "Error starting audio\n");
+        goto ending;
+    }
+    
+    int dec_frame_len;
+    
+    while (_phone->running_decaud) {
+        
+        // combo
+        alcGetIntegerv((ALCdevice *)_phone->audio_capture_device, ALC_CAPTURE_SAMPLES, (ALCsizei)sizeof(ALint), &sample);
+        
+        // record and send        
+        if (sample >= frame_size) {
+            alcCaptureSamples((ALCdevice *)_phone->audio_capture_device, frame, frame_size);
+            
+            if (toxav_send_audio(_phone->av, frame, frame_size) < 0) 
+                printf("Could not encode or send audio packet\n");
+            
+        } else  {
+            usleep(5000);
+        }
+        
+        // play received
+        
+        alGetSourcei(source, AL_BUFFERS_PROCESSED, &ready);
+        
+        if (ready <= 0)
+            continue;
+        
+        dec_frame_len = toxav_recv_audio(_phone->av, frame_size, PCM);
+        
+        /* Play the packet */
+        if (dec_frame_len > 0) {
+            alSourceUnqueueBuffers(source, 1, &buffer);
+            alBufferData(buffer, AL_FORMAT_MONO16, PCM, dec_frame_len * 2 * 1, 48000);
+            int error = alGetError();
+            
+            if (error != AL_NO_ERROR) {
+                fprintf(stderr, "Error setting buffer %d\n", error);
+                break;
+            }
+            
+            alSourceQueueBuffers(source, 1, &buffer);
+            
+            if (alGetError() != AL_NO_ERROR) {
+                fprintf(stderr, "Error: could not buffer audio\n");
+                break;
+            }
+            
+            alGetSourcei(source, AL_SOURCE_STATE, &ready);
+            
+            if (ready != AL_PLAYING) alSourcePlay(source);
+        }
+        
+        usleep(1000);
+    }
+    
+    
+    ending:
+    _phone->running_decaud = -1;
+    
+    pthread_exit ( NULL );
+}
+
+
+int phone_startmedia_loop ( ToxAv *arg )
+{
+    if ( !arg ) {
+        return -1;
+    }
+
+    toxav_prepare_transmission(arg, 1);
+
+    /*
+     * Rise all threads
+     */
+#ifdef TOX_FFMPEG
+
+    /* Only checks for last peer */
+    if ( toxav_get_peer_transmission_type(arg, 0) == TypeVideo &&
+            0 > event.rise(encode_video_thread, _phone) ) {
+        INFO("Error while starting encode_video_thread()");
+        return -1;
+    }
+
+#endif
+
+    /* Always send audio */
+    /*if ( 0 > event.rise(encode_audio_thread, toxav_get_agent_handler(arg)) ) {
+        INFO("Error while starting encode_audio_thread()");
+        return -1;
+    } */
+
+    /* Only checks for last peer */
+    if ( toxav_get_peer_transmission_type(arg, 0) == TypeVideo &&
+        0 > event.rise(decode_video_thread, _phone) ) {
+        INFO("Error while starting decode_video_thread()");
+        return -1;
+    }
+
+    /*if ( 0 > event.rise(decode_audio_thread, toxav_get_agent_handler(arg)) ) {
+        INFO("Error while starting decode_audio_thread()");
+        return -1;
+    } */
+
+
+    /* One threaded audio */
+    
+    if ( 0 > event.rise(one_threaded_audio, _phone) ) {
+        INFO ("Shit-head");
+        return -1;
+    }
+     
+    return 0;
+}
+
+
+
+
+
+
+/*********************************************
+ *********************************************
+ *********************************************
+ *********************************************
+ *********************************************
+ *********************************************
+ *********************************************
+ *********************************************
+ */
+
+
+/* Some example callbacks */
+
+void callback_recv_invite ( void *_arg )
+{
+    assert(_arg);
+
+    switch ( toxav_get_peer_transmission_type(_arg, 0) ) {
+        case TypeAudio:
+            INFO( "Incoming audio call!");
+            break;
+
+        case TypeVideo:
+            INFO( "Incoming video call!");
+            break;
+    }
+
+}
+void callback_recv_ringing ( void *_arg )
+{
+    INFO ( "Ringing!" );
+}
+void callback_recv_starting ( void *_arg )
+{
+    if ( 0 != phone_startmedia_loop(_arg) ) {
+        INFO("Starting call failed!");
+    } else {
+        INFO ("Call started! ( press h to hangup )");
+    }
+
+}
+void callback_recv_ending ( void *_arg )
+{
+    INFO ( "Call ended!" );
+    _phone->running_encaud = 0;
+    _phone->running_decaud = 0;
+    _phone->running_encvid = 0;
+    _phone->running_decvid = 0;
+
+    /* Wait until all threads are done */
+    usleep(100000); 
+
+    INFO ( "Call ended!" );
+}
+
+void callback_recv_error ( void *_arg )
+{
+    /*MSISession* _session = _arg;
+
+    INFO( "Error: %s", _session->last_error_str ); */
+}
+
+void callback_call_started ( void *_arg )
+{
+    if ( 0 != phone_startmedia_loop(_arg) ) {
+        INFO("Starting call failed!");
+    } else {
+        INFO ("Call started! ( press h to hangup )");
+    }
+
+}
+void callback_call_canceled ( void *_arg )
+{
+    INFO ( "Call canceled!" );
+}
+void callback_call_rejected ( void *_arg )
+{
+    INFO ( "Call rejected!" );
+}
+void callback_call_ended ( void *_arg )
+{
+    _phone->running_encaud = 0;
+    _phone->running_decaud = 0;
+    _phone->running_encvid = 0;
+    _phone->running_decvid = 0;
+
+    /* Wait until all threads are done 
+
+    while ( _phone->running_encaud != -1 ||
+            _phone->running_decaud != -1 ||
+            _phone->running_encvid != -1 ||
+            _phone->running_decvid != -1 )
+
+            usleep(1000000);*/
+
+    while (_phone->running_decaud != -1) usleep(1000000);
+    
+    toxav_kill_transmission(_phone->av);
+    INFO ( "Call ended!" );
+}
+
+void callback_requ_timeout ( void *_arg )
+{
+    INFO( "No answer! " );
+}
+
+av_session_t *av_init_session()
+{
+    av_session_t *_retu = malloc(sizeof(av_session_t));
+
+    /* Initialize our mutex */
+    pthread_mutex_init ( &_retu->_mutex, NULL );
+
+    _retu->_messenger = tox_new(1);
+
+    if ( !_retu->_messenger ) {
+        fprintf ( stderr, "tox_new() failed!\n" );
+        return NULL;
+    }
+
+    _retu->_friends = NULL;
+
+
+    const ALchar *_device_list = alcGetString(NULL, ALC_CAPTURE_DEVICE_SPECIFIER);
+    int i = 0;
+    const ALchar *device_names[20];
+
+    if ( _device_list ) {
+        INFO("\nAvailable Capture Devices are:");
+
+        while (*_device_list ) {
+            device_names[i] = _device_list;
+            INFO("%d) %s", i, device_names[i]);
+            _device_list += strlen( _device_list ) + 1;
+            ++i;
+        }
+    }
+
+    INFO("Enter capture device number");
+
+    char dev[2];
+    char *left;
+    char *warned_ = fgets(dev, 2, stdin);
+    (void)warned_;
+    long selection = strtol(dev, &left, 10);
+
+    if ( *left ) {
+        printf("'%s' is not a number!", dev);
+        fflush(stdout);
+        exit(EXIT_FAILURE);
+    } else {
+        INFO("Selected: %d ( %s )", selection, device_names[selection]);
+    }
+
+    _retu->audio_capture_device =
+        (struct ALCdevice *)alcCaptureOpenDevice(
+            device_names[selection], av_DefaultSettings.audio_sample_rate, AL_FORMAT_MONO16, AUDIO_FRAME_SIZE * 4);
+
+
+    if (alcGetError((ALCdevice *)_retu->audio_capture_device) != AL_NO_ERROR) {
+        printf("Could not start capture device! %d\n", alcGetError((ALCdevice *)_retu->audio_capture_device));
+        return 0;
+    }
+
+    uint16_t height = 0, width = 0;
+#ifdef TOX_FFMPEG
+    avdevice_register_all();
+    avcodec_register_all();
+    av_register_all();
+
+    _retu->video_input_format = av_find_input_format(VIDEO_DRIVER);
+
+    if (avformat_open_input(&_retu->video_format_ctx, DEFAULT_WEBCAM, _retu->video_input_format, NULL) != 0) {
+        fprintf(stderr, "Opening video_input_format failed!\n");
+        //return -1;
+        goto failed_init_ffmpeg;
+    }
+
+    avformat_find_stream_info(_retu->video_format_ctx, NULL);
+    av_dump_format(_retu->video_format_ctx, 0, DEFAULT_WEBCAM, 0);
+
+    for (i = 0; i < _retu->video_format_ctx->nb_streams; ++i) {
+        if (_retu->video_format_ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
+            _retu->video_stream = i;
+            break;
+        }
+    }
+
+    _retu->webcam_decoder_ctx = _retu->video_format_ctx->streams[_retu->video_stream]->codec;
+    _retu->webcam_decoder = avcodec_find_decoder(_retu->webcam_decoder_ctx->codec_id);
+
+    if (_retu->webcam_decoder == NULL) {
+        fprintf(stderr, "Unsupported codec!\n");
+        //return -1;
+        goto failed_init_ffmpeg;
+    }
+
+    if (_retu->webcam_decoder_ctx == NULL) {
+        fprintf(stderr, "Init webcam_decoder_ctx failed!\n");
+        //return -1;
+        goto failed_init_ffmpeg;
+    }
+
+    if (avcodec_open2(_retu->webcam_decoder_ctx, _retu->webcam_decoder, NULL) < 0) {
+        fprintf(stderr, "Opening webcam decoder failed!\n");
+        //return -1;
+        goto failed_init_ffmpeg;
+    }
+
+    width = _retu->webcam_decoder_ctx->width;
+    height = _retu->webcam_decoder_ctx->height;
+
+failed_init_ffmpeg: ;
+#endif
+    uint8_t _byte_address[TOX_FRIEND_ADDRESS_SIZE];
+    tox_get_address(_retu->_messenger, _byte_address );
+    fraddr_to_str( _byte_address, _retu->_my_public_id );
+
+    ToxAvCodecSettings cs = av_DefaultSettings;
+    cs.video_height = height;
+    cs.video_width = width;
+    _retu->av = toxav_new(_retu->_messenger, &cs);
+
+    /* ------------------ */
+
+    toxav_register_callstate_callback(callback_call_started, av_OnStart, _retu->av);
+    toxav_register_callstate_callback(callback_call_canceled, av_OnCancel, _retu->av);
+    toxav_register_callstate_callback(callback_call_rejected, av_OnReject, _retu->av);
+    toxav_register_callstate_callback(callback_call_ended, av_OnEnd, _retu->av);
+    toxav_register_callstate_callback(callback_recv_invite, av_OnInvite, _retu->av);
+
+    toxav_register_callstate_callback(callback_recv_ringing, av_OnRinging, _retu->av);
+    toxav_register_callstate_callback(callback_recv_starting, av_OnStarting, _retu->av);
+    toxav_register_callstate_callback(callback_recv_ending, av_OnEnding, _retu->av);
+
+    toxav_register_callstate_callback(callback_recv_error, av_OnError, _retu->av);
+    toxav_register_callstate_callback(callback_requ_timeout, av_OnRequestTimeout, _retu->av);
+
+    /* ------------------ */
+
+    return _retu;
+}
+
+int av_terminate_session(av_session_t *_phone)
+{
+    _phone->running_decaud = 0;
+    usleep(100000); /* Wait for tox_poll to end */
+    
+    toxav_kill(_phone->av);
+    printf("\r[i] KILLED AV ARGH!\n");
+    
+    usleep(1000000); /* Wait for cancel request to be sent */
+    Tox *_p = _phone->_messenger;
+    _phone->_messenger = NULL;
+    tox_kill(_p);
+
+    
+    free(_phone->_friends);
+    pthread_mutex_destroy ( &_phone->_mutex );
+    
+    free(_phone);
+
+    printf("\r[i] Quit!\n");
+    return 0;
+}
+
+/****** AV HELPER FUNCTIONS ******/
+
+/* Auto accept friend request */
+void av_friend_requ(Tox *_messenger, uint8_t *_public_key, uint8_t *_data, uint16_t _length, void *_userdata)
+{
+    av_session_t *_phone = _userdata;
+    av_allocate_friend (_phone, -1, 0);
+
+    INFO("Got friend request with message: %s", _data);
+
+    tox_add_friend_norequest(_phone->_messenger, _public_key);
+
+    INFO("Auto-accepted! Friend id: %d",  _phone->_friends->_id );
+}
+
+void av_friend_active(Tox *_messenger, int _friendnumber, uint8_t *_string, uint16_t _length, void *_userdata)
+{
+    av_session_t *_phone = _userdata;
+    INFO("Friend no. %d is online", _friendnumber);
+
+    av_friend_t *_this_friend = av_get_friend(_phone, _friendnumber);
+
+    if ( !_this_friend ) {
+        INFO("But it's not registered!");
+        return;
+    }
+
+    (*_this_friend)._active = 1;
+}
+
+int av_add_friend(av_session_t *_phone, char *_friend_hash)
+{
+    trim_spaces(_friend_hash);
+
+    unsigned char *_bin_string = hex_string_to_bin(_friend_hash);
+    int _number = tox_add_friend(_phone->_messenger, _bin_string, (uint8_t *)"Tox phone "_USERAGENT,
+                                 sizeof("Tox phone "_USERAGENT));
+    free(_bin_string);
+
+    if ( _number >= 0) {
+        INFO("Added friend as %d", _number );
+        av_allocate_friend(_phone, _number, 0);
+    } else
+        INFO("Unknown error %i", _number );
+
+    return _number;
+}
+
+int av_connect_to_dht(av_session_t *_phone, char *_dht_key, const char *_dht_addr, unsigned short _dht_port)
+{
+    unsigned char *_binary_string = hex_string_to_bin(_dht_key);
+
+    uint16_t _port = htons(_dht_port);
+
+    int _if = tox_bootstrap_from_address(_phone->_messenger, _dht_addr, 1, _port, _binary_string );
+
+    free(_binary_string);
+
+    return _if ? 0 : -1;
+}
+
+/*********************************/
+
+void do_phone ( av_session_t *_phone )
+{
+    INFO("Welcome to tox_phone version: " _USERAGENT "\n"
+         "Usage: \n"
+         "f [pubkey] (add friend)\n"
+         "c [a/v] (type) [friend] (friend id) (calls friend if online)\n"
+         "h (if call is active hang up)\n"
+         "a [a/v] (answer incoming call: a - audio / v - audio + video (audio is default))\n"
+         "r (reject incoming call)\n"
+         "q (quit)\n"
+         "================================================================================"
+        );
+
+    while ( 1 ) {
+        char _line [ 1500 ];
+        int _len;
+
+        if ( -1 == getinput(_line, 1500, &_len) ) {
+            printf(" >> ");
+            fflush(stdout);
+            continue;
+        }
+
+        if ( _len > 1 && _line[1] != ' ' && _line[1] != '\n' ) {
+            INFO("Invalid input!");
+            continue;
+        }
+
+        switch (_line[0]) {
+
+            case 'f': {
+                char _id [128];
+                strncpy(_id, _line + 2, 128);
+
+                av_add_friend(_phone, _id);
+
+            }
+            break;
+
+            case 'c': {
+                ToxAvCallType _ctype;
+
+                if ( _len < 5 ) {
+                    INFO("Invalid input; usage: c a/v [friend]");
+                    break;
+                } else if ( _line[2] == 'a' || _line[2] != 'v' ) { /* default and audio */
+                    _ctype = TypeAudio;
+                } else { /* video */
+                    _ctype = TypeVideo;
+                }
+
+                char *_end;
+                int _friend = strtol(_line + 4, &_end, 10);
+
+                if ( *_end ) {
+                    INFO("Friend num has to be numerical value");
+                    break;
+                }
+
+                if ( toxav_call(_phone->av, _friend, _ctype, 30) == ErrorAlreadyInCall ) {
+                    INFO("Already in a call");
+                    break;
+                } else INFO("Calling friend: %d!", _friend);
+
+            }
+            break;
+
+            case 'h': {
+                if ( toxav_hangup(_phone->av) == ErrorNoCall ) {
+                    INFO("No call!");
+                    break;
+                } else INFO("Hung up...");
+
+            }
+            break;
+
+            case 'a': {
+                ToxAvError rc;
+
+                if ( _len > 1 && _line[2] == 'v' ) {
+                    rc = toxav_answer(_phone->av, TypeVideo);
+                } else
+                    rc = toxav_answer(_phone->av, TypeAudio);
+
+                if ( rc == ErrorInvalidState ) {
+                    INFO("No call to answer!");
+                }
+
+            }
+            break;
+
+            case 'r': {
+                if ( toxav_reject(_phone->av, "User action") == ErrorInvalidState )
+                    INFO("No state to cancel!");
+                else INFO("Call Rejected...");
+
+            }
+            break;
+
+            case 'q': {
+                INFO("Quitting!");
+                return;
+            }
+
+            case '\n': {
+            }
+
+            default: {
+            } break;
+
+        }
+
+    }
+}
+
+void *tox_poll (void *_messenger_p)
+{
+    Tox **_messenger = _messenger_p;
+
+    while ( *_messenger ) {
+        tox_do(*_messenger);
+        usleep(10000);
+    }
+
+    pthread_exit(NULL);
+}
+
+int av_wait_dht(av_session_t *_phone, int _wait_seconds, const char *_ip, char *_key, unsigned short _port)
+{
+    if ( !_wait_seconds )
+        return -1;
+
+    int _waited = 0;
+
+    while ( !tox_isconnected(_phone->_messenger) ) {
+
+        if ( -1 == av_connect_to_dht(_phone, _key, _ip, _port) ) {
+            INFO("Could not connect to: %s", _ip);
+            av_terminate_session(_phone);
+            return -1;
+        }
+
+        if ( _waited >= _wait_seconds ) return 0;
+
+        printf(".");
+        fflush(stdout);
+
+        _waited ++;
+        usleep(1000000);
+    }
+
+    int _r = _wait_seconds - _waited;
+    return _r ? _r : 1;
+}
+/* ---------------------- */
+
+int print_help ( const char *_name )
+{
+    printf ( "Usage: %s [IP] [PORT] [KEY]\n"
+             "\t[IP] (DHT ip)\n"
+             "\t[PORT] (DHT port)\n"
+             "\t[KEY] (DHT public key)\n"
+             "P.S. Friends and key are stored in ./tox_phone.conf\n"
+             , _name );
+    return 1;
+}
+
+int main ( int argc, char *argv [] )
+{
+    if ( argc < 1 || argc < 4 )
+        return print_help(argv[0]);
+
+    char *_convertable;
+
+
+    const char *_ip = argv[1];
+    char *_key = argv[3];
+    unsigned short _port = strtol(argv[2], &_convertable, 10);
+
+    if ( *_convertable ) {
+        printf("Invalid port: cannot convert string to long: %s", _convertable);
+        return 1;
+    }
+
+    _phone = av_init_session();
+
+    assert ( _phone );
+    
+    tox_callback_friend_request(_phone->_messenger, av_friend_requ, _phone);
+    tox_callback_status_message(_phone->_messenger, av_friend_active, _phone);
+
+
+    INFO("\r================================================================================\n"
+         "[!] Trying dht@%s:%d"
+         , _ip, _port);
+
+    /* Start tox protocol */
+    event.rise( tox_poll, &_phone->_messenger );
+
+    /* Just clean one line */
+    printf("\r       \r");
+    fflush(stdout);
+
+    int _r;
+    int _wait_seconds = 5;
+
+    for ( _r = 0; _r == 0; _r = av_wait_dht(_phone, _wait_seconds, _ip, _key, _port) ) _wait_seconds --;
+
+
+    if ( -1 == _r ) {
+        INFO("Error while connecting to dht: %s:%d", _ip, _port);
+        av_terminate_session(_phone);
+        return 1;
+    }
+
+    INFO("CONNECTED!\n"
+         "================================================================================\n"
+         "%s\n"
+         "================================================================================"
+         , trim_spaces(_phone->_my_public_id) );
+
+
+    do_phone (_phone);
+
+    av_terminate_session(_phone);
+
+    return 0;
+}