add option to wait for network on startup

addons/resource.language.en_gb/resources/strings.po

@@ -20403,5 +20403,5 @@ msgstr ""
 #. Description of setting with label #39011 "Maximum wait time for network"
 #: system/settings/settings.xml
 msgctxt "#39012"
-msgid "Set the maximum time to wait for the network to come up after waking up. When time has passed before network is up startup will continue."
+msgid "Set the maximum time to wait for the network to come up after starting or waking up. When time has passed before network is up startup will continue."
 msgstr ""

system/settings/settings.xml

@@ -2890,7 +2890,7 @@
           </constraints>
           <control type="list" format="string" />
         </setting>
-        <setting id="powermanagement.waitnetafterwakeup" type="integer" label="39011" help="39012">
+        <setting id="powermanagement.waitfornetwork" type="integer" label="39011" help="39012">
           <level>2</level>
           <default>0</default>
           <constraints>

xbmc/Application.cpp

@@ -1106,6 +1106,8 @@ bool CApplication::Initialize()
   g_peripherals.Initialise();
 #endif
 
+  getNetwork().WaitForNet();
+
   // Load curl so curl_global_init gets called before any service threads
   // are started. Unloading will have no effect as curl is never fully unloaded.
   // To quote man curl_global_init:

xbmc/network/Network.cpp

@@ -23,14 +23,19 @@
 #include <arpa/inet.h>
 
 #include "Network.h"
+#include "ServiceBroker.h"
 #include "messaging/ApplicationMessenger.h"
 #include "network/NetworkServices.h"
+#include "settings/Settings.h"
 #include "utils/log.h"
 #ifdef TARGET_WINDOWS
 #include "utils/SystemInfo.h"
 #include "platform/win32/WIN32Util.h"
 #include "utils/CharsetConverter.h"
 #endif
+#ifdef TARGET_POSIX
+#include "linux/XTimeUtils.h"
+#endif
 #include "utils/StringUtils.h"
 
 using namespace KODI::MESSAGING;
@@ -549,3 +554,32 @@ int CreateTCPServerSocket(const int port, const bool bindLocal, const int backlo
   return sock;
 }
 
+void CNetwork::WaitForNet()
+{
+  const int timeout = CServiceBroker::GetSettings().GetInt(CSettings::SETTING_POWERMANAGEMENT_WAITFORNETWORK);
+  if (timeout <= 0)
+    return; // wait for network is disabled
+
+  // check if we have at least one network interface to wait for
+  if (!IsAvailable())
+    return;
+
+  CLog::Log(LOGNOTICE, "%s: Waiting for a network interface to come up (Timeout: %d s)", __FUNCTION__, timeout);
+
+  const static int intervalMs = 200;
+  const int numMaxTries = (timeout * 1000) / intervalMs;
+
+  for(int i=0; i < numMaxTries; ++i)
+  {
+    if (i > 0)
+      Sleep(intervalMs);
+
+    if (IsConnected())
+    {
+      CLog::Log(LOGNOTICE, "%s: A network interface is up after waiting %d ms", __FUNCTION__, i * intervalMs);
+      return;
+    }
+  }
+
+  CLog::Log(LOGNOTICE, "%s: No network interface did come up within %d s... Giving up...", __FUNCTION__, timeout);
+}

xbmc/network/Network.h

@@ -149,6 +149,9 @@ class CNetwork
 
    // Return true if given name or ip address corresponds to localhost
    bool IsLocalHost(const std::string& hostname);
+
+   // Waits for the first network interface to become available
+   void WaitForNet();
 };
 
 #ifdef HAS_LINUX_NETWORK

xbmc/powermanagement/PowerManager.cpp

@@ -58,10 +58,6 @@
 extern HWND g_hWnd;
 #endif
 
-#if defined(TARGET_POSIX)
-#include "linux/XTimeUtils.h"
-#endif
-
 using namespace ANNOUNCEMENT;
 
 CPowerManager g_powerManager;
