From 5698ff9c4cd7f7faf0512786f685b8fe1e4cdd3c Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Sun, 31 Jul 2016 10:22:41 -0400
Subject: [PATCH] wait for UPnP discovery during startup

---
 UPnP.cpp | 9 ++++++++-
 UPnP.h   | 6 +++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/UPnP.cpp b/UPnP.cpp
index 41b49e00..db0d3683 100644
--- a/UPnP.cpp
+++ b/UPnP.cpp
@@ -49,7 +49,9 @@ namespace transport
 		m_IsRunning = true;
         LogPrint(eLogInfo, "UPnP: starting");
 		m_Service.post (std::bind (&UPnP::Discover, this));
+		std::unique_lock<std::mutex> l(m_StartedMutex);
         m_Thread.reset (new std::thread (std::bind (&UPnP::Run, this)));
+		m_Started.wait_for (l, std::chrono::seconds (5)); // 5 seconds maximum
     }
     
     UPnP::~UPnP ()
@@ -80,7 +82,12 @@ namespace transport
 #else
         m_Devlist = upnpDiscover (2000, m_MulticastIf, m_Minissdpdpath, 0, 0, &nerror);
 #endif
-
+		{
+			// notify satrting thread			
+			std::unique_lock<std::mutex> l(m_StartedMutex);
+			m_Started.notify_all ();
+		}	
+		
         int r;
         r = UPNP_GetValidIGD (m_Devlist, &m_upnpUrls, &m_upnpData, m_NetworkAddr, sizeof (m_NetworkAddr));
         if (r == 1)
diff --git a/UPnP.h b/UPnP.h
index f62ce402..7d67fdbf 100644
--- a/UPnP.h
+++ b/UPnP.h
@@ -4,6 +4,8 @@
 #ifdef USE_UPNP
 #include <string>
 #include <thread>
+#include <condition_variable>
+#include <mutex>
 #include <memory>
 
 #include <miniupnpc/miniwget.h>
@@ -43,8 +45,10 @@ namespace transport
 	
 		bool m_IsRunning;
         std::unique_ptr<std::thread> m_Thread;
+		std::condition_variable m_Started;	
+		std::mutex m_StartedMutex;	
 		boost::asio::io_service m_Service;
-		boost::asio::deadline_timer m_Timer;
+		boost::asio::deadline_timer m_Timer;	
         struct UPNPUrls m_upnpUrls;
         struct IGDdatas m_upnpData;