merge RC_1_1 into master

Author: arvidn

ChangeLog

@@ -79,6 +79,8 @@
 
 1.1.5 release
 
+	* fix parsing of torrents with certain invalid filenames
+	* fix leak of torrent_peer objecs (entries in peer_list)
 	* fix leak of peer_class objects (when setting per-torrent rate limits)
 	* expose peer_class API to python binding
 	* fix integer overflow in whole_pieces_threshold logic

Jamfile

@@ -47,27 +47,24 @@ VERSION = 1.2.0 ;
 
 # rule for linking the correct libraries depending
 # on features and target-os
-rule linking ( properties * )
+rule link-openssl ( properties * )
 {
 	local result ;
 
 	# openssl libraries, if enabled
 	# exclude gcc from a regular windows build to make mingw
 	# link against the regular unix library name
-	if <crypto>openssl in $(properties)
+	if <openssl-version>pre1.1 in $(properties)
+		&& <target-os>windows in $(properties)
+		&& ! <toolset>gcc in $(properties)
 	{
-		if <openssl-version>pre1.1 in $(properties)
-			&& <target-os>windows in $(properties)
-			&& ! <toolset>gcc in $(properties)
-		{
-			result += <library>ssleay32 <library>libeay32 ;
-		}
-		else
-		{
-			# on windows the library names were changed to be in line with other
-			# system starting with OpenSSL 1.1
-			result += <library>crypto <library>ssl ;
-		}
+		result += <library>ssleay32 <library>libeay32 ;
+	}
+	else
+	{
+		# on windows the library names were changed to be in line with other
+		# system starting with OpenSSL 1.1
+		result += <library>crypto <library>ssl ;
 	}
 
 	if <crypto>libcrypto in $(properties)
@@ -88,9 +85,7 @@ rule linking ( properties * )
 	}
 
 	# windows needs some more libraries when using openSSL
-	if ( <crypto>openssl in $(properties)
-		|| <crypto>libcrypto in $(propertes) )
-		&& <target-os>windows in $(properties)
+	if <target-os>windows in $(properties)
 		&& ! <toolset>gcc in $(properties)
 	{
 		result += <library>advapi32
@@ -99,7 +94,13 @@ rule linking ( properties * )
 			<library>gdi32
 		;
 	}
+	echo "link openssl = " $(result) ;
+	return $(result) ;
+}
 
