From 9415467dd8baa486df7b8ff85fb5bae99c5d7934 Mon Sep 17 00:00:00 2001 From: airium Date: Thu, 15 Nov 2018 01:55:49 +0800 Subject: [PATCH 1/6] Fix setting ipv6 interface --- src/session_impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/session_impl.cpp b/src/session_impl.cpp index d61c68702..978155fb8 100644 --- a/src/session_impl.cpp +++ b/src/session_impl.cpp @@ -2055,7 +2055,7 @@ retry: // used to send to the tracker std::vector ifs = enum_net_interfaces(m_io_service, ec); for (std::vector::const_iterator i = ifs.begin() - , end(ifs.end()); i != end && (want_v4 && want_v6); ++i) + , end(ifs.end()); i != end && (want_v4 || want_v6); ++i) { address const& addr = i->interface_address; if (want_v4 && addr.is_v4() && !is_local(addr) && !is_loopback(addr)) From b91c595b43be1b34cc8dabd6ce2eacdeadf74391 Mon Sep 17 00:00:00 2001 From: Eugene Shalygin Date: Wed, 14 Nov 2018 13:07:42 +0100 Subject: [PATCH 2/6] cmake: allow selecting C++ standard version during build This backports commit 8e72fad3c to the RC_1_1 branch, taking into account that C++98 is allowed for RC_1_1 with older boost versions. --- CMakeLists.txt | 54 ++------------ Makefile.am | 1 + cmake/Modules/LibtorrentMacros.cmake | 102 +++++++++++++++++++++++++++ 3 files changed, 107 insertions(+), 50 deletions(-) create mode 100644 cmake/Modules/LibtorrentMacros.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 03ad72e8a..155ceb28b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,9 +8,9 @@ project(libtorrent set (SOVERSION "9") list(APPEND CMAKE_MODULE_PATH ${libtorrent_SOURCE_DIR}/cmake/Modules) -include(FeatureSummary) include(GNUInstallDirs) include(GeneratePkgConfig) +include(LibtorrentMacros) set(sources web_connection_base @@ -165,55 +165,14 @@ set(ed25519_sources set(includes include ed25519/src) -function(list_prepend _listName _prefix) - string(REGEX REPLACE "([^;]+)" "${_prefix}\\1" _tmp_list "${${_listName}}") - set (${_listName} "${_tmp_list}" PARENT_SCOPE) -endfunction() - list_prepend(sources "src/") list_prepend(kademlia_sources "src/kademlia/") list_prepend(ed25519_sources "ed25519/src/") -function(target_optional_compile_definitions _target _scope) - set(options FEATURE) - set(oneValueArgs NAME DESCRIPTION DEFAULT) - set(multiValueArgs ENABLED DISABLED) - cmake_parse_arguments(TOCD ${options} "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - option(${TOCD_NAME} "${TOCD_DESCRIPTION}" ${TOCD_DEFAULT}) - if (${${TOCD_NAME}}) - target_compile_definitions(${_target} ${_scope} ${TOCD_ENABLED}) - else() - target_compile_definitions(${_target} ${_scope} ${TOCD_DISABLED}) - endif() - if(${TOCD_FEATURE}) - add_feature_info(${TOCD_NAME} ${TOCD_NAME} "${TOCD_DESCRIPTION}") - endif() -endfunction() - -macro(feature_option _name _description _default) - option(${_name} "${_description}" ${_default}) - add_feature_info(${_name} ${_name} "${_description}") -endmacro() - # these options control target creation and thus have to be declared before the add_library() call feature_option(BUILD_SHARED_LIBS "build libtorrent as a shared library" ON) feature_option(static_runtime "build libtorrent with static runtime" OFF) -macro(find_public_dependency _name) - find_package(${_name} ${ARGN}) - string(TOUPPER "${_name}" _name_uppercased) - if (${_name}_FOUND OR ${_name_uppercased}_FOUND) - # Dependencies to be used below for generating Config.cmake file - # We don't need the 'REQUIRED' argument there - set(_args "${_name}") - list(APPEND _args "${ARGN}") - list(REMOVE_ITEM _args "REQUIRED") - list(REMOVE_ITEM _args "") # just in case - string(REPLACE ";" " " _args "${_args}") - list(APPEND _package_dependencies "${_args}") - endif() -endmacro() - find_public_dependency(Threads REQUIRED) if(static_runtime) @@ -319,6 +278,7 @@ option(tcmalloc "link against google performance tools tcmalloc" OFF) # 1. With C++11 onward, we require Boost system component, with C++03 we need chrono and random components too # 2. When building against boost 1.66 and newer, C++11 is required. +set(minimal_required_cxx_standard 98) # For the first requirement we do: set(required_boost_components system) if (NOT cxx_std_11 IN_LIST CMAKE_CXX_COMPILE_FEATURES) @@ -331,20 +291,14 @@ target_link_libraries(torrent-rasterbar PUBLIC ${Boost_SYSTEM_LIBRARY}) # now test the second requirement: if (Boost_VERSION VERSION_GREATER_EQUAL 106600) + set(minimal_required_cxx_standard 11) if (NOT cxx_std_11 IN_LIST CMAKE_CXX_COMPILE_FEATURES) message(FATAL_ERROR "When building against boost 1.66 and newer, C++11 is required,\n" "and your compiler does not support that") endif() endif() -# selecting C++14/11 mode if available -if (cxx_std_14 IN_LIST CMAKE_CXX_COMPILE_FEATURES) - target_compile_features(torrent-rasterbar PUBLIC cxx_std_14) - message(STATUS "Building in C++14 mode") -elseif(cxx_std_11 IN_LIST CMAKE_CXX_COMPILE_FEATURES) - target_compile_features(torrent-rasterbar PUBLIC cxx_std_11) - message(STATUS "Building in C++11 mode") -endif() +select_cxx_standard(torrent-rasterbar ${minimal_required_cxx_standard}) target_link_libraries(torrent-rasterbar PUBLIC ${Boost_LIBRARIES}) diff --git a/Makefile.am b/Makefile.am index 4aa50bcf3..49c3f97e0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -123,6 +123,7 @@ EXTRA_DIST = \ README.rst \ cmake/Modules/FindLibGcrypt.cmake \ cmake/Modules/GeneratePkgConfig.cmake \ + cmake/Modules/LibtorrentMacros.cmake \ cmake/Modules/ucm_flags.cmake \ cmake/Modules/GeneratePkgConfig/generate-pkg-config.cmake.in \ cmake/Modules/GeneratePkgConfig/pkg-config.cmake.in \ diff --git a/cmake/Modules/LibtorrentMacros.cmake b/cmake/Modules/LibtorrentMacros.cmake new file mode 100644 index 000000000..6690efe67 --- /dev/null +++ b/cmake/Modules/LibtorrentMacros.cmake @@ -0,0 +1,102 @@ +# Various helper function and macros for building libtorrent + +include(FeatureSummary) + +# macro for issuing option() and add_feature_info() in a single call. +# Synopsis: +# feature_option( ) +macro(feature_option _name _description _default) + option(${_name} "${_description}" ${_default}) + add_feature_info(${_name} ${_name} "${_description}") +endmacro() + +# function to add a simple build option which controls compile definition(s) for a target. +# Synopsis: +# target_optional_compile_definitions( [FEATURE] +# NAME DESCRIPTION DEFAULT +# [ENABLED [enabled_compile_definitions...]] +# [DISABLED [disabled_compile_defnitions...]] +# ) +# NAME, DESCRIPTION and DEFAULT are passed to option() call +# if FEATURE is given, they are passed to add_feature_info() +# ENABLED lists compile definitions that will be set on when option is enabled, +# DISABLED lists definitions that will be set otherwise +function(target_optional_compile_definitions _target _scope) + set(options FEATURE) + set(oneValueArgs NAME DESCRIPTION DEFAULT) + set(multiValueArgs ENABLED DISABLED) + cmake_parse_arguments(TOCD ${options} "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + option(${TOCD_NAME} "${TOCD_DESCRIPTION}" ${TOCD_DEFAULT}) + if (${${TOCD_NAME}}) + target_compile_definitions(${_target} ${_scope} ${TOCD_ENABLED}) + else() + target_compile_definitions(${_target} ${_scope} ${TOCD_DISABLED}) + endif() + if(${TOCD_FEATURE}) + add_feature_info(${TOCD_NAME} ${TOCD_NAME} "${TOCD_DESCRIPTION}") + endif() +endfunction() + +# a helper macro that calls find_package() and appends the package (if found) to the +# _package_dependencies list, which can be used later to generate package config file +macro(find_public_dependency _name) + find_package(${_name} ${ARGN}) + string(TOUPPER "${_name}" _name_uppercased) + if (${_name}_FOUND OR ${_name_uppercased}_FOUND) + # Dependencies to be used below for generating Config.cmake file + # We don't need the 'REQUIRED' argument there + set(_args "${_name}") + list(APPEND _args "${ARGN}") + list(REMOVE_ITEM _args "REQUIRED") + list(REMOVE_ITEM _args "") # just in case + string(REPLACE ";" " " _args "${_args}") + list(APPEND _package_dependencies "${_args}") + endif() +endmacro() + +function(_cxx_standard_to_year _yearVar _std) + if (${_std} GREATER 97) + math(EXPR _year "1900 + ${_std}") + else() + math(EXPR _year "2000 + ${_std}") + endif() + set(${_yearVar} ${_year} PARENT_SCOPE) +endfunction() + +function(select_cxx_standard _target _minimal_supported_version) + message(STATUS "Compiler default is C++${CMAKE_CXX_STANDARD_DEFAULT}") + # make the CXX_STANDARD property public to ensure it makes it into the pkg-config file + get_target_property(_std ${_target} CXX_STANDARD) + # RC_1_1 still supports C++98, which is lower version than C++11. Thus we convert std + # version to year value and compare years + _cxx_standard_to_year(minimal_supported_version_year ${_minimal_supported_version}) + # if it is unset, select the default if it is sufficient or the ${_minimal_supported_version} + if (NOT ${_std}) + _cxx_standard_to_year(std_default_year ${CMAKE_CXX_STANDARD_DEFAULT}) + if (${std_default_year} GREATER_EQUAL ${minimal_supported_version_year}) + set(_std ${CMAKE_CXX_STANDARD_DEFAULT}) + else() + set(_std ${_minimal_supported_version}) + endif() + else() + _cxx_standard_to_year(std_year ${_std}) + if (${std_year} LESS ${minimal_supported_version_year}) + message(SEND_ERROR "Sorry, C++${_std} is not supported by libtorrent with the given Boost version") + message(FATAL_ERROR "The minimal supported C++ standard version is C++${_minimal_supported_version}") + endif() + endif() + + if (cxx_std_${_std} IN_LIST CMAKE_CXX_COMPILE_FEATURES) + # force this standard + target_compile_features(${_target} PUBLIC cxx_std_${_std}) + else() + message(FATAL_ERROR "Requested C++ standard version (${_std}) is not supported by the compiler") + endif() + + message(STATUS "Building in C++${_std} mode") +endfunction() + +function(list_prepend _listName _prefix) + string(REGEX REPLACE "([^;]+)" "${_prefix}\\1" _tmp_list "${${_listName}}") + set (${_listName} "${_tmp_list}" PARENT_SCOPE) +endfunction() From 48980896d5a1b42235b6804c57b60c836b28123d Mon Sep 17 00:00:00 2001 From: arvidn Date: Tue, 13 Nov 2018 11:00:18 +0100 Subject: [PATCH 3/6] exit natpmp::on_reply earlier if we're shutting down --- src/natpmp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/natpmp.cpp b/src/natpmp.cpp index ce5172eb0..4634f2e91 100644 --- a/src/natpmp.cpp +++ b/src/natpmp.cpp @@ -430,6 +430,8 @@ void natpmp::on_reply(error_code const& e return; } + if (m_abort) return; + #if defined TORRENT_ASIO_DEBUGGING add_outstanding_async("natpmp::on_reply"); #endif @@ -582,8 +584,6 @@ void natpmp::on_reply(error_code const& e l.lock(); } - if (m_abort) return; - m_currently_mapping = -1; m->action = mapping_t::action_none; m_send_timer.cancel(ec); From 6381b35891f7fce1c71a798eaae4eb3172f569f4 Mon Sep 17 00:00:00 2001 From: arvidn Date: Thu, 8 Nov 2018 10:20:28 +0100 Subject: [PATCH 4/6] bump verson to 1.1.11.0 --- CMakeLists.txt | 2 +- ChangeLog | 2 ++ Jamfile | 2 +- bindings/python/setup.py | 2 +- configure.ac | 2 +- docs/building.rst | 2 +- docs/contributing.rst | 2 +- docs/dht_rss.rst | 2 +- docs/dht_sec.rst | 2 +- docs/dht_store.rst | 2 +- docs/examples.rst | 2 +- docs/features.rst | 2 +- docs/gen_reference_doc.py | 2 +- docs/hacking.rst | 2 +- docs/index.rst | 2 +- docs/manual.rst | 2 +- docs/troubleshooting.rst | 2 +- docs/tuning.rst | 2 +- docs/tutorial.rst | 2 +- docs/utp.rst | 2 +- include/libtorrent/version.hpp | 6 +++--- src/settings_pack.cpp | 2 +- tools/set_version.py | 2 ++ 23 files changed, 27 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 155ceb28b..b5dca7068 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10.0 FATAL_ERROR) project(libtorrent DESCRIPTION "Bittorrent library" - VERSION 1.1.10 + VERSION 1.1.11 ) set (SOVERSION "9") diff --git a/ChangeLog b/ChangeLog index 970cdba5d..e903bdcc1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +1.1.11 release + * fix move_storage with save_path with a trailing slash * fix tracker announce issue, advertising port 0 in secondary IPv6 announce * fix missing boost/noncopyable.hpp includes diff --git a/Jamfile b/Jamfile index d8e3dbbad..fb8c6fa0a 100644 --- a/Jamfile +++ b/Jamfile @@ -57,7 +57,7 @@ else : : $(boost-include-path) ; } -VERSION = 1.1.10 ; +VERSION = 1.1.11 ; rule linking ( properties * ) { diff --git a/bindings/python/setup.py b/bindings/python/setup.py index 1b4ed877d..4fc74071a 100644 --- a/bindings/python/setup.py +++ b/bindings/python/setup.py @@ -154,7 +154,7 @@ else: libraries = ['torrent-rasterbar'] + flags.libraries)] setup(name = 'python-libtorrent', - version = '1.1.10', + version = '1.1.11', author = 'Arvid Norberg', author_email = 'arvid@libtorrent.org', description = 'Python bindings for libtorrent-rasterbar', diff --git a/configure.ac b/configure.ac index 5bdf5b9ec..c38bd54d9 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_PREREQ([2.63]) -AC_INIT([libtorrent-rasterbar],[1.1.10],[arvid@libtorrent.org], +AC_INIT([libtorrent-rasterbar],[1.1.11],[arvid@libtorrent.org], [libtorrent-rasterbar],[http://www.libtorrent.org]) AC_CONFIG_SRCDIR([src/torrent.cpp]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/docs/building.rst b/docs/building.rst index ed200572c..c07ab2261 100644 --- a/docs/building.rst +++ b/docs/building.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. contents:: Table of contents :depth: 2 diff --git a/docs/contributing.rst b/docs/contributing.rst index f0c2a48ca..1d38ebc5b 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. contents:: Table of contents :depth: 2 diff --git a/docs/dht_rss.rst b/docs/dht_rss.rst index c7d2650eb..3538cffdd 100644 --- a/docs/dht_rss.rst +++ b/docs/dht_rss.rst @@ -3,7 +3,7 @@ BitTorrent extension for DHT RSS feeds ====================================== :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. contents:: Table of contents :depth: 2 diff --git a/docs/dht_sec.rst b/docs/dht_sec.rst index 655864c4f..328bf9901 100644 --- a/docs/dht_sec.rst +++ b/docs/dht_sec.rst @@ -3,7 +3,7 @@ BitTorrent DHT security extension ================================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. contents:: Table of contents :depth: 2 diff --git a/docs/dht_store.rst b/docs/dht_store.rst index 61ae47bb0..8ffe82139 100644 --- a/docs/dht_store.rst +++ b/docs/dht_store.rst @@ -3,7 +3,7 @@ BitTorrent extension for arbitrary DHT store ============================================ :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. contents:: Table of contents :depth: 2 diff --git a/docs/examples.rst b/docs/examples.rst index 5020d7a66..164873541 100644 --- a/docs/examples.rst +++ b/docs/examples.rst @@ -3,7 +3,7 @@ libtorrent Examples =================== :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. contents:: Table of contents :depth: 2 diff --git a/docs/features.rst b/docs/features.rst index 9bf93bada..54e977af4 100644 --- a/docs/features.rst +++ b/docs/features.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. contents:: Table of contents :depth: 2 diff --git a/docs/gen_reference_doc.py b/docs/gen_reference_doc.py index ee8ea3421..a9db0adb3 100644 --- a/docs/gen_reference_doc.py +++ b/docs/gen_reference_doc.py @@ -1050,7 +1050,7 @@ for cat in categories: out.write(''' :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 `home`__ diff --git a/docs/hacking.rst b/docs/hacking.rst index 8e1409c29..a5905b894 100644 --- a/docs/hacking.rst +++ b/docs/hacking.rst @@ -3,7 +3,7 @@ libtorrent hacking ================== :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. contents:: Table of contents :depth: 2 diff --git a/docs/index.rst b/docs/index.rst index 13bed40ca..231ebfb91 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,5 +1,5 @@ :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. raw:: html diff --git a/docs/manual.rst b/docs/manual.rst index d4f2fb411..8503a5312 100644 --- a/docs/manual.rst +++ b/docs/manual.rst @@ -3,7 +3,7 @@ libtorrent API Documentation ============================ :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. contents:: Table of contents :depth: 1 diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst index c40798105..ecfdad311 100644 --- a/docs/troubleshooting.rst +++ b/docs/troubleshooting.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. contents:: Table of contents :depth: 2 diff --git a/docs/tuning.rst b/docs/tuning.rst index 58108f604..df8dc0ac8 100644 --- a/docs/tuning.rst +++ b/docs/tuning.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. contents:: Table of contents :depth: 2 diff --git a/docs/tutorial.rst b/docs/tutorial.rst index 13849800d..532eb15b9 100644 --- a/docs/tutorial.rst +++ b/docs/tutorial.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. contents:: Table of contents :depth: 2 diff --git a/docs/utp.rst b/docs/utp.rst index 1901c73f8..718f7faad 100644 --- a/docs/utp.rst +++ b/docs/utp.rst @@ -3,7 +3,7 @@ libtorrent manual ================= :Author: Arvid Norberg, arvid@libtorrent.org -:Version: 1.1.10 +:Version: 1.1.11 .. contents:: Table of contents :depth: 2 diff --git a/include/libtorrent/version.hpp b/include/libtorrent/version.hpp index f174c9e4e..b2554ef6a 100644 --- a/include/libtorrent/version.hpp +++ b/include/libtorrent/version.hpp @@ -37,14 +37,14 @@ POSSIBILITY OF SUCH DAMAGE. #define LIBTORRENT_VERSION_MAJOR 1 #define LIBTORRENT_VERSION_MINOR 1 -#define LIBTORRENT_VERSION_TINY 10 +#define LIBTORRENT_VERSION_TINY 11 // the format of this version is: MMmmtt // M = Major version, m = minor version, t = tiny version #define LIBTORRENT_VERSION_NUM ((LIBTORRENT_VERSION_MAJOR * 10000) + (LIBTORRENT_VERSION_MINOR * 100) + LIBTORRENT_VERSION_TINY) -#define LIBTORRENT_VERSION "1.1.10.0" -#define LIBTORRENT_REVISION "a499ace80" +#define LIBTORRENT_VERSION "1.1.11.0" +#define LIBTORRENT_REVISION "ed4ca98a1" namespace libtorrent { diff --git a/src/settings_pack.cpp b/src/settings_pack.cpp index deabbce79..4e1ab9590 100644 --- a/src/settings_pack.cpp +++ b/src/settings_pack.cpp @@ -148,7 +148,7 @@ namespace libtorrent SET_NOPREV(proxy_username, "", &session_impl::update_proxy), SET_NOPREV(proxy_password, "", &session_impl::update_proxy), SET_NOPREV(i2p_hostname, "", &session_impl::update_i2p_bridge), - SET_NOPREV(peer_fingerprint, "-LT11A0-", 0), + SET_NOPREV(peer_fingerprint, "-LT11B0-", 0), SET_NOPREV(dht_bootstrap_nodes, "dht.libtorrent.org:25401", &session_impl::update_dht_bootstrap_nodes) }; diff --git a/tools/set_version.py b/tools/set_version.py index 2038ad7a0..9b585e5cc 100755 --- a/tools/set_version.py +++ b/tools/set_version.py @@ -42,6 +42,8 @@ def substitute_file(name): l = "\tversion = '%d.%d.%d',\n" % (version[0], version[1], version[2]) elif "version = '" in l and name.endswith('setup.py'): l = "\tversion = '%d.%d.%d',\n" % (version[0], version[1], version[2]) + elif l.startswith('\tVERSION ') and len(l.split('.')) == 3 and name.endswith('CMakeLists.txt'): + l = "\tVERSION %d.%d.%d\n" % (version[0], version[1], version[2]) elif '"-LT' in l and name.endswith('settings_pack.cpp'): l = re.sub('"-LT[0-9A-Za-z]{4}-"', '"-LT%c%c%c%c-"' % v(version), l) From 95049cde1ae287a64c9b854c152bc1a406c67c53 Mon Sep 17 00:00:00 2001 From: sledgehammer_999 Date: Fri, 16 Nov 2018 23:13:17 +0200 Subject: [PATCH 5/6] Include cmake file for bindings in the tarball --- bindings/python/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am index 14605b729..fa2cc373a 100644 --- a/bindings/python/Makefile.am +++ b/bindings/python/Makefile.am @@ -3,6 +3,7 @@ EXTRA_DIST = \ CMakeLists.txt \ Jamfile \ setup.py \ + setup.py.cmake.in \ client.py \ simple_client.py \ make_torrent.py \ From 25a1f12991b4af1e133b966fae963168116306e9 Mon Sep 17 00:00:00 2001 From: airium Date: Sat, 17 Nov 2018 00:52:29 +0800 Subject: [PATCH 6/6] Fix redundant bytes overflow --- include/libtorrent/torrent.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/libtorrent/torrent.hpp b/include/libtorrent/torrent.hpp index 92b5d59cc..de3e37d26 100644 --- a/include/libtorrent/torrent.hpp +++ b/include/libtorrent/torrent.hpp @@ -1429,7 +1429,7 @@ namespace libtorrent // the number of bytes that has been // downloaded that failed the hash-test boost::uint32_t m_total_failed_bytes; - boost::uint32_t m_total_redundant_bytes; + boost::uint64_t m_total_redundant_bytes; // the sequence number for this torrent, this is a // monotonically increasing number for each added torrent