@@ -275,11 +271,7 @@ void CPowerManager::OnWake()
 {
   CLog::Log(LOGNOTICE, "%s: Running resume jobs", __FUNCTION__);
 
-  {
-    const int waitNetTimeout = CServiceBroker::GetSettings().GetInt(CSettings::SETTING_POWERMANAGEMENT_WAITNETAFTERWAKEUP);
-    if (waitNetTimeout > 0)
-      WaitForNet(waitNetTimeout);
-  }
+  g_application.getNetwork().WaitForNet();
 
   // reset out timers
   g_application.ResetShutdownTimers();
@@ -338,31 +330,3 @@ void CPowerManager::SettingOptionsShutdownStatesFiller(const CSetting *setting,
 #endif
   }
 }
-
-void CPowerManager::WaitForNet(int timeout) const
-{
-  CNetwork& net = g_application.getNetwork();
-
-  // check if we have at least one network interface to wait for
-  if (!net.IsAvailable())
-    return;
-
-  CLog::Log(LOGNOTICE, "%s: Waiting for a network interface to come up (Timeout: %d s)", __FUNCTION__, timeout);
-
-  const static int intervalMs = 200;
-  const int numMaxTries = (timeout * 1000) / intervalMs;
-
-  for(int i=0; i < numMaxTries; ++i)
-  {
-    if (i > 0)
-      Sleep(intervalMs);
-
-    if (net.IsConnected())
-    {
-      CLog::Log(LOGNOTICE, "%s: A network interface is up after waiting %d ms", __FUNCTION__, i * intervalMs);
-      return;
-    }
-  }
-
-  CLog::Log(LOGNOTICE, "%s: No network interface did come up within %d s... Giving up...", __FUNCTION__, timeout);
-}

xbmc/powermanagement/PowerManager.h

@@ -93,8 +93,6 @@ class CPowerManager : public IPowerEventsCallback
 
   void OnLowBattery();
 
-  void WaitForNet(int timeout) const;
-
   IPowerSyscall *m_instance;
 };
 

xbmc/settings/Settings.cpp

@@ -392,7 +392,7 @@ const std::string CSettings::SETTING_POWERMANAGEMENT_DISPLAYSOFF = "powermanagem
 const std::string CSettings::SETTING_POWERMANAGEMENT_SHUTDOWNTIME = "powermanagement.shutdowntime";
 const std::string CSettings::SETTING_POWERMANAGEMENT_SHUTDOWNSTATE = "powermanagement.shutdownstate";
 const std::string CSettings::SETTING_POWERMANAGEMENT_WAKEONACCESS = "powermanagement.wakeonaccess";
-const std::string CSettings::SETTING_POWERMANAGEMENT_WAITNETAFTERWAKEUP = "powermanagement.waitnetafterwakeup";
+const std::string CSettings::SETTING_POWERMANAGEMENT_WAITFORNETWORK = "powermanagement.waitfornetwork";
 const std::string CSettings::SETTING_DEBUG_SHOWLOGINFO = "debug.showloginfo";
 const std::string CSettings::SETTING_DEBUG_EXTRALOGGING = "debug.extralogging";
 const std::string CSettings::SETTING_DEBUG_SETEXTRALOGLEVEL = "debug.setextraloglevel";

xbmc/settings/Settings.h

@@ -348,7 +348,7 @@ class CSettings : public CSettingCreator, public CSettingControlCreator
   static const std::string SETTING_POWERMANAGEMENT_SHUTDOWNTIME;
   static const std::string SETTING_POWERMANAGEMENT_SHUTDOWNSTATE;
   static const std::string SETTING_POWERMANAGEMENT_WAKEONACCESS;
-  static const std::string SETTING_POWERMANAGEMENT_WAITNETAFTERWAKEUP;
+  static const std::string SETTING_POWERMANAGEMENT_WAITFORNETWORK;
   static const std::string SETTING_DEBUG_SHOWLOGINFO;
   static const std::string SETTING_DEBUG_EXTRALOGGING;
   static const std::string SETTING_DEBUG_SETEXTRALOGLEVEL;