From cb089e74ba3c385e3a2e4060750ba728a8d5312e Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Sun, 15 Jun 2014 04:20:39 +0000
Subject: [PATCH] merged UPnP fix from RC_0_16

---
 ChangeLog    |  1 +
 src/upnp.cpp | 19 ++++++-------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d08a82c6a..e5908288e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -55,6 +55,7 @@
 	* fix uTP edge case where udp socket buffer fills up
 	* fix nagle implementation in uTP
 
+	* don't fall back on wildcard port in UPnP
 	* fix local service discovery for magnet links
 	* fix bitfield issue in file_storage
 	* added work-around for MingW issue in file I/O
diff --git a/src/upnp.cpp b/src/upnp.cpp
index 7ccd2ad2f..4c28ad9d6 100644
--- a/src/upnp.cpp
+++ b/src/upnp.cpp
@@ -171,6 +171,9 @@ void upnp::discover_device_impl(mutex::scoped_lock& l)
 // returns a reference to a mapping or -1 on failure
 int upnp::add_mapping(upnp::protocol_type p, int external_port, int local_port)
 {
+	// external port 0 means _every_ port
+	TORRENT_ASSERT(external_port != 0);
+
 	mutex::scoped_lock l(m_mutex);
 
 	char msg[500];
@@ -1378,24 +1381,14 @@ void upnp::on_upnp_map_response(error_code const& e
 		update_map(d, mapping, l);
 		return;
 	}
-	else if (s.error_code == 718 || s.error_code == 727)
+	else if (s.error_code == 727)
 	{
-		if (m.external_port != 0)
-		{
-			// conflict in mapping, set port to wildcard
-			// and let the router decide
-			m.external_port = 0;
-			m.action = mapping_t::action_add;
-			++m.failcount;
-			update_map(d, mapping, l);
-			return;
-		}
 		return_error(mapping, s.error_code, l);
 	}
-	else if (s.error_code == 716 || (s.error_code == 501 && m.failcount < 4 && m.external_port == 0))
+	else if ((s.error_code == 718 || s.error_code == 501) && m.failcount < 4)
 	{
 		// some routers return 501 action failed, instead of 716
-		// The external port cannot be wildcarder
+		// The external port conflicts with another mapping
 		// pick a random port
 		m.external_port = 40000 + (random() % 10000);
 		m.action = mapping_t::action_add;