update to libtorrent master HEAD, version 2.0.2-14 (#170)

aldenml · Mar 20, 2021 · 6ce65e1 · 6ce65e1
1 parent 8893dbc
commit 6ce65e1
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 5 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -18,12 +18,12 @@ jobs:
           submodules: recursive
       - name: install packages
         run: |
+          choco install boost-msvc-14.2
           choco install openssl
           choco install mingw
           choco install grep
       - name: cmake
         run: |
-          $env:BOOST_ROOT=$env:BOOST_ROOT_1_72_0
           cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=17 -B build -G "Visual Studio 16 2019" -A x64 swig
       - name: build
         run: cmake --build build --config Release --parallel 2

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -13,7 +13,7 @@ plugins {
 }
 
 group = "org.libtorrent4j"
-version = "2.0.2-13"
+version = "2.0.2-14"
 
 java {
     // using java 8 for android compatibility

diff --git a/changelog.txt b/changelog.txt
@@ -1,9 +1,21 @@
+2.0.2-14
 
+  * using libtorrent master
   * minimum supported Android 32 bits API >= 19
   * minimum supported Android 64 bits API >= 21
   * using android NDK r22
   * using android prebuilt toolchain
   * using android LLD linker
+  * lt:fix size_on_disk patch
+  * lt:fix torrent_info::v2 to be correct after freeing piece layers from
+    torrent_info
+  * lt:allow no-interest timeouts of peer connections before all connections
+    slots are full
+  * lt:add flag to force canonical file order and padding for v1-only torrents
+  * lt:return nullptr instead of crashing in get_storage_impl
+  * lt:fix issue where peers entering upload-mode cannot leave upload-mode
+  * lt:fix issue where a DHT message would count as an incoming connection
+  * lt:source code cleanup, performance and stability
 
 2.0.2-13
 

diff --git a/src/main/java/org/libtorrent4j/LibTorrent.java b/src/main/java/org/libtorrent4j/LibTorrent.java
@@ -43,7 +43,7 @@ public static String version() {
      * @return the git revision
      */
     public static String revision() {
-        return "76c8f3fa1ec5bcab595fe964349468a4b0f7be7f";
+        return "e026f5782477cd2348c06f1a2be3503f366118a8";
     }
 
     /**
@@ -71,7 +71,7 @@ public static String opensslVersion() {
      * @return libtorrent4j version.
      */
     public static String libtorrent4jVersion() {
-        return "2.0.2-13";
+        return "2.0.2-14";
     }
 
     /**

diff --git a/src/main/java/org/libtorrent4j/TorrentBuilder.java b/src/main/java/org/libtorrent4j/TorrentBuilder.java
@@ -542,6 +542,15 @@ public void progress(int i) {
      */
     public static final create_flags_t V1_ONLY = create_torrent.v1_only;
 
+    /**
+     * This flag only affects v1-only torrents, and is only relevant
+     * together with the v1_only_flag. This flag will force the
+     * same file order and padding as a v2 (or hybrid) torrent would have.
+     * It has the effect of ordering files and inserting pad files to align
+     * them with piece boundaries.
+     */
+    public static final create_flags_t CANONICAL_FILES = create_torrent.canonical_files;
+
     /**
      *
      */

diff --git a/src/main/java/org/libtorrent4j/swig/create_torrent.java b/src/main/java/org/libtorrent4j/swig/create_torrent.java
@@ -140,4 +140,5 @@ public void set_hash2(int file, int piece, sha256_hash h) {
   public final static create_flags_t symlinks = new create_flags_t(libtorrent_jni.create_torrent_symlinks_get(), false);
   public final static create_flags_t v2_only = new create_flags_t(libtorrent_jni.create_torrent_v2_only_get(), false);
   public final static create_flags_t v1_only = new create_flags_t(libtorrent_jni.create_torrent_v1_only_get(), false);
+  public final static create_flags_t canonical_files = new create_flags_t(libtorrent_jni.create_torrent_canonical_files_get(), false);
 }
diff --git a/src/main/java/org/libtorrent4j/swig/libtorrent_jni.java b/src/main/java/org/libtorrent4j/swig/libtorrent_jni.java
@@ -3221,6 +3221,7 @@ public class libtorrent_jni {
   public final static native long create_torrent_symlinks_get();
   public final static native long create_torrent_v2_only_get();
   public final static native long create_torrent_v1_only_get();
+  public final static native long create_torrent_canonical_files_get();
   public final static native long new_create_torrent__SWIG_0(long jarg1, file_storage jarg1_, int jarg2, long jarg3, create_flags_t jarg3_);
   public final static native long new_create_torrent__SWIG_1(long jarg1, file_storage jarg1_, int jarg2);
   public final static native long new_create_torrent__SWIG_2(long jarg1, file_storage jarg1_);

diff --git a/swig/deps/libtorrent b/swig/deps/libtorrent
diff --git a/swig/libtorrent_jni.cpp b/swig/libtorrent_jni.cpp
@@ -74702,6 +74702,18 @@ SWIGEXPORT jlong JNICALL Java_org_libtorrent4j_swig_libtorrent_1jni_create_1torr
 }
 
 
+SWIGEXPORT jlong JNICALL Java_org_libtorrent4j_swig_libtorrent_1jni_create_1torrent_1canonical_1files_1get(JNIEnv *jenv, jclass jcls) {
+  jlong jresult = 0 ;
+  libtorrent::flags::bitfield_flag< unsigned int,libtorrent::create_flags_tag > *result = 0 ;
+
+  (void)jenv;
+  (void)jcls;
+  result = (libtorrent::flags::bitfield_flag< unsigned int,libtorrent::create_flags_tag > *)&libtorrent::create_torrent::canonical_files;
+  *(libtorrent::flags::bitfield_flag< unsigned int,libtorrent::create_flags_tag > **)&jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT jlong JNICALL Java_org_libtorrent4j_swig_libtorrent_1jni_new_1create_1torrent_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jlong jarg3, jobject jarg3_) {
   jlong jresult = 0 ;
   libtorrent::file_storage *arg1 = 0 ;
+54 −2		.github/workflows/android.yml
+10 −7		.github/workflows/c.yml
+20 −12		.github/workflows/python.yml
+24 −21		.github/workflows/windows.yml
+2 −0		ChangeLog
+6 −2		Jamfile
+2 −0		bindings/python/src/create_torrent.cpp
+5 −4		examples/client_test.cpp
+5 −2		examples/torrent_view.cpp
+7 −0		include/libtorrent/create_torrent.hpp
+52 −4		simulation/fake_peer.hpp
+154 −4		simulation/test_timeout.cpp
+1 −1		src/create_torrent.cpp
+4 −1		src/file_storage.cpp
+51 −18		src/peer_connection.cpp
+4 −0		src/peer_list.cpp
+1 −4		src/session_impl.cpp
+21 −13		src/torrent.cpp
+4 −4		src/torrent_info.cpp
+1 −0		src/web_peer_connection.cpp
+2 −3		test/test_dht.cpp
+20 −0		test/test_file_storage.cpp
+7 −3		test/test_torrent_info.cpp
+0 −1		tools/gen_convenience_header.py