unbreak android config loading

llarp/config/config.cpp

@@ -1336,15 +1336,25 @@ namespace llarp
   }
 
   void
-  Config::LoadOverrides()
+  Config::LoadOverrides(ConfigDefinition& conf) const
   {
+    ConfigParser parser;
     const auto overridesDir = GetOverridesDir(m_DataDir);
     if (fs::exists(overridesDir))
     {
       util::IterDir(overridesDir, [&](const fs::path& overrideFile) {
         if (overrideFile.extension() == ".ini")
         {
-          m_Parser.LoadFile(overrideFile);
+          ConfigParser parser;
+          if (not parser.LoadFile(overrideFile))
+            throw std::runtime_error{"cannot load '" + overrideFile.u8string() + "'"};
+
+          parser.IterAll([&](std::string_view section, const SectionValues_t& values) {
+            for (const auto& pair : values)
+            {
+              conf.addConfigValue(section, pair.first, pair.second);
+            }
+          });
         }
         return true;
       });
@@ -1358,7 +1368,7 @@ namespace llarp
   }
 
   bool
-  Config::LoadString(std::string_view ini, bool isRelay)
+  Config::LoadConfigData(std::string_view ini, std::optional<fs::path> filename, bool isRelay)
   {
     auto params = MakeGenParams();
     params->isRelay = isRelay;
@@ -1366,7 +1376,18 @@ namespace llarp
     ConfigDefinition conf{isRelay};
     initializeConfig(conf, *params);
 
+    for (const auto& item : m_Additional)
+    {
+      conf.addConfigValue(item[0], item[1], item[2]);
+    }
+
     m_Parser.Clear();
+
+    if (filename)
+      m_Parser.Filename(*filename);
+    else
+      m_Parser.Filename(fs::path{});
+
     if (not m_Parser.LoadFromStr(ini))
       return false;
 
@@ -1377,6 +1398,8 @@ namespace llarp
       }
     });
 
+    LoadOverrides(conf);
+
     conf.process();
 
     return true;
@@ -1385,37 +1408,24 @@ namespace llarp
   bool
   Config::Load(std::optional<fs::path> fname, bool isRelay)
   {
-    if (not fname.has_value())
-      return LoadDefault(isRelay);
-    try
+    std::vector<char> ini{};
+    if (fname)
     {
-      auto params = MakeGenParams();
-      params->isRelay = isRelay;
-      params->defaultDataDir = m_DataDir;
-
-      ConfigDefinition conf{isRelay};
-      initializeConfig(conf, *params);
-      m_Parser.Clear();
-      if (!m_Parser.LoadFile(*fname))
-      {
+      if (not fs::exists(*fname))
         return false;
-      }
-      LoadOverrides();
-
-      m_Parser.IterAll([&](std::string_view section, const SectionValues_t& values) {
-        for (const auto& pair : values)
-        {
-          conf.addConfigValue(section, pair.first, pair.second);
-        }
-      });
-      conf.process();
-      return true;
-    }
-    catch (const std::exception& e)
-    {
-      LogError("Error trying to init and parse config from file: ", e.what());
-      return false;
+      fs::ifstream inf{*fname, std::ios::in | std::ios::binary};
+      auto sz = inf.seekg(0, std::ios::end).tellg();
+      inf.seekg(0, std::ios::beg);
+      ini.resize(sz);
+      inf.read(ini.data(), ini.size());
     }
+    return LoadConfigData(std::string_view{ini.data(), ini.size()}, fname, isRelay);
+  }
+
+  bool
+  Config::LoadString(std::string_view ini, bool isRelay)
+  {
+    return LoadConfigData(ini, std::nullopt, isRelay);
   }
 
   bool

llarp/config/config.hpp

@@ -295,8 +295,12 @@ namespace llarp
     bool
     LoadDefault(bool isRelay);
 
+    bool
+    LoadConfigData(
+        std::string_view ini, std::optional<fs::path> fname = std::nullopt, bool isRelay = false);
+
     void
-    LoadOverrides();
+    LoadOverrides(ConfigDefinition& conf) const;
 
     std::vector<std::array<std::string, 3>> m_Additional;
     ConfigParser m_Parser;

llarp/config/ini.cpp

@@ -17,7 +17,7 @@ namespace llarp
   {
     {
       std::ifstream f(fname, std::ios::in | std::ios::binary);
-      if (!f.is_open())
+      if (not f.is_open())
         return false;
       f.seekg(0, std::ios::end);
       m_Data.resize(f.tellg());

llarp/config/ini.hpp

@@ -47,6 +47,12 @@ namespace llarp
     void
     Save();
 
+    inline void
+    Filename(fs::path f)
+    {
+      m_FileName = f;
+    };
+
    private:
     bool
     Parse();

llarp/dns/nm_platform.cpp

@@ -12,9 +12,6 @@ using namespace std::literals;
 
 namespace llarp::dns::nm
 {
-  Platform::Platform()
-  {}
-
   void
   Platform::set_resolver(std::string, llarp::SockAddr, bool)
   {