1 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp b/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp
index f749735..a6b75da 100644
--- a/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp
+++ b/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2016 Isode Limited.
+ * Copyright (c) 2012-2018 Isode Limited.
 * All rights reserved.
 * See the COPYING file for more information.
 */
@@ -114,7 +114,7 @@ void SOCKS5BytestreamServerManager::initialize() {
        // Find a port to listen on
        assert(!connectionServer);
-        int port;
+        unsigned short port;
        for (port = LISTEN_PORTS_BEGIN; port < LISTEN_PORTS_END; ++port) {
            SWIFT_LOG(debug) << "Trying to start server on port " << port << std::endl;
            connectionServer = connectionServerFactory->createConnectionServer(HostAddress::fromString("::").get(), port);
@@ -164,7 +164,7 @@ void SOCKS5BytestreamServerManager::setupPortForwarding() {
    }
    // Forward ports
-    int port = server->getAddressPort().getPort();
+    auto port = server->getAddressPort().getPort();
    assert(!forwardPortRequest);
    portMapping = boost::optional<NATPortMapping>();
    if ((forwardPortRequest = natTraverser->createForwardPortRequest(port, port))) {

diff --git a/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp b/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp index f749735..a6b75da 100644 --- a/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp +++ b/Swiften/FileTransfer/SOCKS5BytestreamServerManager.cpp
@@ -1,5 +1,5 @@
1	/*	1	/*
2	* Copyright (c) 2012-2016 Isode Limited.	2	* Copyright (c) 2012-2018 Isode Limited.
3	* All rights reserved.	3	* All rights reserved.
4	* See the COPYING file for more information.	4	* See the COPYING file for more information.
5	*/	5	*/
@@ -114,7 +114,7 @@ void SOCKS5BytestreamServerManager::initialize() {
114		114
115	// Find a port to listen on	115	// Find a port to listen on
116	assert(!connectionServer);	116	assert(!connectionServer);
117	int port;	117	unsigned short port;
118	for (port = LISTEN_PORTS_BEGIN; port < LISTEN_PORTS_END; ++port) {	118	for (port = LISTEN_PORTS_BEGIN; port < LISTEN_PORTS_END; ++port) {
119	SWIFT_LOG(debug) << "Trying to start server on port " << port << std::endl;	119	SWIFT_LOG(debug) << "Trying to start server on port " << port << std::endl;
120	connectionServer = connectionServerFactory->createConnectionServer(HostAddress::fromString("::").get(), port);	120	connectionServer = connectionServerFactory->createConnectionServer(HostAddress::fromString("::").get(), port);
@@ -164,7 +164,7 @@ void SOCKS5BytestreamServerManager::setupPortForwarding() {
164	}	164	}
165		165
166	// Forward ports	166	// Forward ports
167	int port = server->getAddressPort().getPort();	167	auto port = server->getAddressPort().getPort();
168	assert(!forwardPortRequest);	168	assert(!forwardPortRequest);
169	portMapping = boost::optional<NATPortMapping>();	169	portMapping = boost::optional<NATPortMapping>();
170	if ((forwardPortRequest = natTraverser->createForwardPortRequest(port, port))) {	170	if ((forwardPortRequest = natTraverser->createForwardPortRequest(port, port))) {