16 files changed, 405 insertions, 312 deletions

diff --git a/.gitignore b/.gitignore
index 059987b5..aa7d8f50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,11 @@
+# OS files
 .DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ethumbs.db
+Thumbs.db
 
 //nacl build
 nacl/build/
diff --git a/configure.ac b/configure.ac
index dba051c7..62bb91bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -587,6 +587,7 @@ AM_CONDITIONAL(BUILD_TESTS, test "x$BUILD_TESTS" = "xyes")
 AM_CONDITIONAL(BUILD_NTOX, test "x$BUILD_NTOX" = "xyes")
 AM_CONDITIONAL(BUILD_AV, test "x$BUILD_AV" = "xyes")
 AM_CONDITIONAL(BUILD_TESTING, test "x$BUILD_TESTING" = "xyes")
+AM_CONDITIONAL(WIN32, test "x$WIN32" = "xyes")
 
 AC_CONFIG_FILES([Makefile
                  build/Makefile
diff --git a/docs/TODO b/docs/TODO
index 14fe8619..974dc350 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -2,6 +2,10 @@ TODO list.
 
 [IN PROGRESS] Add what is left to do to the TODO list.
 
+Networking:
+    [NOT STARTED] UPnP port forwarding.
+    [NOT STARTED] NAT-PMP port forwarding.
+
 DHT:
     [IN PROGRESS] Metadata collection prevention.
     [IN PROGRESS] Hardening against attacks.
@@ -11,9 +15,9 @@ Lossless UDP:
     [DONE] Increase data send/receive rates.
 
 [IN PROGRESS] Massive IRC like group chats (text only)
-    [DONE] networking base.
-    [TODO] Syncing chat state between clients (nicknames, list of who is in chat, etc...)
-    [TODO] Make clients sign their messages so that peers can't modify them.
+    [DONE] Networking base.
+    [NOT STARTED] Syncing chat state between clients (nicknames, list of who is in chat, etc...)
+    [NOT STARTED] Make clients sign their messages so that peers can't modify them.
 
 [IN PROGRESS] Audio/Video
     [DONE] Capture/encoding/streaming/decoding/displaying
@@ -23,9 +27,9 @@ Lossless UDP:
     [NOT STARTED] Push to talk for audio
 
 Friend_requests.c:
-    [TODO] What happens when a friend request is recieved needs to be changed.
+    [NOT STARTED] What happens when a friend request is recieved needs to be changed.
 
-[IN PROGRESS] File transfers
+[DONE] File transfers
 [NOT STARTED] Offline messaging
 [NOT STARTED] Friends list syncing
 [IN PROGRESS] IPV6 support
@@ -33,5 +37,5 @@ Friend_requests.c:
     [DONE] DHT + Messenger
     [NOT STARTED] Group chats
 
-[IN PROGRESS] GUI (https://github.com/nurupo/ProjectTox-Qt-GUI)
+[IN PROGRESS] GUI (no official GUI chosen yet)
 [NOT STARTED] Security audit from professionals
diff --git a/testing/Makefile.inc b/testing/Makefile.inc
index de3995be..31c84678 100644
--- a/testing/Makefile.inc
+++ b/testing/Makefile.inc
@@ -25,8 +25,7 @@ noinst_PROGRAMS +=      DHT_test \
                         Lossless_UDP_testclient \
                         Lossless_UDP_testserver \
                         Messenger_test \
-                        crypto_speed_test \
-                        tox_sync
+                        crypto_speed_test
 
 DHT_test_SOURCES =      ../testing/DHT_test.c
 
@@ -102,20 +101,22 @@ crypto_speed_test_LDADD = \
                         $(NACL_LIBS) \
                         $(WINSOCK2_LIBS)
 
-tox_sync_SOURCES = \
-                        ../testing/tox_sync.c
+if !WIN32
 
-tox_sync_CFLAGS = \
-                        $(LIBSODIUM_CFLAGS) \
+noinst_PROGRAMS +=      tox_sync
+
+tox_sync_SOURCES =      ../testing/tox_sync.c
+
+tox_sync_CFLAGS =       $(LIBSODIUM_CFLAGS) \
                         $(NACL_CFLAGS)
 
-tox_sync_LDADD = \
-                        $(LIBSODIUM_LDFLAGS) \
+tox_sync_LDADD =        $(LIBSODIUM_LDFLAGS) \
                         $(NACL_LDFLAGS) \
                         libtoxcore.la \
                         $(LIBSODIUM_LIBS) \
                         $(NACL_LIBS) \
                         $(WINSOCK2_LIBS)
+endif
 
 EXTRA_DIST +=                   $(top_srcdir)/testing/misc_tools.c
 
diff --git a/testing/crypto_speed_test.c b/testing/crypto_speed_test.c
index 05f4aaf2..bc8052da 100644
--- a/testing/crypto_speed_test.c
+++ b/testing/crypto_speed_test.c
@@ -8,6 +8,8 @@
 //Windows XP
 #define WINVER 0x0501
 #endif
+
+#include <winsock2.h>
 #include <windows.h>
 double get_time()
 {
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 6764dfe3..2e8efeac 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -31,6 +31,28 @@
 
 #define MIN(a,b) (((a)<(b))?(a):(b))
 
+
+void host_to_net(uint8_t *num, uint16_t numbytes)
+{
+    union {
+        uint32_t i;
+        uint8_t c[4];
+    } a;
+    a.i = 1;
+
+    if (a.c[0] == 1) {
+        uint32_t i;
+        uint8_t buff[numbytes];
+
+        for (i = 0; i < numbytes; ++i) {
+            buff[i] = num[numbytes - i - 1];
+        }
+
+        memcpy(num, buff, numbytes);
+    }
+}
+#define net_to_host(x, y) host_to_net(x, y)
+
 static void set_friend_status(Messenger *m, int friendnumber, uint8_t status);
 static int write_cryptpacket_id(Messenger *m, int friendnumber, uint8_t packet_id, uint8_t *data, uint32_t length);
 
@@ -1017,8 +1039,7 @@ int file_sendrequest(Messenger *m, int friendnumber, uint8_t filenumber, uint64_
 
     uint8_t packet[MAX_FILENAME_LENGTH + 1 + sizeof(filesize)];
     packet[0] = filenumber;
-    //TODO:
-    //filesize =  htonll(filesize);
+    host_to_net((uint8_t *)&filesize, sizeof(filesize));
     memcpy(packet + 1, &filesize, sizeof(filesize));
     memcpy(packet + 1 + sizeof(filesize), filename, filename_length);
     return write_cryptpacket_id(m, friendnumber, PACKET_ID_FILE_SENDREQUEST, packet,
@@ -1084,7 +1105,20 @@ int file_control(Messenger *m, int friendnumber, uint8_t send_receive, uint8_t f
     packet[0] = send_receive;
     packet[1] = filenumber;
     packet[2] = message_id;
-    memcpy(packet + 3, data, length);
+    uint64_t transferred = 0;
+
+    if (message_id ==  FILECONTROL_RESUME_BROKEN) {
+        if (length != sizeof(uint64_t))
+            return 0;
+
+        uint8_t remaining[sizeof(uint64_t)];
+        memcpy(remaining, data, sizeof(uint64_t));
+        host_to_net(remaining, sizeof(uint64_t));
+        memcpy(packet + 3, remaining, sizeof(uint64_t));
+        memcpy(&transferred, data, sizeof(uint64_t));
+    } else {
+        memcpy(packet + 3, data, length);
+    }
 
     if (write_cryptpacket_id(m, friendnumber, PACKET_ID_FILE_CONTROL, packet, length + 3)) {
         if (send_receive == 1)
@@ -1101,6 +1135,11 @@ int file_control(Messenger *m, int friendnumber, uint8_t send_receive, uint8_t f
                 case FILECONTROL_FINISHED:
                     m->friendlist[friendnumber].file_receiving[filenumber].status = FILESTATUS_NONE;
                     break;
+
+                case FILECONTROL_RESUME_BROKEN:
+                    m->friendlist[friendnumber].file_receiving[filenumber].status = FILESTATUS_PAUSED_BY_OTHER;
+                    m->friendlist[friendnumber].file_receiving[filenumber].transferred = transferred;
+                    break;
             }
         else
             switch (message_id) {
@@ -1201,17 +1240,23 @@ static void break_files(Messenger *m, int friendnumber)
     }
 }
 
-static int handle_filecontrol(Messenger *m, int friendnumber, uint8_t send_receive, uint8_t filenumber,
+static int handle_filecontrol(Messenger *m, int friendnumber, uint8_t receive_send, uint8_t filenumber,
                               uint8_t message_id, uint8_t *data,
                               uint16_t length)
 {
-    if (send_receive > 1)
+    if (receive_send > 1)
         return -1;
 
-    if (send_receive == 0) {
-        if (m->friendlist[friendnumber].file_receiving[filenumber].status == FILESTATUS_NONE)
+    if (receive_send == 0) {
+        if (m->friendlist[friendnumber].file_receiving[filenumber].status == FILESTATUS_NONE) {
+            /* Tell the other to kill the file sending if we don't know this one. */
+            m->friendlist[friendnumber].file_receiving[filenumber].status = FILESTATUS_TEMPORARY;
+            file_control(m, friendnumber, !receive_send, filenumber, FILECONTROL_KILL, NULL, 0);
+            m->friendlist[friendnumber].file_receiving[filenumber].status = FILESTATUS_NONE;
             return -1;
 
+        }
+
         switch (message_id) {
             case FILECONTROL_ACCEPT:
                 if (m->friendlist[friendnumber].file_receiving[filenumber].status != FILESTATUS_PAUSED_BY_US) {
@@ -1235,8 +1280,13 @@ static int handle_filecontrol(Messenger *m, int friendnumber, uint8_t send_recei
                 return 0;
         }
     } else {
-        if (m->friendlist[friendnumber].file_sending[filenumber].status == FILESTATUS_NONE)
+        if (m->friendlist[friendnumber].file_sending[filenumber].status == FILESTATUS_NONE) {
+            /* Tell the other to kill the file sending if we don't know this one. */
+            m->friendlist[friendnumber].file_sending[filenumber].status = FILESTATUS_TEMPORARY;
+            file_control(m, friendnumber, !receive_send, filenumber, FILECONTROL_KILL, NULL, 0);
+            m->friendlist[friendnumber].file_sending[filenumber].status = FILESTATUS_NONE;
             return -1;
+        }
 
         switch (message_id) {
             case FILECONTROL_ACCEPT:
@@ -1258,6 +1308,16 @@ static int handle_filecontrol(Messenger *m, int friendnumber, uint8_t send_recei
             case FILECONTROL_FINISHED:
                 m->friendlist[friendnumber].file_sending[filenumber].status = FILESTATUS_NONE;
                 return 0;
+
+            case FILECONTROL_RESUME_BROKEN: {
+                if (m->friendlist[friendnumber].file_sending[filenumber].status == FILESTATUS_BROKEN && length == sizeof(uint64_t)) {
+                    m->friendlist[friendnumber].file_sending[filenumber].status = FILESTATUS_PAUSED_BY_US;
+                    net_to_host(data, sizeof(uint64_t));
+                    return 0;
+                }
+
+                return -1;
+            }
         }
     }
 
@@ -1584,9 +1644,8 @@ void doFriends(Messenger *m)
 
                         uint8_t filenumber = data[0];
                         uint64_t filesize;
+                        net_to_host(data + 1, sizeof(filesize));
                         memcpy(&filesize, data + 1, sizeof(filesize));
-                        //TODO:
-                        //filesize = ntohll(filesize);
                         m->friendlist[i].file_receiving[filenumber].status = FILESTATUS_NOT_ACCEPTED;
                         m->friendlist[i].file_receiving[filenumber].size = filesize;
                         m->friendlist[i].file_receiving[filenumber].transferred = 0;
diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h
index f03a7478..c6ead732 100644
--- a/toxcore/Messenger.h
+++ b/toxcore/Messenger.h
@@ -111,7 +111,8 @@ enum {
     FILESTATUS_PAUSED_BY_OTHER,
     FILESTATUS_TRANSFERRING,
     FILESTATUS_BROKEN,
-    FILESTATUS_PAUSED_BY_US
+    FILESTATUS_PAUSED_BY_US,
+    FILESTATUS_TEMPORARY
 };
 /* This cannot be bigger than 256 */
 #define MAX_CONCURRENT_FILE_PIPES 256
@@ -120,7 +121,8 @@ enum {
     FILECONTROL_ACCEPT,
     FILECONTROL_PAUSE,
     FILECONTROL_KILL,
-    FILECONTROL_FINISHED
+    FILECONTROL_FINISHED,
+    FILECONTROL_RESUME_BROKEN
 };
 
 typedef struct {
diff --git a/toxcore/group_chats.c b/toxcore/group_chats.c
index c32b26ba..0d6d6972 100644
--- a/toxcore/group_chats.c
+++ b/toxcore/group_chats.c
@@ -266,7 +266,7 @@ int group_peername(Group_Chat *chat, int peernum, uint8_t *name)
         return -1;
 
     if (chat->group[peernum].nick_len == 0) {
-        memcpy(name, "NSA Agent", 10); /* Kindly remind the user that someone with no name might be a NSA agent.*/
+        memcpy(name, "NSA Agent", 10); /* Kindly remind the user that someone with no name might be an NSA agent.*/
         return 10;
     }
 
diff --git a/toxcore/net_crypto.c b/toxcore/net_crypto.c
index 3049776f..b7e3ced7 100644
--- a/toxcore/net_crypto.c
+++ b/toxcore/net_crypto.c
@@ -704,10 +704,17 @@ static void receive_crypto(Net_Crypto *c)
                             CONN_ESTABLISHED; /* Connection status needs to be 3 for write_cryptpacket() to work. */
                         write_cryptpacket(c, i, ((uint8_t *)&zero), sizeof(zero));
                         c->crypto_connections[i].status = CONN_NOT_CONFIRMED; /* Set it to its proper value right after. */
+                    } else {
+                        /* This should not happen, timeout the connection if it does. */
+                        c->crypto_connections[i].status = CONN_TIMED_OUT;
                     }
+                } else {
+                    /* This should not happen, timeout the connection if it does. */
+                    c->crypto_connections[i].status = CONN_TIMED_OUT;
                 }
             } else if (id_packet(c->lossless_udp,
-                                 c->crypto_connections[i].number) != -1) { // This should not happen, timeout the connection if it does.
+                                 c->crypto_connections[i].number) != -1) {
+                /* This should not happen, timeout the connection if it does. */
                 c->crypto_connections[i].status = CONN_TIMED_OUT;
             }
         }
diff --git a/toxcore/net_crypto.h b/toxcore/net_crypto.h
index 0c1bffe6..0ddb711a 100644
--- a/toxcore/net_crypto.h
+++ b/toxcore/net_crypto.h
@@ -28,7 +28,7 @@
 
 #define CRYPTO_PACKET_FRIEND_REQ    32  /* Friend request crypto packet ID. */
 #define CRYPTO_PACKET_NAT_PING      254 /* NAT ping crypto packet ID. */
-#define CRYPTO_HANDSHAKE_TIMEOUT CONNEXION_TIMEOUT
+#define CRYPTO_HANDSHAKE_TIMEOUT (CONNEXION_TIMEOUT * 2)
 
 typedef struct {
     uint8_t public_key[crypto_box_PUBLICKEYBYTES]; /* The real public key of the peer. */
diff --git a/toxcore/network.c b/toxcore/network.c
index ee950d97..53511df6 100644
--- a/toxcore/network.c
+++ b/toxcore/network.c
@@ -20,6 +20,10 @@
  *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+

+#if (_WIN32_WINNT >= _WIN32_WINNT_WINXP)
+#define _WIN32_WINNT  0x501

+#endif

 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/toxcore/tox.c b/toxcore/tox.c
index 8f4aef5b..5f882965 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -171,20 +171,6 @@ uint32_t tox_sendaction_withid(Tox *tox, int friendnumber, uint32_t theid, uint8
     return m_sendaction_withid(m, friendnumber, theid, action, length);
 }
 
-/* Set friendnumber's nickname.
- * name must be a string of maximum MAX_NAME_LENGTH length.
- * length must be at least 1 byte.
- * length is the length of name with the NULL terminator.
- *
- *  return 0 if success.
- *  return -1 if failure.
- */
-int tox_setfriendname(Tox *tox, int friendnumber, uint8_t *name, uint16_t length)
-{
-    Messenger *m = tox;
-    return setfriendname(m, friendnumber, name, length);
-}
-
 /* Set our nickname.
  * name must be a string of maximum MAX_NAME_LENGTH length.
  * length must be at least 1 byte.
diff --git a/toxcore/tox.h b/toxcore/tox.h
index bcc89ce1..2a26e7a6 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -211,16 +211,6 @@ uint32_t tox_sendmessage_withid(Tox *tox, int friendnumber, uint32_t theid, uint
 uint32_t tox_sendaction(Tox *tox, int friendnumber, uint8_t *action, uint32_t length);
 uint32_t tox_sendaction_withid(Tox *tox, int friendnumber, uint32_t theid, uint8_t *action, uint32_t length);
 
-/* Set friendnumber's nickname.
- * name must be a string of maximum MAX_NAME_LENGTH length.
- * length must be at least 1 byte.
- * length is the length of name with the NULL terminator.
- *
- *  return 0 if success.
- *  return -1 if failure.
- */
-int tox_setfriendname(Tox *tox, int friendnumber, uint8_t *name, uint16_t length);
-
 /* Set our nickname.
  * name must be a string of maximum MAX_NAME_LENGTH length.
  * length must be at least 1 byte.
@@ -434,6 +424,13 @@ int tox_group_message_send(Tox *tox, int groupnumber, uint8_t *message, uint32_t
  *
  * tox_file_dataremaining(...) can be used to know how many bytes are left to send/receive.
  *
+ * If the connection breaks during file sending (The other person goes offline without pausing the sending and then comes back)
+ * the reciever must send a control packet with receive_send == 0 message_id = TOX_FILECONTROL_RESUME_BROKEN and the data being
+ * a uint64_t (in host byte order) containing the number of bytes recieved.
+ *
+ * If the sender recieves this packet, he must send a control packet with receive_send == 1 and control_type == TOX_FILECONTROL_ACCEPT
+ * then he must start sending file data from the position (data , uint64_t in host byte order) recieved in the TOX_FILECONTROL_RESUME_BROKEN packet.
+ *
  * More to come...
  */
 
@@ -441,7 +438,8 @@ enum {
     TOX_FILECONTROL_ACCEPT,
     TOX_FILECONTROL_PAUSE,
     TOX_FILECONTROL_KILL,
-    TOX_FILECONTROL_FINISHED
+    TOX_FILECONTROL_FINISHED,
+    TOX_FILECONTROL_RESUME_BROKEN
 };
 /* Set the callback for file send requests.
  *
diff --git a/toxmsi/phone.c b/toxmsi/phone.c
index 010f26aa..f14d0323 100644
--- a/toxmsi/phone.c
+++ b/toxmsi/phone.c
@@ -14,13 +14,13 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <termios.h>
+/* #include <termios.h> Can this be removed? */
 #include <pthread.h>
 #include "AV_codec.h"
 
 
 
-void INFO (const char* _format, ...)
+void INFO (const char *_format, ...)
 {
     printf("\r[!] ");
     va_list _arg;
@@ -31,13 +31,13 @@ void INFO (const char* _format, ...)
     fflush(stdout);
 }
 
-int rtp_handlepacket ( void* _object, tox_IP_Port ip_port, uint8_t* data, uint32_t length )
+int rtp_handlepacket ( void *_object, tox_IP_Port ip_port, uint8_t *data, uint32_t length )
 {
-    phone_t* _phone = _object;
-    rtp_msg_t* _msg;
+    phone_t *_phone = _object;
+    rtp_msg_t *_msg;
     uint8_t _payload_id;
 
-    if ( _phone->_msi->_call && _phone->_msi->_call->_state == call_active ){
+    if ( _phone->_msi->_call && _phone->_msi->_call->_state == call_active ) {
 
         _msg = rtp_msg_parse ( NULL, data + 1, length - 1 ); /* ignore marker byte */
 
@@ -55,10 +55,10 @@ int rtp_handlepacket ( void* _object, tox_IP_Port ip_port, uint8_t* data, uint32
 
     return SUCCESS;
 }
-int msi_handlepacket ( void* _object, tox_IP_Port ip_port, uint8_t* data, uint32_t length )
+int msi_handlepacket ( void *_object, tox_IP_Port ip_port, uint8_t *data, uint32_t length )
 {
-    msi_session_t* _session = _object;
-    msi_msg_t* _msg;
+    msi_session_t *_session = _object;
+    msi_msg_t *_msg;
 
     _msg = msi_parse_msg ( data + 1 ); /* ignore marker byte */
 
@@ -75,9 +75,9 @@ int msi_handlepacket ( void* _object, tox_IP_Port ip_port, uint8_t* data, uint32
     return SUCCESS;
 }
 
-void* phone_receivepacket ( void* _phone_p )
+void *phone_receivepacket ( void *_phone_p )
 {
-    phone_t* _phone = _phone_p;
+    phone_t *_phone = _phone_p;
 
 
     networking_registerhandler(_phone->_networking, MSI_PACKET, msi_handlepacket, _phone->_msi);
@@ -94,31 +94,31 @@ void* phone_receivepacket ( void* _phone_p )
 
 /* Media transport callback */
 typedef struct hmtc_args_s {
-    rtp_session_t** _rtp_audio;
-    rtp_session_t** _rtp_video;
-    call_type* _local_type_call;
-    call_state* _this_call;
+    rtp_session_t **_rtp_audio;
+    rtp_session_t **_rtp_video;
+    call_type *_local_type_call;
+    call_state *_this_call;
     void *_core_handler;
 } hmtc_args_t;
 
-void* phone_handle_media_transport_poll ( void* _hmtc_args_p )
+void *phone_handle_media_transport_poll ( void *_hmtc_args_p )
 {
-    rtp_msg_t* _audio_msg, * _video_msg;
+    rtp_msg_t *_audio_msg, * _video_msg;
 
-    hmtc_args_t* _hmtc_args = _hmtc_args_p;
+    hmtc_args_t *_hmtc_args = _hmtc_args_p;
 
-    rtp_session_t* _rtp_audio = *_hmtc_args->_rtp_audio;
-    rtp_session_t* _rtp_video = *_hmtc_args->_rtp_video;
+    rtp_session_t *_rtp_audio = *_hmtc_args->_rtp_audio;
+    rtp_session_t *_rtp_video = *_hmtc_args->_rtp_video;
 
-    call_type* _type = _hmtc_args->_local_type_call;
-    void* _core_handler = _hmtc_args->_core_handler;
+    call_type *_type = _hmtc_args->_local_type_call;
+    void *_core_handler = _hmtc_args->_core_handler;
 
 
-    call_state* _this_call = _hmtc_args->_this_call;
+    call_state *_this_call = _hmtc_args->_this_call;
 
     while ( *_this_call == call_active ) {
 
-       // THREADLOCK()
+        // THREADLOCK()
 
         _audio_msg = rtp_recv_msg ( _rtp_audio );
         _video_msg = rtp_recv_msg ( _rtp_video );
@@ -139,14 +139,15 @@ void* phone_handle_media_transport_poll ( void* _hmtc_args_p )
             rtp_free_msg ( _rtp_video, _video_msg );
             _video_msg = NULL;
         }
+
         /* -------------------- */
 
-        _audio_msg = rtp_msg_new ( _rtp_audio, (const uint8_t*)"audio\0", 6 ) ;
+        _audio_msg = rtp_msg_new ( _rtp_audio, (const uint8_t *)"audio\0", 6 ) ;
         rtp_send_msg ( _rtp_audio, _audio_msg, _core_handler );
         _audio_msg = NULL;
 
-        if ( *_type == type_video ){ /* if local call send video */
-            _video_msg = rtp_msg_new ( _rtp_video, (const uint8_t*)"video\0", 6 ) ;
+        if ( *_type == type_video ) { /* if local call send video */
+            _video_msg = rtp_msg_new ( _rtp_video, (const uint8_t *)"video\0", 6 ) ;
             rtp_send_msg ( _rtp_video, _video_msg, _core_handler );
             _video_msg = NULL;
         }
@@ -159,7 +160,7 @@ void* phone_handle_media_transport_poll ( void* _hmtc_args_p )
 
     //THREADLOCK()
 
-    if ( _audio_msg ){
+    if ( _audio_msg ) {
         rtp_free_msg(_rtp_audio, _audio_msg);
     }
 
@@ -185,9 +186,9 @@ void* phone_handle_media_transport_poll ( void* _hmtc_args_p )
     pthread_exit ( NULL );
 }
 
-pthread_t phone_startmedia_loop ( phone_t* _phone )
+pthread_t phone_startmedia_loop ( phone_t *_phone )
 {
-    if ( !_phone ){
+    if ( !_phone ) {
         return 0;
     }
 
@@ -207,10 +208,10 @@ pthread_t phone_startmedia_loop ( phone_t* _phone )
     rtp_set_prefix ( _phone->_rtp_video, &_prefix, 1 );
     rtp_add_receiver ( _phone->_rtp_video, &_phone->_msi->_friend_id );
     rtp_set_payload_type(_phone->_rtp_video, _PAYLOAD_VP8);
-    
-    
 
-    hmtc_args_t* rtp_targs = calloc(sizeof(hmtc_args_t),1);
+
+
+    hmtc_args_t *rtp_targs = calloc(sizeof(hmtc_args_t), 1);
 
 
     rtp_targs->_rtp_audio = &_phone->_rtp_audio;
@@ -220,26 +221,29 @@ pthread_t phone_startmedia_loop ( phone_t* _phone )
     rtp_targs->_core_handler = _phone->_networking;
 
     codec_state *cs;
-    cs=_phone->cs;
+    cs = _phone->cs;
     //_status = pthread_create ( &_rtp_tid, NULL, phone_handle_media_transport_poll, rtp_targs );
-    cs->_rtp_audio=_phone->_rtp_audio;
-    cs->_rtp_video=_phone->_rtp_video;
-    cs->_networking=_phone->_networking;
-    cs->socket=_phone->_tox_sock;
+    cs->_rtp_audio = _phone->_rtp_audio;
+    cs->_rtp_video = _phone->_rtp_video;
+    cs->_networking = _phone->_networking;
+    cs->socket = _phone->_tox_sock;
     cs->quit = 0;
-    
-    printf("support: %d %d\n",cs->support_send_audio,cs->support_send_video);
-    
-    if(cs->support_send_audio&&cs->support_send_video) /* quick fix */
-       pthread_create(&_phone->cs->encode_audio_thread, NULL, encode_audio_thread, _phone->cs);
-   if(cs->support_receive_audio)
-        pthread_create(&_phone->cs->decode_audio_thread, NULL, decode_audio_thread, _phone->cs);
-
-    if(cs->support_send_video)
-       pthread_create(&_phone->cs->encode_video_thread, NULL, encode_video_thread, _phone->cs);
-    if(cs->support_receive_video)
-        pthread_create(&_phone->cs->decode_video_thread, NULL, decode_video_thread, _phone->cs); 
-//     
+
+    printf("support: %d %d\n", cs->support_send_audio, cs->support_send_video);
+
+    if (cs->support_send_audio && cs->support_send_video) /* quick fix */
+        pthread_create(&_phone->cs->encode_audio_thread, NULL, encode_audio_thread, _phone->cs);
+
+    if (cs->support_receive_audio)
+        pthread_create(&_phone->cs->decode_audio_thread, NULL, decode_audio_thread, _phone->cs);
+
+    if (cs->support_send_video)
+        pthread_create(&_phone->cs->encode_video_thread, NULL, encode_video_thread, _phone->cs);
+
+    if (cs->support_receive_video)
+        pthread_create(&_phone->cs->decode_video_thread, NULL, decode_video_thread, _phone->cs);
+
+//
     return 1;
 
 
@@ -252,20 +256,21 @@ pthread_t phone_startmedia_loop ( phone_t* _phone )
 
 MCBTYPE callback_recv_invite ( MCBARGS )
 {
-    const char* _call_type;
+    const char *_call_type;
 
-    msi_session_t* _msi = _arg;
+    msi_session_t *_msi = _arg;
 
     /* Get the last one */
     call_type _type = _msi->_call->_type_peer[_msi->_call->_participants - 1];
 
-    switch ( _type ){
-    case type_audio:
-        _call_type = "audio";
-        break;
-    case type_video:
-        _call_type = "video";
-        break;
+    switch ( _type ) {
+        case type_audio:
+            _call_type = "audio";
+            break;
+
+        case type_video:
+            _call_type = "video";
+            break;
     }
 
     INFO( "Incoming %s call!", _call_type );
@@ -281,8 +286,9 @@ MCBTYPE callback_recv_ringing ( MCBARGS )
 }
 MCBTYPE callback_recv_starting ( MCBARGS )
 {
-    msi_session_t* _session = _arg;
-    if ( !phone_startmedia_loop(_session->_agent_handler) ){
+    msi_session_t *_session = _arg;
+
+    if ( !phone_startmedia_loop(_session->_agent_handler) ) {
         INFO("Starting call failed!");
     } else {
         INFO ("Call started! ( press h to hangup )");
@@ -290,34 +296,40 @@ MCBTYPE callback_recv_starting ( MCBARGS )
 }
 MCBTYPE callback_recv_ending ( MCBARGS )
 {
-    msi_session_t* _session = _arg;
-    phone_t * _phone = _session->_agent_handler;
-    _phone->cs->quit=1;
-    if(_phone->cs->encode_video_thread)
-        pthread_join(_phone->cs->encode_video_thread,NULL);
-    if(_phone->cs->encode_audio_thread)
-        pthread_join(_phone->cs->encode_audio_thread,NULL);
-    if(_phone->cs->decode_audio_thread)
-        pthread_join(_phone->cs->decode_audio_thread,NULL);
-    if(_phone->cs->decode_video_thread)
-        pthread_join(_phone->cs->decode_video_thread,NULL);    
+    msi_session_t *_session = _arg;
+    phone_t *_phone = _session->_agent_handler;
+    _phone->cs->quit = 1;
+
+    if (_phone->cs->encode_video_thread)
+        pthread_join(_phone->cs->encode_video_thread, NULL);
+
+    if (_phone->cs->encode_audio_thread)
+        pthread_join(_phone->cs->encode_audio_thread, NULL);
+
+    if (_phone->cs->decode_audio_thread)
+        pthread_join(_phone->cs->decode_audio_thread, NULL);
+
+    if (_phone->cs->decode_video_thread)
+        pthread_join(_phone->cs->decode_video_thread, NULL);
+
     SDL_Quit();
     printf("all A/V threads successfully shut down\n");
-    
+
     INFO ( "Call ended!" );
 }
 
 MCBTYPE callback_recv_error ( MCBARGS )
 {
-    msi_session_t* _session = _arg;
+    msi_session_t *_session = _arg;
 
     INFO( "Error: %s", _session->_last_error_str );
 }
 
 MCBTYPE callback_call_started ( MCBARGS )
 {
-    msi_session_t* _session = _arg;
-    if ( !phone_startmedia_loop(_session->_agent_handler) ){
+    msi_session_t *_session = _arg;
+
+    if ( !phone_startmedia_loop(_session->_agent_handler) ) {
         INFO("Starting call failed!");
     } else {
         INFO ("Call started! ( press h to hangup )");
@@ -334,21 +346,26 @@ MCBTYPE callback_call_rejected ( MCBARGS )
 }
 MCBTYPE callback_call_ended ( MCBARGS )
 {
-    
-    msi_session_t* _session = _arg;
-    phone_t * _phone = _session->_agent_handler;
-    _phone->cs->quit=1;
-    if(_phone->cs->encode_video_thread)
-        pthread_join(_phone->cs->encode_video_thread,NULL);
-    if(_phone->cs->encode_audio_thread)
-        pthread_join(_phone->cs->encode_audio_thread,NULL);
-    if(_phone->cs->decode_audio_thread)
-        pthread_join(_phone->cs->decode_audio_thread,NULL);
-    if(_phone->cs->decode_video_thread)
-        pthread_join(_phone->cs->decode_video_thread,NULL);    
+
+    msi_session_t *_session = _arg;
+    phone_t *_phone = _session->_agent_handler;
+    _phone->cs->quit = 1;
+
+    if (_phone->cs->encode_video_thread)
+        pthread_join(_phone->cs->encode_video_thread, NULL);
+
+    if (_phone->cs->encode_audio_thread)
+        pthread_join(_phone->cs->encode_audio_thread, NULL);
+
+    if (_phone->cs->decode_audio_thread)
+        pthread_join(_phone->cs->decode_audio_thread, NULL);
+
+    if (_phone->cs->decode_video_thread)
+        pthread_join(_phone->cs->decode_video_thread, NULL);
+
     SDL_Quit();
     printf("all A/V threads successfully shut down\n");
-    
+
     INFO ( "Call ended!" );
 }
 
@@ -358,10 +375,10 @@ MCBTYPE callback_requ_timeout ( MCBARGS )
 }
 
 
-phone_t* initPhone(uint16_t _listen_port, uint16_t _send_port)
+phone_t *initPhone(uint16_t _listen_port, uint16_t _send_port)
 {
-    phone_t* _retu = calloc(sizeof(phone_t),1);
-    _retu->cs = av_calloc(sizeof(codec_state),1);
+    phone_t *_retu = calloc(sizeof(phone_t), 1);
+    _retu->cs = av_calloc(sizeof(codec_state), 1);
 
     /* Initialize our mutex */
     pthread_mutex_init ( &_mutex, NULL );
@@ -388,13 +405,13 @@ phone_t* initPhone(uint16_t _listen_port, uint16_t _send_port)
 
 
     /* Initialize msi */
-    _retu->_msi = msi_init_session ( _retu->_networking, (const uint8_t*)_USERAGENT );
+    _retu->_msi = msi_init_session ( _retu->_networking, (const uint8_t *)_USERAGENT );
 
     if ( !_retu->_msi ) {
         fprintf ( stderr, "msi_init_session() failed\n" );
         return NULL;
     }
-    
+
     /* Initiate codecs */
     init_encoder(_retu->cs);
     init_decoder(_retu->cs);
@@ -425,7 +442,7 @@ phone_t* initPhone(uint16_t _listen_port, uint16_t _send_port)
     return _retu;
 }
 
-pthread_t phone_startmain_loop(phone_t* _phone)
+pthread_t phone_startmain_loop(phone_t *_phone)
 {
     int _status;
     /* Start receive thread */
@@ -461,9 +478,9 @@ pthread_t phone_startmain_loop(phone_t* _phone)
     return _phone_loop_thread;
 }
 
-void* phone_poll ( void* _p_phone )
+void *phone_poll ( void *_p_phone )
 {
-    phone_t* _phone = _p_phone;
+    phone_t *_phone = _p_phone;
 
     int _status = SUCCESS;
 
@@ -482,121 +499,127 @@ void* phone_poll ( void* _p_phone )
          "r (reject incoming call)\n"
          "q (quit)\n"
          "================================================================================"
-         );
+        );
 
-    while ( 1 )
-    {
+    while ( 1 ) {
         fgets(_line, sizeof(_line), stdin);
-        int i;
+        int i;
+
         for (i = 0; i < 100; i++) {
             if (_line[i] == '\n') {
                 _line[i] = '\0';
             }
         }
+
         _len = strlen(_line);
-        
-        if ( !_len ){
-            printf(" >> "); fflush(stdout);
+
+        if ( !_len ) {
+            printf(" >> ");
+            fflush(stdout);
             continue;
         }
 
-        if ( _len > 1 && _line[1] != ' ' && _line[1] != '\n' ){
+        if ( _len > 1 && _line[1] != ' ' && _line[1] != '\n' ) {
             INFO("Invalid input!");
             continue;
         }
 
-        switch (_line[0]){
+        switch (_line[0]) {
 
-        case 'c':
-        {
-            if ( _phone->_msi->_call ){
-                INFO("Already in a call");
-                break;
-            }
+            case 'c': {
+                if ( _phone->_msi->_call ) {
+                    INFO("Already in a call");
+                    break;
+                }
 
-            call_type _ctype;
-            if ( _len < 11 ){
-                INFO("Invalid input; usage: c a/v 0.0.0.0");
-                break;
-            }
-            else if ( _line[2] == 'a' || _line[2] != 'v' ){ /* default and audio */
-                _ctype = type_audio;
-            }
-            else { /* video */
-                _ctype = type_video;
-            }
+                call_type _ctype;
 
-            strcpy(_dest, _line + 4 );
-            _status = t_setipport(_dest, _phone->_send_port, &(_phone->_msi->_friend_id));
+                if ( _len < 11 ) {
+                    INFO("Invalid input; usage: c a/v 0.0.0.0");
+                    break;
+                } else if ( _line[2] == 'a' || _line[2] != 'v' ) { /* default and audio */
+                    _ctype = type_audio;
+                } else { /* video */
+                    _ctype = type_video;
+                }
+
+                strcpy(_dest, _line + 4 );
+                _status = t_setipport(_dest, _phone->_send_port, &(_phone->_msi->_friend_id));
+
+                if ( _status < 0 ) {
+                    INFO("Could not resolve address!");
+                } else {
+                    /* Set timeout */
+                    msi_invite ( _phone->_msi, _ctype, 30 * 1000 );
+                    INFO("Calling!");
+                }
+
+                t_memset((uint8_t *)_dest, '\0', 17);
 
-            if ( _status < 0 ){
-                INFO("Could not resolve address!");
-            } else {
-                /* Set timeout */
-                msi_invite ( _phone->_msi, _ctype, 30 * 1000 );
-                INFO("Calling!");
             }
+            break;
 
-            t_memset((uint8_t*)_dest, '\0', 17);
+            case 'h': {
+                if ( !_phone->_msi->_call ) {
+                    break;
+                }
+
+                msi_hangup(_phone->_msi);
+
+                INFO("Hung up...");
 
-        } break;
-        case 'h':
-        {
-            if ( !_phone->_msi->_call ){
-                break;
             }
+            break;
 
-            msi_hangup(_phone->_msi);
+            case 'a': {
+                if ( _phone->_msi->_call && _phone->_msi->_call->_state != call_starting ) {
+                    break;
+                }
 
-            INFO("Hung up...");
+                if ( _len > 1 && _line[2] == 'v' )
+                    msi_answer(_phone->_msi, type_video);
+                else
+                    msi_answer(_phone->_msi, type_audio);
 
-        } break;
-        case 'a':
-        {
-            if ( _phone->_msi->_call && _phone->_msi->_call->_state != call_starting ) {
-                break;
             }
+            break;
+
+            case 'r': {
+                if ( _phone->_msi->_call && _phone->_msi->_call->_state != call_starting ) {
+                    break;
+                }
 
-            if ( _len > 1 && _line[2] == 'v' )
-                msi_answer(_phone->_msi, type_video);
-            else
-                msi_answer(_phone->_msi, type_audio);
+                msi_reject(_phone->_msi);
+
+                INFO("Call Rejected...");
 
-        } break;
-        case 'r':
-        {
-            if ( _phone->_msi->_call && _phone->_msi->_call->_state != call_starting ){
-                break;
             }
+            break;
 
-            msi_reject(_phone->_msi);
+            case 'q': {
+                INFO("Quitting!");
+                pthread_exit(NULL);
+            }
 
-            INFO("Call Rejected...");
+            default: {
+                INFO("Invalid command!");
+            }
+            break;
 
-        } break;
-        case 'q':
-        {
-            INFO("Quitting!");
-            pthread_exit(NULL);
         }
-        default:
-        {
-            INFO("Invalid command!");
-        } break;
 
-        }
-    usleep(1000);
+        usleep(1000);
     }
 
     pthread_exit(NULL);
 }
 
-int quitPhone(phone_t* _phone)
+int quitPhone(phone_t *_phone)
 {
-    if ( _phone->_msi->_call ){
+    if ( _phone->_msi->_call ) {
         msi_hangup(_phone->_msi); /* Hangup the phone first */
     }
-    
+
     msi_terminate_session(_phone->_msi);
     pthread_mutex_destroy ( &_mutex );
 
@@ -606,17 +629,17 @@ int quitPhone(phone_t* _phone)
 
 /* ---------------------- */
 
-int print_help ( const char* _name )
+int print_help ( const char *_name )
 {
     printf ( "Usage: %s -m (mode) -r/s ( for setting the ports on test version )\n", _name );
     return FAILURE;
 }
 
-int main ( int argc, char* argv [] )
+int main ( int argc, char *argv [] )
 {
-    arg_t* _args = parse_args ( argc, argv );
+    arg_t *_args = parse_args ( argc, argv );
 
-    const char* _mode = find_arg_duble ( _args, "-m" );
+    const char *_mode = find_arg_duble ( _args, "-m" );
     uint16_t _listen_port;
     uint16_t _send_port;
 
@@ -631,9 +654,9 @@ int main ( int argc, char* argv [] )
         _listen_port = 31000;
     } else return print_help ( argv[0] );
 
-    phone_t* _phone = initPhone(_listen_port, _send_port);
+    phone_t *_phone = initPhone(_listen_port, _send_port);
 
-    if ( _phone ){
+    if ( _phone ) {
         phone_startmain_loop(_phone);
 
         quitPhone(_phone);
diff --git a/toxrtp/toxrtp.h b/toxrtp/toxrtp.h
index f6270c11..44717835 100644
--- a/toxrtp/toxrtp.h
+++ b/toxrtp/toxrtp.h
@@ -31,7 +31,7 @@
 #define RTP_VERSION 2
 #include <inttypes.h>
 #include "../toxcore/tox.h"
-
+#include <pthread.h>
 /* Extension header flags */
 #define RTP_EXT_TYPE_RESOLUTION 0x01
 #define RTP_EXT_TYPE_FRAMERATE  0x02
@@ -72,7 +72,7 @@ typedef struct rtp_session_s {
     uint32_t                _time_elapsed;
     uint32_t                _current_timestamp;
     uint32_t                _ssrc;
-    uint32_t*               _csrc;
+    uint32_t               *_csrc;
 
 
     /* If some additional data must be sent via message
@@ -80,7 +80,7 @@ typedef struct rtp_session_s {
      * automatically placing it within a message.
      */
 
-    struct rtp_ext_header_s*    _ext_header;
+    struct rtp_ext_header_s    *_ext_header;
     /* External header identifiers */
     int                         _exthdr_resolution;
     int                         _exthdr_framerate;
@@ -95,16 +95,16 @@ typedef struct rtp_session_s {
 
     uint64_t                    _packet_loss;
 
-    const char*                 _last_error;
+    const char                 *_last_error;
 
-    struct rtp_dest_list_s*     _dest_list;
-    struct rtp_dest_list_s*     _last_user; /* a tail for faster appending */
+    struct rtp_dest_list_s     *_dest_list;
+    struct rtp_dest_list_s     *_last_user; /* a tail for faster appending */
 
-    struct rtp_msg_s*           _oldest_msg;
-    struct rtp_msg_s*           _last_msg; /* tail */
+    struct rtp_msg_s           *_oldest_msg;
+    struct rtp_msg_s           *_last_msg; /* tail */
 
     uint16_t                    _prefix_length;
-    uint8_t*                    _prefix;
+    uint8_t                    *_prefix;
 
     /* Specifies multiple session use.
      * When using one session it uses default value ( -1 )
@@ -125,35 +125,35 @@ typedef struct rtp_session_s {
  */
 
 
-void                    rtp_free_msg ( rtp_session_t* _session, struct rtp_msg_s* _msg );
-int                     rtp_release_session_recv ( rtp_session_t* _session );
+void                    rtp_free_msg ( rtp_session_t *_session, struct rtp_msg_s *_msg );
+int                     rtp_release_session_recv ( rtp_session_t *_session );
 
 /* Functions handling receiving */
-struct rtp_msg_s*       rtp_recv_msg ( rtp_session_t* _session );
-void                    rtp_store_msg ( rtp_session_t* _session, struct rtp_msg_s* _msg );
+struct rtp_msg_s       *rtp_recv_msg ( rtp_session_t *_session );
+void                    rtp_store_msg ( rtp_session_t *_session, struct rtp_msg_s *_msg );
 
 /*
  * rtp_msg_parse() stores headers separately from the payload data
  * and so the _length variable is set accordingly
  */
-struct rtp_msg_s*       rtp_msg_parse ( rtp_session_t* _session, const uint8_t* _data, uint32_t _length );
+struct rtp_msg_s       *rtp_msg_parse ( rtp_session_t *_session, const uint8_t *_data, uint32_t _length );
 
-int                     rtp_check_late_message (rtp_session_t* _session, struct rtp_msg_s* _msg);
-void                    rtp_register_msg ( rtp_session_t* _session, struct rtp_msg_s* );
+int                     rtp_check_late_message (rtp_session_t *_session, struct rtp_msg_s *_msg);
+void                    rtp_register_msg ( rtp_session_t *_session, struct rtp_msg_s * );
 
 /* Functions handling sending */
-int                     rtp_send_msg ( rtp_session_t* _session, struct rtp_msg_s* _msg, void* _core_handler );
+int                     rtp_send_msg ( rtp_session_t *_session, struct rtp_msg_s *_msg, void *_core_handler );
 
 /*
  * rtp_msg_new() stores headers and payload data in one container ( _data )
  * and the _length is set accordingly. Returned message is used for sending only
  * so there is not much use of the headers there
  */
-struct rtp_msg_s*       rtp_msg_new ( rtp_session_t* _session, const uint8_t* _data, uint32_t _length );
+struct rtp_msg_s       *rtp_msg_new ( rtp_session_t *_session, const uint8_t *_data, uint32_t _length );
 
 
 /* Convenient functions for creating a header */
-struct rtp_header_s*    rtp_build_header ( rtp_session_t* _session );
+struct rtp_header_s    *rtp_build_header ( rtp_session_t *_session );
 
 /* Functions handling session control */
 
@@ -163,26 +163,26 @@ struct rtp_header_s*    rtp_build_header ( rtp_session_t* _session );
 /* Session initiation and termination.
  * Set _multi_session to -1 if not using multiple sessions
  */
-rtp_session_t*          rtp_init_session ( int _max_users, int _multi_session );
-int                     rtp_terminate_session ( rtp_session_t* _session );
+rtp_session_t          *rtp_init_session ( int _max_users, int _multi_session );
+int                     rtp_terminate_session ( rtp_session_t *_session );
 
 /* Adding receiver */
-int                     rtp_add_receiver ( rtp_session_t* _session, tox_IP_Port* _dest );
+int                     rtp_add_receiver ( rtp_session_t *_session, tox_IP_Port *_dest );
 
 /* Convenient functions for marking the resolution */
-int                     rtp_add_resolution_marking ( rtp_session_t* _session, uint16_t _width, uint16_t _height );
-int                     rtp_remove_resolution_marking ( rtp_session_t* _session );
-uint16_t                rtp_get_resolution_marking_height ( struct rtp_ext_header_s* _header, uint32_t _position );
-uint16_t                rtp_get_resolution_marking_width ( struct rtp_ext_header_s* _header, uint32_t _position );
-
-int                     rtp_add_framerate_marking ( rtp_session_t* _session, uint32_t _value );
-int                     rtp_remove_framerate_marking ( rtp_session_t* _session );
-uint32_t                rtp_get_framerate_marking ( struct rtp_ext_header_s* _header );
+int                     rtp_add_resolution_marking ( rtp_session_t *_session, uint16_t _width, uint16_t _height );
+int                     rtp_remove_resolution_marking ( rtp_session_t *_session );
+uint16_t                rtp_get_resolution_marking_height ( struct rtp_ext_header_s *_header, uint32_t _position );
+uint16_t                rtp_get_resolution_marking_width ( struct rtp_ext_header_s *_header, uint32_t _position );
+
+int                     rtp_add_framerate_marking ( rtp_session_t *_session, uint32_t _value );
+int                     rtp_remove_framerate_marking ( rtp_session_t *_session );
+uint32_t                rtp_get_framerate_marking ( struct rtp_ext_header_s *_header );
 /* Convenient functions for marking the payload */
-void                    rtp_set_payload_type ( rtp_session_t* _session, uint8_t _payload_value );
-uint32_t                rtp_get_payload_type ( rtp_session_t* _session );
+void                    rtp_set_payload_type ( rtp_session_t *_session, uint8_t _payload_value );
+uint32_t                rtp_get_payload_type ( rtp_session_t *_session );
 
 /* When using RTP in core be sure to set prefix when sending via rtp_send_msg */
-int                     rtp_set_prefix ( rtp_session_t* _session, uint8_t* _prefix, uint16_t _prefix_length );
+int                     rtp_set_prefix ( rtp_session_t *_session, uint8_t *_prefix, uint16_t _prefix_length );
 
 #endif /* _RTP__IMPL_H_ */
diff --git a/toxrtp/toxrtp_helper.c b/toxrtp/toxrtp_helper.c
index bb2dc56b..6f952359 100644
--- a/toxrtp/toxrtp_helper.c
+++ b/toxrtp/toxrtp_helper.c
@@ -31,7 +31,6 @@
 #include "toxrtp_helper.h"
 #include "../toxcore/network.h"
 
-#include <arpa/inet.h> /* Fixes implicit function warning. */
 #include <assert.h>
 
 #ifdef WIN
@@ -41,11 +40,11 @@
 
 static int _seed = 0; /* Not initiated */
 
-int t_setipport ( const char* _ip, unsigned short _port, void* _dest )
+int t_setipport ( const char *_ip, unsigned short _port, void *_dest )
 {
     assert(_dest);
 
-    IP_Port* _dest_c = ( IP_Port* ) _dest;
+    IP_Port *_dest_c = ( IP_Port * ) _dest;
     ip_init(&_dest_c->ip, 0);
 
     IP_Port _ipv6_garbage;
@@ -72,7 +71,7 @@ uint32_t t_random ( uint32_t _max )
     }
 }
 
-void t_memcpy ( uint8_t* _dest, const uint8_t* _source, size_t _size )
+void t_memcpy ( uint8_t *_dest, const uint8_t *_source, size_t _size )
 {
     /*
      * Using countdown to zero method
@@ -87,7 +86,7 @@ void t_memcpy ( uint8_t* _dest, const uint8_t* _source, size_t _size )
 
 }
 
-uint8_t* t_memset ( uint8_t* _dest, uint8_t _valu, size_t _size )
+uint8_t *t_memset ( uint8_t *_dest, uint8_t _valu, size_t _size )
 {
     /*
      * Again using countdown to zero method
@@ -102,9 +101,9 @@ uint8_t* t_memset ( uint8_t* _dest, uint8_t _valu, size_t _size )
     return _dest;
 }
 
-size_t t_memlen ( const uint8_t* _valu)
+size_t t_memlen ( const uint8_t *_valu)
 {
-    const uint8_t* _it;
+    const uint8_t *_it;
     size_t _retu = 0;
 
     for ( _it = _valu; *_it; ++_it ) ++_retu;
@@ -112,13 +111,13 @@ size_t t_memlen ( const uint8_t* _valu)
     return _retu;
 }
 
-uint8_t* t_strallcpy ( const uint8_t* _source ) /* string alloc and copy */
+uint8_t *t_strallcpy ( const uint8_t *_source ) /* string alloc and copy */
 {
     assert(_source);
 
     size_t _length = t_memlen(_source) + 1; /* make space for null character */
 
-    uint8_t* _dest = calloc( sizeof ( uint8_t ), _length );
+    uint8_t *_dest = calloc( sizeof ( uint8_t ), _length );
     assert(_dest);
 
     t_memcpy(_dest, _source, _length);
@@ -126,75 +125,75 @@ uint8_t* t_strallcpy ( const uint8_t* _source ) /* string alloc and copy */
     return _dest;
 }
 
-size_t t_strfind ( const uint8_t* _str, const uint8_t* _substr )
+size_t t_strfind ( const uint8_t *_str, const uint8_t *_substr )
 {
     size_t _pos = 0;
     size_t _it, _delit = 0;
 
-    for ( _it = 0; _str[_it] != '\0'; _it++ ){
-        if ( _str[_it] == _substr[_delit] ){
+    for ( _it = 0; _str[_it] != '\0'; _it++ ) {
+        if ( _str[_it] == _substr[_delit] ) {
             _pos = _it;
-            while ( _str[_it] == _substr[_delit] && _str[_it] != '\0' ){
+
+            while ( _str[_it] == _substr[_delit] && _str[_it] != '\0' ) {
                 _it ++;
                 _delit++;
 
-                if ( _substr[_delit] == '\0' ){
+                if ( _substr[_delit] == '\0' ) {
                     return _pos;
                 }
             }
+
             _delit = 0;
             _pos = 0;
         }
     }
+
     return _pos;
 }
 
 #ifdef WIN
 #if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)
-  #define DELTA_EPOCH_IN_MICROSECS  11644473600000000Ui64
+#define DELTA_EPOCH_IN_MICROSECS  11644473600000000Ui64
 #else
-  #define DELTA_EPOCH_IN_MICROSECS  11644473600000000ULL
+#define DELTA_EPOCH_IN_MICROSECS  11644473600000000ULL
 #endif
 
-struct timezone
-{
-  int  tz_minuteswest; /* minutes W of Greenwich */
-  int  tz_dsttime;     /* type of dst correction */
+struct timezone {
+    int  tz_minuteswest; /* minutes W of Greenwich */
+    int  tz_dsttime;     /* type of dst correction */
 };
 
 int gettimeofday(struct timeval *tv, struct timezone *tz)
 {
-  FILETIME ft;
-  unsigned __int64 tmpres = 0;
-  static int tzflag;
-
-  if (NULL != tv)
-  {
-    GetSystemTimeAsFileTime(&ft);
-
-    tmpres |= ft.dwHighDateTime;
-    tmpres <<= 32;
-    tmpres |= ft.dwLowDateTime;
-
-    /*converting file time to unix epoch*/
-    tmpres -= DELTA_EPOCH_IN_MICROSECS;
-    tmpres /= 10;  /*convert into microseconds*/
-    tv->tv_sec = (long)(tmpres / 1000000UL);
-    tv->tv_usec = (long)(tmpres % 1000000UL);
-  }
-
-  if (NULL != tz)
-  {
-    if (!tzflag)
-    {
-      _tzset();
-      tzflag++;
+    FILETIME ft;
+    unsigned __int64 tmpres = 0;
+    static int tzflag;
+
+    if (NULL != tv) {
+        GetSystemTimeAsFileTime(&ft);
+
+        tmpres |= ft.dwHighDateTime;
+        tmpres <<= 32;
+        tmpres |= ft.dwLowDateTime;
+
+        /*converting file time to unix epoch*/
+        tmpres -= DELTA_EPOCH_IN_MICROSECS;
+        tmpres /= 10;  /*convert into microseconds*/
+        tv->tv_sec = (long)(tmpres / 1000000UL);
+        tv->tv_usec = (long)(tmpres % 1000000UL);
+    }
+
+    if (NULL != tz) {
+        if (!tzflag) {
+            _tzset();
+            tzflag++;
+        }
+
+        tz->tz_minuteswest = _timezone / 60;
+        tz->tz_dsttime = _daylight;
     }
-    tz->tz_minuteswest = _timezone / 60;
-    tz->tz_dsttime = _daylight;
-  }
 
-  return 0;
+    return 0;
 }
 #endif /* WIN */