Archives/lokinet
2
0
Fork 0
mirror of https://github.com/oxen-io/lokinet.git synced 2024-11-17 15:25:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into debian/buster

Browse Source
This commit is contained in:
Jason Rhinelander 2020-10-02 23:38:42 -03:00
commit e1198f4dc4
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llarp/config/config.cpp
View File

@ -27,12 +27,13 @@ namespace llarp
constexpr int DefaultMinConnectionsForClient = 4; constexpr int DefaultMinConnectionsForClient = 4;
constexpr int DefaultMaxConnectionsForClient = 6; constexpr int DefaultMaxConnectionsForClient = 6;
constexpr int DefaultPublicPort = 1090;
void void
RouterConfig::defineConfigOptions(ConfigDefinition& conf, const ConfigGenParameters& params) RouterConfig::defineConfigOptions(ConfigDefinition& conf, const ConfigGenParameters& params)
{ {
constexpr int DefaultJobQueueSize = 1024 * 8; constexpr int DefaultJobQueueSize = 1024 * 8;
constexpr auto DefaultNetId = "lokinet"; constexpr auto DefaultNetId = "lokinet";
constexpr int DefaultPublicPort = 1090;
constexpr int DefaultWorkerThreads = 1; constexpr int DefaultWorkerThreads = 1;
constexpr int DefaultNetThreads = 1; constexpr int DefaultNetThreads = 1;
constexpr bool DefaultBlockBogons = true; constexpr bool DefaultBlockBogons = true;
@ -443,8 +444,19 @@ namespace llarp
m_OutboundLink = LinkInfoFromINIValues("*", arg); m_OutboundLink = LinkInfoFromINIValues("*", arg);
}); });
if (std::string best_if; GetBestNetIF(best_if))
m_InboundLinks.push_back(LinkInfoFromINIValues(best_if, std::to_string(DefaultPublicPort)));
conf.addUndeclaredHandler( conf.addUndeclaredHandler(
"bind", [&](std::string_view, std::string_view name, std::string_view value) { "bind",
[&, defaulted = true](
std::string_view, std::string_view name, std::string_view value) mutable {
if (defaulted)
{
m_InboundLinks.clear(); // Clear the default
defaulted = false;
}
LinkInfo info = LinkInfoFromINIValues(name, value); LinkInfo info = LinkInfoFromINIValues(name, value);
if (info.port <= 0) if (info.port <= 0)