Merge upstream and other stuff

6 files changed, 44 insertions, 41 deletions

diff --git a/toxav/Makefile.inc b/toxav/Makefile.inc
index 060a760c..2d48d210 100644
--- a/toxav/Makefile.inc
+++ b/toxav/Makefile.inc
@@ -18,15 +18,18 @@ libtoxav_la_SOURCES = ../toxav/event.h \
 
 libtoxav_la_CFLAGS = -I../toxcore \
                      -I../toxav \
+                     $(LIBSODIUM_CFLAGS) \
                      $(NACL_CFLAGS) \
                      $(AV_CFLAGS) \
                      $(PTHREAD_CFLAGS)
 
 libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \
+                      $(LIBSODIUM_LDFLAGS) \
                       $(NACL_LDFLAGS) \
                       $(EXTRA_LT_LDFLAGS)
 
 libtoxav_la_LIBADD =  libtoxcore.la \
+                      $(LIBSODIUM_LIBS) \
                       $(NACL_LIBS) \
                       $(PTHREAD_LIBS) \
                       $(AV_LIBS)
diff --git a/toxav/event.c b/toxav/event.c
index ffda35ec..35af98bb 100644
--- a/toxav/event.c
+++ b/toxav/event.c
@@ -27,6 +27,7 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <stdlib.h>
+#include "../toxcore/network.h" /* current_time_monotonic() */
 #include "event.h"
 
 #define _GNU_SOURCE
