Updating toxcore to 0.2.1

Antidote-for-Tox · Mar 12, 2018 · 24b8400 · 24b8400
1 parent 6a0ae9c
commit 24b8400
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/toxcore-git b/toxcore-git
diff --git a/toxcore.podspec b/toxcore.podspec
@@ -9,7 +9,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "toxcore"
-  s.version          = "0.2.0"
+  s.version          = "0.2.1"
   s.summary          = "Cocoapods wrapper for toxcore"
   s.homepage         = "https://github.com/Antidote-for-Tox/toxcore"
   s.license          = 'GPLv3'

diff --git a/toxcore/toxav/rtp.m b/toxcore/toxav/rtp.m
@@ -467,7 +467,8 @@ static int handle_rtp_packet(Messenger *m, uint32_t friendnumber, const uint8_t
         return -1;
     }
 
-    if (header.offset_full >= header.data_length_full) {
+    if (header.offset_full >= header.data_length_full
+            && (header.offset_full != 0 || header.data_length_full != 0)) {
         LOGGER_ERROR(m->log, "Invalid video packet: frame offset (%u) >= full frame length (%u)",
                      (unsigned)header.offset_full, (unsigned)header.data_length_full);
         return -1;
@@ -769,7 +770,9 @@ int rtp_send_data(RTPSession *session, const uint8_t *data, uint32_t length,
     // here the highest bits gets stripped anyway, no need to do keyframe bit magic here!
     header.data_length_lower = length;
 
-    header.flags = RTP_LARGE_FRAME;
+    if (session->payload_type == rtp_TypeVideo) {
+        header.flags = RTP_LARGE_FRAME;
+    }
 
     uint16_t length_safe = (uint16_t)length;
 

diff --git a/toxcore/toxcore/Messenger.m b/toxcore/toxcore/Messenger.m
@@ -1618,7 +1618,7 @@ static void do_reqchunk_filecb(Messenger *m, int32_t friendnumber, void *userdat
     //
     // TODO(zoff99): Fix this to exit the loop properly when we're done
     // requesting all chunks for all file transfers.
-    const uint32_t MAX_FT_LOOPS = 4;
+    const uint32_t MAX_FT_LOOPS = 16;
 
     while (((free_slots > 0) || loop_counter == 0) && any_active_fts && (loop_counter < MAX_FT_LOOPS)) {
         any_active_fts = do_all_filetransfers(m, friendnumber, userdata, &free_slots);

diff --git a/toxcore/toxcore/tox.h b/toxcore/toxcore/tox.h
@@ -180,7 +180,7 @@ uint32_t tox_version_minor(void);
  * The patch or revision number. Incremented when bugfixes are applied without
  * changing any functionality or API or ABI.
  */
-#define TOX_VERSION_PATCH              0
+#define TOX_VERSION_PATCH              1
 
 uint32_t tox_version_patch(void);
 

diff --git a/toxcore/toxcore/tox_api.m b/toxcore/toxcore/tox_api.m
@@ -19,6 +19,7 @@
 CONST_FUNCTION(version_patch, VERSION_PATCH)
 CONST_FUNCTION(public_key_size, PUBLIC_KEY_SIZE)
 CONST_FUNCTION(secret_key_size, SECRET_KEY_SIZE)
+CONST_FUNCTION(nospam_size, NOSPAM_SIZE)
 CONST_FUNCTION(address_size, ADDRESS_SIZE)
 CONST_FUNCTION(max_name_length, MAX_NAME_LENGTH)
 CONST_FUNCTION(max_status_message_length, MAX_STATUS_MESSAGE_LENGTH)
+13 −1		CHANGELOG.md
+1 −1		CMakeLists.txt
+25 −31		auto_tests/file_transfer_test.c
+1 −1		configure.ac
+2 −2		so.version
+5 −2		toxav/rtp.c
+1 −1		toxcore/Messenger.c
+1 −1		toxcore/tox.api.h
+1 −1		toxcore/tox.h
+1 −0		toxcore/tox_api.c