+rule linking ( properties * )
+{
+	local result ;
 	if <simulator>on in $(properties)
 	{
 		result += <library>/libsimulator//simulator ;
@@ -375,7 +376,7 @@ rule default-build ( properties * )
 	return $(result) ;
 }
 
-rule tag ( name : type  ? : property-set )
+rule tag ( name : type ? : property-set )
 {
 	name = [ virtual-target.add-prefix-and-suffix $(name) : $(type) : $(property-set) ] ;
 
@@ -388,6 +389,78 @@ rule tag ( name : type  ? : property-set )
 	return $(name) ;
 }
 
+# the search path to pick up the openssl libraries from. This is the <search>
+# property of those libraries
+rule openssl-lib-path ( properties * )
+{
+	local OPENSSL_LIB = [ feature.get-values <openssl-lib> : $(properties) ] ;
+
+	if <target-os>darwin in $(properties) && $(OPENSSL_LIB) = ""
+	{
+		# on macOS, default to pick up openssl from the homebrew installation
+		# brew install openssl
+		OPENSSL_LIB = /usr/local/opt/openssl/lib ;
+	}
+	else if <target-os>windows in $(properties)
+		&& <toolset>gcc in $(properties)
+		&& $(OPENSSL_LIB) = ""
+	{
+		# on mingw, assume openssl is installed in c:\OpenSSL-Win32 by default
+		OPENSSL_LIB = c:\\OpenSSL-Win32\\lib ;
+	}
+	else if <target-os>windows in $(properties) && $(OPENSSL_LIB) = ""
+	{
+		# on windows, just assume openssl is installed to c:\openssl
+		if <address-model>64 in $(properties)
+		{ OPENSSL_LIB = c:\\openssl\\lib64 ; }
+		else
+		{ OPENSSL_LIB = c:\\openssl\\lib ; }
+	}
+
+	local result ;
+	result += <search>$(OPENSSL_LIB) ;
+	echo "openssl-lib-path = " $(result) ;
+	return $(result) ;
+}
+
+# the include path to pick up openssl headers from. This is the
+# usage-requirement for the openssl-related libraries
+rule openssl-include-path ( properties * )
+{
+	local OPENSSL_INCLUDE = [ feature.get-values <openssl-include> : $(properties) ] ;
+
+	if <target-os>darwin in $(properties) && $(OPENSSL_INCLUDE) = ""
+	{
+		# on macOS, default to pick up openssl from the homebrew installation
+		# brew install openssl
+		OPENSSL_INCLUDE = /usr/local/opt/openssl/include ;
+	}
+	else if <target-os>windows in $(properties)
+		&& <toolset>gcc in $(properties)
+		&& $(OPENSSL_INCLUDE) = ""
+	{
+		# on mingw, assume openssl is installed in c:\OpenSSL-Win32 by default
+		OPENSSL_INCLUDE = c:\\OpenSSL-Win32\\include ;
+	}
+	else if <target-os>windows in $(properties) && $(OPENSSL_INCLUDE) = ""
+	{
+		# on windows, just assume openssl is installed to c:\openssl
+		# not sure if there's a better way to find out where it may be
+		if <address-model>64 in $(properties)
+		{ OPENSSL_INCLUDE = c:\\openssl\\include64 ; }
+		else
+		{ OPENSSL_INCLUDE = c:\\openssl\\include ; }
+	}
+
+	local result ;
+	result += <include>$(OPENSSL_INCLUDE) ;
+	echo "openssl-include-path = " $(result) ;
+	return $(result) ;
+}
+
+feature openssl-lib : : free path ;
+feature openssl-include : : free path ;
+
 feature ipv6 : on off : composite propagated link-incompatible ;
 feature.compose <ipv6>off : <define>TORRENT_USE_IPV6=0 ;
 
@@ -515,9 +588,12 @@ variant test_arm : debug
 	<export-extra>on <asserts>on
 	;
 
+lib crypto : : <name>crypto <conditional>@openssl-lib-path : : <conditional>@openssl-include-path ;
+lib ssl : : <name>ssl <use>crypto <conditional>@openssl-lib-path : : <conditional>@openssl-include-path ;
+
 # required for openssl on windows
-lib ssleay32 : : <name>ssleay32 ;
-lib libeay32 : : <name>libeay32 ;
+lib ssleay32 : : <name>ssleay32 <conditional>@openssl-lib-path : : <conditional>@openssl-include-path ;
+lib libeay32 : : <name>libeay32 <conditional>@openssl-lib-path : : <conditional>@openssl-include-path ;
 lib advapi32 : : <name>advapi32 ;
 lib user32 : : <name>user32 ;
 lib shell32 : : <name>shell32 ;
@@ -534,12 +610,7 @@ lib libiconv : : <name>iconv <link>shared <search>/usr/local/lib ;
 # openssl on linux/bsd etc.
 lib gcrypt : : <name>gcrypt <link>shared <search>/opt/local/lib ;
 
-# pick up openssl on macos from brew
-lib crypto : : <name>crypto <target-os>darwin <search>/usr/local/opt/openssl/lib : <link>shared : <include>/usr/local/opt/openssl/include ;
-lib ssl : : <name>ssl <use>crypto <target-os>darwin <search>/usr/local/opt/openssl/lib : <link>shared : <include>/usr/local/opt/openssl/include ;
-
-lib crypto : : <name>crypto : <link>shared ;
-lib ssl : : <name>ssl <use>crypto : <link>shared ;
+alias openssl-libraries : : : : <conditional>@link-openssl ;
 
 lib libsocket : : <use>libnsl <name>socket <link>shared <search>/usr/sfw/lib <link>shared ;
 lib libnsl : : <name>nsl <link>shared <search>/usr/sfw/lib <link>shared ;
@@ -754,6 +825,8 @@ lib torrent
 	<link>shared:<define>TORRENT_BUILDING_SHARED
 	<define>BOOST_NO_DEPRECATED
 	<link>shared:<define>BOOST_SYSTEM_SOURCE
+	<crypto>openssl:<library>openssl-libraries
+	<crypto>libcrypto:<library>openssl-libraries
 
 	<dht>on:<source>src/kademlia/$(KADEMLIA_SOURCES).cpp
 	<dht>on:<source>ed25519/src/$(ED25519_SOURCES).cpp

appveyor.yml

@@ -20,8 +20,6 @@ environment:
     model: 64
     python: 1
     crypto: openssl
-    linkflags: 'linkflags="/LIBPATH:C:\\openssl-1.0.1p-vs2015\\lib64"'
-    include: 'include="c:\\openssl-1.0.1p-vs2015\\include"'
   - variant: test_debug
     compiler: gcc
     model: 32
@@ -38,10 +36,11 @@ install:
 - if %compiler% == msvc-14.0 if defined crypto (
     echo extracting openssl-2015
     & 7z x -oc:\ -aoa openssl-1.0.1p-vs2015.7z > nul
-    & copy c:\openssl-1.0.1p-vs2015\lib64\ssleay32MT.lib c:\openssl-1.0.1p-vs2015\lib64\ssleay32.lib
-    & copy c:\openssl-1.0.1p-vs2015\lib64\libeay32MT.lib c:\openssl-1.0.1p-vs2015\lib64\libeay32.lib
-    & copy c:\openssl-1.0.1p-vs2015\lib\ssleay32MT.lib c:\openssl-1.0.1p-vs2015\lib\ssleay32.lib
-    & copy c:\openssl-1.0.1p-vs2015\lib\libeay32MT.lib c:\openssl-1.0.1p-vs2015\lib\libeay32.lib
+    & rename c:\openssl-1.0.1p-vs2015 openssl
+    & copy c:\openssl\lib64\ssleay32MT.lib c:\openssl\lib64\ssleay32.lib
+    & copy c:\openssl\lib64\libeay32MT.lib c:\openssl\lib64\libeay32.lib
+    & copy c:\openssl\lib\ssleay32MT.lib c:\openssl\lib\ssleay32.lib
+    & copy c:\openssl\lib\libeay32MT.lib c:\openssl\lib\libeay32.lib
   )
 - if not defined crypto ( set crypto=built-in )
 - if not defined linkflags ( set linkflags="" )
@@ -69,32 +68,32 @@ cache:
 build_script:
 # examples
 - cd %ROOT_DIRECTORY%\examples
-- b2.exe --hash openssl-version=pre1.1 warnings-as-errors=on -j2 %compiler% address-model=%model% debug-iterators=on picker-debugging=on invariant-checks=full variant=%variant% %linkflags% %include% link=shared crypto=%crypto%
+- b2.exe --hash crypto=openssl openssl-version=pre1.1 warnings-as-errors=on -j2 %compiler% address-model=%model% debug-iterators=on picker-debugging=on invariant-checks=full variant=%variant% %linkflags% %include% link=shared crypto=%crypto%
 
 # tools
 - cd %ROOT_DIRECTORY%\tools
-- b2.exe --hash openssl-version=pre1.1 warnings-as-errors=on -j2 %compiler% address-model=%model% debug-iterators=on picker-debugging=on invariant-checks=full variant=%variant% %linkflags% %include% link=shared crypto=%crypto%
+- b2.exe --hash crypto=openssl openssl-version=pre1.1 warnings-as-errors=on -j2 %compiler% address-model=%model% debug-iterators=on picker-debugging=on invariant-checks=full variant=%variant% %linkflags% %include% link=shared crypto=%crypto%
 
 # test
 - cd %ROOT_DIRECTORY%\test
-- b2.exe --hash openssl-version=pre1.1 warnings-as-errors=on -j2 %compiler% address-model=%model% debug-iterators=on picker-debugging=on invariant-checks=full variant=%variant% %linkflags% %include% link=shared crypto=%crypto% win-tests test_upnp test_natpmp testing.execute=off
+- b2.exe --hash crypto=openssl openssl-version=pre1.1 warnings-as-errors=on -j2 %compiler% address-model=%model% debug-iterators=on picker-debugging=on invariant-checks=full variant=%variant% %linkflags% %include% link=shared crypto=%crypto% win-tests test_upnp test_natpmp testing.execute=off
 
 # python binding
 - cd %ROOT_DIRECTORY%\bindings\python
 # we use 64 bit python builds
 - if defined python (
-  b2.exe --hash openssl-version=pre1.1 warnings-as-errors=on -j2 %compiler% address-model=%model% debug-iterators=on picker-debugging=on invariant-checks=full variant=%variant% %linkflags% %include% link=shared crypto=%crypto% libtorrent-link=shared stage_module stage_dependencies
+  b2.exe --hash crypto=openssl openssl-version=pre1.1 warnings-as-errors=on -j2 %compiler% address-model=%model% debug-iterators=on picker-debugging=on invariant-checks=full variant=%variant% %linkflags% %include% link=shared crypto=%crypto% libtorrent-link=shared stage_module stage_dependencies
   )
 
 # simulations
 - cd %ROOT_DIRECTORY%\simulation
 - if defined sim (
-  b2.exe --hash openssl-version=pre1.1 warnings-as-errors=on -j2 %compiler% address-model=%model% debug-iterators=on picker-debugging=on invariant-checks=full variant=%variant% deprecated-functions=off %linkflags% %include% link=shared crypto=built-in testing.execute=off
+  b2.exe --hash crypto=openssl openssl-version=pre1.1 warnings-as-errors=on -j2 %compiler% address-model=%model% debug-iterators=on picker-debugging=on invariant-checks=full variant=%variant% deprecated-functions=off %linkflags% %include% link=shared crypto=built-in testing.execute=off
   )
 
 test_script:
 - cd %ROOT_DIRECTORY%\test
-- appveyor-retry b2.exe -l400 --hash openssl-version=pre1.1 warnings-as-errors=on -j2 %compiler% address-model=%model% debug-iterators=on picker-debugging=on invariant-checks=full variant=%variant% %linkflags% %include% link=shared crypto=%crypto% win-tests
+- appveyor-retry b2.exe -l400 --hash crypto=openssl openssl-version=pre1.1 warnings-as-errors=on -j2 %compiler% address-model=%model% debug-iterators=on picker-debugging=on invariant-checks=full variant=%variant% %linkflags% %include% link=shared crypto=%crypto% win-tests
 
 - cd %ROOT_DIRECTORY%\bindings\python
 # we use 64 bit python build

build_dist.sh

@@ -23,9 +23,9 @@ rm -f bindings/python/Makefile bindings/python/Makefile.in
 chmod a-x docs/*.rst docs/*.htm* src/*.cpp include/libtorrent/*.hpp
 
 ./autotool.sh
-./configure --enable-python-binding --enable-examples=yes --enable-encryption --enable-tests=yes --with-boost-system=mt --with-boost-python=mt
+./configure --enable-python-binding --enable-examples=yes --enable-encryption --enable-tests=yes --with-boost-system=mt --with-boost-chrono=mt --with-boost-random=mt --with-boost-python=mt --with-openssl=/usr/local/opt/openssl
 make V=1 -j8 check
 
-./configure --enable-python-binding --enable-examples=yes --enable-encryption --with-boost-system=mt --with-boost-python=mt
+./configure --enable-python-binding --enable-examples=yes --enable-encryption --with-boost-system=mt --with-boost-chrono=mt --with-boost-random=mt --with-boost-python=mt --with-openssl=/usr/local/opt/openssl
 make V=1 -j8 dist
 

docs/building.rst

@@ -237,6 +237,14 @@ windows format (``c:/boost_1_64_0``).
 The ``Jamfile`` will define ``NDEBUG`` when it's building a release build.
 For more build configuration flags see `Build configurations`_.
 
+When enabling linking against openssl (by setting the ``crypto`` feature to
+``openssl``) the Jamfile will look in some default directory for the openssl
+headers and libraries. On macOS, it will look for the homebrew openssl package.
+On windows it will look in ``c:\openssl`` and mingw in ``c:\OpenSSL-Win32``.
+
+To customize the library path and include path for openssl, set the features
+``openssl-lib`` and ``openssl-include`` respectively.
+
 Build features:
 
 +--------------------------+----------------------------------------------------+
@@ -247,6 +255,13 @@ Build features:
 |                          | * ``shared`` - links dynamically against the boost |
 |                          |   libraries.                                       |
 +--------------------------+----------------------------------------------------+
+| ``openssl-lib``          | can be used to specify the directory where libssl  |
+|                          | and libcrypto are installed (or the windows        |
+|                          | counterparts).                                     |
++--------------------------+----------------------------------------------------+
+| ``openssl-include``      | can be used to specify the include directory where |
+|                          | the openssl headers are installed.                 |
++--------------------------+----------------------------------------------------+
 | ``logging``              | * ``off`` - logging alerts disabled. The           |
 |                          |   reason to disable logging is to keep the binary  |
 |                          |   size low where that matters.                     |
@@ -281,9 +296,10 @@ Build features:
 | ``crypto``               | * ``built-in`` - (default) uses built-in SHA-1     |
 |                          |   implementation. In macOS/iOS it uses             |
 |                          |   CommonCrypto SHA-1 implementation.               |
-|                          | * ``openssl`` - links against openssl to enable    |
-|                          |   torrents over ssl feature.                       |
-|                          |   the option crypto=libcrypto.                     |
+|                          | * ``openssl`` - links against openssl and          |
+|                          |   libcrypto to use for SHA-1 hashing.              |
+|                          |   This also enables HTTPS-tracker support and      |
+|                          |   support for bittorrent over SSL.                 |
 |                          | * ``libcrypto`` - links against libcrypto          |
 |                          |   to use the SHA-1 implementation.                 |
 |                          | * ``gcrypt`` - links against libgcrypt             |

include/libtorrent/aux_/session_impl.hpp

@@ -294,8 +294,8 @@ namespace aux {
 			void reopen_listen_sockets();
 			void reopen_outgoing_sockets();
 
-			torrent_peer_allocator_interface* get_peer_allocator() override
-			{ return &m_peer_allocator; }
+			torrent_peer_allocator_interface& get_peer_allocator() override
+			{ return m_peer_allocator; }
 
 			io_service& get_io_service() override { return m_io_service; }
 			resolver_interface& get_resolver() override { return m_host_resolver; }

include/libtorrent/aux_/session_interface.hpp

@@ -147,7 +147,7 @@ namespace libtorrent { namespace aux {
 
 		virtual alert_manager& alerts() = 0;
 
-		virtual torrent_peer_allocator_interface* get_peer_allocator() = 0;
+		virtual torrent_peer_allocator_interface& get_peer_allocator() = 0;
 		virtual io_service& get_io_service() = 0;
 		virtual resolver_interface& get_resolver() = 0;
 

include/libtorrent/config.hpp

@@ -168,13 +168,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #if TARGET_OS_IPHONE
 #define TORRENT_USE_SC_NETWORK_REACHABILITY 1
 #endif
-
-#else // __APPLE__
-// FreeBSD has a reasonable iconv signature
-// unless we're on glibc
-#ifndef __GLIBC__
-# define TORRENT_ICONV_ARG(x) (x)
-#endif
 #endif // __APPLE__
 
 #define TORRENT_USE_DEV_RANDOM 1
@@ -328,7 +321,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #define TORRENT_USE_IFCONF 1
 #define TORRENT_USE_SYSCTL 1
 #define TORRENT_USE_IPV6 0
-#define TORRENT_ICONV_ARG(x) (x)
 #define TORRENT_USE_WRITEV 0
 #define TORRENT_USE_READV 0
 
@@ -355,10 +347,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #define TORRENT_NO_RETURN
 #endif
 
-#ifndef TORRENT_ICONV_ARG
-#define TORRENT_ICONV_ARG(x) const_cast<char**>(x)
-#endif
-
 #if defined __GNUC__ || defined __clang__
 #define TORRENT_FORMAT(fmt, ellipsis) __attribute__((__format__(__printf__, fmt, ellipsis)))
 #else