temp commit

.vscode/settings.json

@@ -70,11 +70,8 @@
     "any": "cpp",
     "tuntap.h": "c",
     "hashtable": "cpp",
-    "crypto_stream_salsa20.h": "c",
-    "implementations.h": "c",
-    "stream_salsa20.h": "c",
-    "salsa20_xmm6int-sse2.h": "c",
-    "salsa20_ref.h": "c",
-    "salsa20_xmm6int-avx2.h": "c"
-  }
+    "__mutex_base": "cpp",
+    "iterator": "cpp"
+  },
+  "python.pythonPath": "/usr/local/bin/python3"
 }

include/llarp/logger.hpp

@@ -36,6 +36,9 @@ namespace llarp
     std::string nodeName;
     LogLevel minlevel = eLogInfo;
     std::ostream& out;
+
+    std::function< void(const std::string&) > customLog;
+
     llarp::util::Mutex access;
     Logger() : Logger(std::cout, "unnamed")
     {
@@ -173,15 +176,15 @@ namespace llarp
     LogAppend(ss, std::forward< TArgs >(args)...);
 #ifndef ANDROID
     ss << (char)27 << "[0;0m";
-    _glog.out << ss.str() << std::endl;
+    if(_glog.customLog)
+      _glog.customLog(ss.str());
+    else
+      _glog.out << ss.str() << std::endl;
 #else
     {
       tag = "LOKINET|" + tag;
       __android_log_write(loglev, tag.c_str(), ss.str().c_str());
     }
-#endif
-#ifdef SHADOW_TESTNET
-    _glog.out << "\n" << std::flush;
 #endif
   }
 }  // namespace llarp

include/llarp/service/context.hpp

@@ -72,9 +72,8 @@ namespace llarp
                     llarp::Addr &localPrivateIpAddr);
 
       bool
-      AddDefaultEndpoint(const std::string &ifaddr, const std::string &ifname,
-                         const std::string &remoteResovler,
-                         const std::string &localResolver);
+      AddDefaultEndpoint(
+          const std::unordered_multimap< std::string, std::string > &conf);
 
       bool
       AddEndpoint(const Config::section_t &conf, bool autostart = false);

llarp/router.cpp

@@ -902,7 +902,7 @@ llarp_router::InitServiceNode()
   llarp::LogInfo("accepting transit traffic");
   paths.AllowTransit();
   llarp_dht_allow_transit(dht);
-  return exitContext.AddExitEndpoint("default-connectivity", exitConf);
+  return exitContext.AddExitEndpoint("default-connectivity", netConf);
 }
 
 void
@@ -984,14 +984,7 @@ llarp_router::InitOutboundLink()
 bool
 llarp_router::CreateDefaultHiddenService()
 {
-  if(upstreamResolvers.size())
-    return hiddenServiceContext.AddDefaultEndpoint(defaultIfAddr, defaultIfName,
-                                                   upstreamResolvers.front(),
-                                                   resolverBindAddr);
-  else
-    return hiddenServiceContext.AddDefaultEndpoint(defaultIfAddr, defaultIfName,
-                                                   defaultUpstreamResolver,
-                                                   resolverBindAddr);
+  return hiddenServiceContext.AddDefaultEndpoint(netConf);
 }
 
 bool
@@ -1214,7 +1207,7 @@ namespace llarp
       }
       else
       {
-        self->exitConf.insert(std::make_pair(key, val));
+        self->netConf.emplace(key, val);
       }
     }
     else if(StrEq(section, "api"))

llarp/router.hpp

@@ -100,8 +100,8 @@ struct llarp_router
   std::string defaultIfAddr = "auto";
   std::string defaultIfName = "auto";
 
-  /// default exit config
-  llarp::exit::Context::Config_t exitConf;
+  /// default network config
+  std::unordered_multimap< std::string, std::string > netConf;
 
   bool
   ExitEnabled() const

llarp/service/context.cpp

@@ -207,18 +207,18 @@ namespace llarp
     }
 
     bool
-    Context::AddDefaultEndpoint(const std::string &ifaddr,
-                                const std::string &ifname,
-                                const std::string &remoteResolver,
-                                const std::string &localResolver)
+    Context::AddDefaultEndpoint(
+        const std::unordered_multimap< std::string, std::string > &conf)
     {
-      return AddEndpoint({"default",
-                          {{"type", "tun"},
-                           {"ifaddr", ifaddr},
-                           {"ifname", ifname},
-                           {"local-dns", localResolver},
-                           {"upstream-dns", remoteResolver}}},
-                         true);
+      Config::section_t cfg;
+      cfg.first = "default";
+      auto itr  = conf.begin();
+      while(itr != conf.end())
+      {
+        cfg.second.push_back({itr->first, itr->second});
+        ++itr;
+      }
+      return AddEndpoint(cfg, true);
     }
 
     bool