@@ -199,7 +200,7 @@ void *event_poll( void *arg )
 
         if ( _event_handler->timed_events ) {
 
-            uint32_t _time = ((uint32_t)(current_time() / 1000));
+            uint32_t _time = ((uint32_t)current_time_monotonic());
 
             if ( _event_handler->timed_events[0].timeout < _time ) {
 
@@ -249,7 +250,7 @@ int throw_timer_event ( void * (func)(void *), void *arg, unsigned timeout)
 
     size_t _counter = event_handler.timed_events_count;
 
-    event_handler.timed_events[_counter - 1].timeout = timeout + ((uint32_t)(current_time() / 1000));
+    event_handler.timed_events[_counter - 1].timeout = timeout + ((uint32_t)current_time_monotonic());
     event_handler.timed_events[_counter - 1].id = _unique_id;
     ++_unique_id;
 
@@ -330,7 +331,7 @@ int reset_timer_event ( int id, uint32_t timeout )
     /* Find it and change */
     for ( ; _i; _i-- ) {
         if ( _it->id == id ) {
-            _it->timeout = timeout + ((uint32_t)(current_time() / 1000));
+            _it->timeout = timeout + ((uint32_t)current_time_monotonic());
             break;
         }
 
diff --git a/toxav/media.h b/toxav/media.h
index a1193aae..8dc495ed 100644
--- a/toxav/media.h
+++ b/toxav/media.h
@@ -36,7 +36,7 @@
 #define VIDEO_CODEC_ENCODER_INTERFACE (vpx_codec_vp8_cx())
 
 /* Audio encoding/decoding */
-#include <opus/opus.h>
+#include <opus.h>
 
 typedef enum _Capabilities
 {
diff --git a/toxav/msi.c b/toxav/msi.c
index c2d50302..aab13471 100755
--- a/toxav/msi.c
+++ b/toxav/msi.c
@@ -28,8 +28,6 @@
 
 #include "../toxcore/logger.h"
 
-/*#define _BSD_SOURCE*/
-
 #include "msi.h"
 #include "event.h"
 
@@ -219,7 +217,7 @@ static inline__ const uint8_t *stringify_response ( MSIResponse response )
  * @param msg Container.
  * @param data The data.
  * @return int
- * @retval -1 Error occured.
+ * @retval -1 Error occurred.
  * @retval 0 Success.
  */
 int parse_raw_data ( MSIMessage *msg, const uint8_t *data, uint16_t length )
@@ -354,7 +352,7 @@ void free_message ( MSIMessage *msg )
  * @param type Request or response.
  * @param type_id Type of request/response.
  * @return MSIMessage* Created message.
- * @retval NULL Error occured.
+ * @retval NULL Error occurred.
  */
 MSIMessage *msi_new_message ( uint8_t type, const uint8_t *type_id )
 {
@@ -387,7 +385,7 @@ MSIMessage *msi_new_message ( uint8_t type, const uint8_t *type_id )
  *
  * @param data The data.
  * @return MSIMessage* Parsed message.
- * @retval NULL Error occured.
+ * @retval NULL Error occurred.
  */
 MSIMessage *parse_message ( const uint8_t *data, uint16_t length )
 {
@@ -495,7 +493,7 @@ uint8_t *append_header_to_string (
 
     *dest = field_byte; /* Set the first byte */
 
-    uint8_t *_getback_byte = dest + 1; /* remeber the byte we were on */
+    uint8_t *_getback_byte = dest + 1; /* remember the byte we were on */
     dest += 3; /* swith to 4th byte where field value starts */
 
     /* Now set the field value and calculate it's length */
@@ -685,7 +683,7 @@ static inline__ const uint8_t *stringify_error_code ( MSICallError error_code )
  * @param msg The message.
  * @param to Where to.
  * @return int
- * @retval -1 Error occured.
+ * @retval -1 Error occurred.
  * @retval 0 Success.
  */
 int send_message ( MSISession *session, MSICall* call, MSIMessage *msg, uint32_t to )
@@ -838,7 +836,7 @@ int handle_error ( MSISession *session, MSICall* call, MSICallError errid, uint3
  * @param msg The message.
  * @return int
  * @retval -1 No error.
- * @retval 0 Error occured and response sent.
+ * @retval 0 Error occurred and response sent.
  */
 int has_call_error ( MSISession *session, MSICall* call, MSIMessage *msg )
 {
@@ -951,7 +949,7 @@ MSICall *init_call ( MSISession *session, int peers, int ringing_timeout )
  *
  * @param session Control session.
  * @return int
- * @retval -1 Error occured.
+ * @retval -1 Error occurred.
  * @retval 0 Success.
  */
 int terminate_call ( MSISession *session, MSICall *call )
@@ -1031,7 +1029,7 @@ int handle_recv_invite ( MSISession *session, MSICall* call, MSIMessage *msg )
              * B calls A. Who has advantage is set bey calculating
              * 'bigger' Call id and then that call id is being used in
              * future. User with 'bigger' Call id has the advantage
-             * as in he will wait the reponse from the other.
+             * as in he will wait the response from the other.
              */
             
             if ( call_id_bigger (call->id, msg->callid.header_value) == 1 ) { /* Peer has advantage */
@@ -1408,7 +1406,7 @@ void msi_register_callback ( MSICallback callback, MSICallbackID id, void* userd
  * @param messenger Tox* object.
  * @param max_calls Amount of calls possible
  * @return MSISession* The created session.
- * @retval NULL Error occured.
+ * @retval NULL Error occurred.
  */
 MSISession *msi_init_session ( Messenger* messenger, int32_t max_calls )
 {
@@ -1530,7 +1528,7 @@ int msi_invite ( MSISession* session, int32_t* call_index, MSICallType call_type
  * @param session Control session.
  * @param call_id To which call is this action handled.
  * @return int
- * @retval -1 Error occured.
+ * @retval -1 Error occurred.
  * @retval 0 Success.
  */
 int msi_hangup ( MSISession* session, int32_t call_index )
diff --git a/toxav/msi.h b/toxav/msi.h
index 2a7c5ba8..e9e1b4d7 100755
--- a/toxav/msi.h
+++ b/toxav/msi.h
@@ -84,7 +84,7 @@ typedef struct _MSICall {                  /* Call info structure */
     int                 ringing_timer_id;  /* Timer id for ringing timeout */
 
     pthread_mutex_t     mutex;             /* It's to be assumed that call will have
-                                            * seperate thread so add mutex
+                                            * separate thread so add mutex
                                             */
     uint32_t            *peers;
     uint16_t            peer_count;
@@ -156,7 +156,7 @@ void msi_register_callback(MSICallback callback, MSICallbackID id, void* userdat
  * @param messenger Tox* object.
  * @param max_calls Amount of calls possible
  * @return MSISession* The created session.
- * @retval NULL Error occured.
+ * @retval NULL Error occurred.
  */
 MSISession *msi_init_session ( Messenger *messenger, int32_t max_calls );
 
@@ -189,7 +189,7 @@ int msi_invite ( MSISession *session, int32_t* call_index, MSICallType call_type
  * @param session Control session.
  * @param call_index To which call is this action handled.
  * @return int
- * @retval -1 Error occured.
+ * @retval -1 Error occurred.
  * @retval 0 Success.
  */
 int msi_hangup ( MSISession *session, int32_t call_index );
diff --git a/toxav/rtp.c b/toxav/rtp.c
index 8b2768f1..cdaabd3a 100755
--- a/toxav/rtp.c
+++ b/toxav/rtp.c
@@ -170,8 +170,8 @@ inline__ void increase_nonce(uint8_t *nonce, uint16_t target)
     uint16_t _nonce_counter;
 
     uint8_t _reverse_bytes[2];
-    _reverse_bytes[0] = nonce[crypto_secretbox_NONCEBYTES - 1];
-    _reverse_bytes[1] = nonce[crypto_secretbox_NONCEBYTES - 2];
+    _reverse_bytes[0] = nonce[crypto_box_NONCEBYTES - 1];
+    _reverse_bytes[1] = nonce[crypto_box_NONCEBYTES - 2];
 
     bytes_to_U16(&_nonce_counter, _reverse_bytes );
 
@@ -179,8 +179,8 @@ inline__ void increase_nonce(uint8_t *nonce, uint16_t target)
     if (_nonce_counter > UINT16_MAX - target ) { /* 2 bytes are not long enough */
         uint8_t _it = 3;
 
-        while ( _it <= crypto_secretbox_NONCEBYTES ) _it += ++nonce[crypto_secretbox_NONCEBYTES - _it] ?
-                    crypto_secretbox_NONCEBYTES : 1;
+        while ( _it <= crypto_box_NONCEBYTES ) _it += ++nonce[crypto_box_NONCEBYTES - _it] ?
+                    crypto_box_NONCEBYTES : 1;
 
         _nonce_counter = _nonce_counter - (UINT16_MAX - target ); /* Assign the rest of it */
     } else { /* Increase nonce */
@@ -191,8 +191,8 @@ inline__ void increase_nonce(uint8_t *nonce, uint16_t target)
     /* Assign the last bytes */
 
     U16_to_bytes( _reverse_bytes, _nonce_counter);
-    nonce [crypto_secretbox_NONCEBYTES - 1] = _reverse_bytes[0];
-    nonce [crypto_secretbox_NONCEBYTES - 2] = _reverse_bytes[1];
+    nonce [crypto_box_NONCEBYTES - 1] = _reverse_bytes[0];
+    nonce [crypto_box_NONCEBYTES - 2] = _reverse_bytes[1];
 
 }
 
@@ -416,7 +416,7 @@ RTPHeader *build_header ( RTPSession *session )
     ADD_SETTING_PAYLOAD ( _retu, session->payload_type );
 
     _retu->sequnum = session->sequnum;
-    _retu->timestamp = ((uint32_t)(current_time() / 1000)); /* micro to milli */
+    _retu->timestamp = current_time_monotonic(); /* milliseconds */
     _retu->ssrc = session->ssrc;
 
     int i;
@@ -505,7 +505,7 @@ int rtp_handle_packet ( void *object, IP_Port ip_port, uint8_t *data, uint32_t l
     RTPSession *_session = object;
     RTPMessage *_msg;
     
-    if ( !_session || length < 13 + crypto_secretbox_MACBYTES) { /* 12 is the minimum length for rtp + desc. byte */
+    if ( !_session || length < 13 + crypto_box_MACBYTES) { /* 12 is the minimum length for rtp + desc. byte */
         LOGGER_WARNING("No session or invalid length of received buffer!");
         return -1;
     }
@@ -521,12 +521,13 @@ int rtp_handle_packet ( void *object, IP_Port ip_port, uint8_t *data, uint32_t l
     bytes_to_U16(&_sequnum, data + 1);
 
     /* Clculate the right nonce */
-    uint8_t _calculated[crypto_secretbox_NONCEBYTES];
-    memcpy(_calculated, _session->decrypt_nonce, crypto_secretbox_NONCEBYTES);
+    uint8_t _calculated[crypto_box_NONCEBYTES];
+    memcpy(_calculated, _session->decrypt_nonce, crypto_box_NONCEBYTES);
     increase_nonce ( _calculated, _sequnum );
 
     /* Decrypt message */
-    int _decrypted_length = decrypt_data_symmetric((uint8_t *)_session->decrypt_key, _calculated, data + 3, length - 3, _plain );
+    int _decrypted_length = decrypt_data_symmetric(
+                                (uint8_t *)_session->decrypt_key, _calculated, data + 3, length - 3, _plain );
 
     /* This packet is either not encrypted properly or late
      */
@@ -557,8 +558,8 @@ int rtp_handle_packet ( void *object, IP_Port ip_port, uint8_t *data, uint32_t l
             }
 
             /* A new cycle setting. */
-            memcpy(_session->nonce_cycle, _session->decrypt_nonce, crypto_secretbox_NONCEBYTES);
-            memcpy(_session->decrypt_nonce, _calculated, crypto_secretbox_NONCEBYTES);
+            memcpy(_session->nonce_cycle, _session->decrypt_nonce, crypto_box_NONCEBYTES);
+            memcpy(_session->decrypt_nonce, _calculated, crypto_box_NONCEBYTES);
         }
     }
 
@@ -774,8 +775,8 @@ int rtp_send_msg ( RTPSession *session, Messenger *messenger, const uint8_t *dat
     _send_data[0] = session->prefix;
 
     /* Generate the right nonce */
-    uint8_t _calculated[crypto_secretbox_NONCEBYTES];
-    memcpy(_calculated, session->encrypt_nonce, crypto_secretbox_NONCEBYTES);
+    uint8_t _calculated[crypto_box_NONCEBYTES];
+    memcpy(_calculated, session->encrypt_nonce, crypto_box_NONCEBYTES);
     increase_nonce ( _calculated, msg->header->sequnum );
 
     /* Need to skip 2 bytes that are for sequnum */
@@ -798,7 +799,7 @@ int rtp_send_msg ( RTPSession *session, Messenger *messenger, const uint8_t *dat
     /* Set sequ number */
     if ( session->sequnum >= MAX_SEQU_NUM ) {
         session->sequnum = 0;
-        memcpy(session->encrypt_nonce, _calculated, crypto_secretbox_NONCEBYTES);
+        memcpy(session->encrypt_nonce, _calculated, crypto_box_NONCEBYTES);
     } else {
         session->sequnum++;
     }
@@ -888,16 +889,16 @@ RTPSession *rtp_init_session ( int            payload_type,
     _retu->decrypt_key = decrypt_key;
 
     /* Need to allocate new memory */
-    _retu->encrypt_nonce = calloc ( crypto_secretbox_NONCEBYTES, sizeof (uint8_t) );
+    _retu->encrypt_nonce = calloc ( crypto_box_NONCEBYTES, sizeof (uint8_t) );
     assert(_retu->encrypt_nonce);
-    _retu->decrypt_nonce = calloc ( crypto_secretbox_NONCEBYTES, sizeof (uint8_t) );
+    _retu->decrypt_nonce = calloc ( crypto_box_NONCEBYTES, sizeof (uint8_t) );
     assert(_retu->decrypt_nonce);
-    _retu->nonce_cycle   = calloc ( crypto_secretbox_NONCEBYTES, sizeof (uint8_t) );
+    _retu->nonce_cycle   = calloc ( crypto_box_NONCEBYTES, sizeof (uint8_t) );
     assert(_retu->nonce_cycle);
 
-    memcpy(_retu->encrypt_nonce, encrypt_nonce, crypto_secretbox_NONCEBYTES);
-    memcpy(_retu->decrypt_nonce, decrypt_nonce, crypto_secretbox_NONCEBYTES);
-    memcpy(_retu->nonce_cycle  , decrypt_nonce, crypto_secretbox_NONCEBYTES);
+    memcpy(_retu->encrypt_nonce, encrypt_nonce, crypto_box_NONCEBYTES);
+    memcpy(_retu->decrypt_nonce, decrypt_nonce, crypto_box_NONCEBYTES);
+    memcpy(_retu->nonce_cycle  , decrypt_nonce, crypto_box_NONCEBYTES);
 
     _retu->csrc = calloc(1, sizeof (uint32_t));
     assert(_retu->csrc);