|
|
|
@ -300,9 +300,9 @@ namespace llarp
|
|
|
|
throw std::invalid_argument{"duplicate strict connect snode: " + value};
|
|
|
|
throw std::invalid_argument{"duplicate strict connect snode: " + value};
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Comment{
|
|
|
|
Comment{
|
|
|
|
"Public key of a router which will act as a pinned first-hop. This may be used to",
|
|
|
|
"Public keys of routers which will act as pinned first-hops. This may be used to",
|
|
|
|
"provide a trusted router (consider that you are not fully anonymous with your",
|
|
|
|
"provide a trusted router (consider that you are not fully anonymous with your",
|
|
|
|
"first hop).",
|
|
|
|
"first hop). This REQUIRES two or more nodes to be specified.",
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
conf.defineOption<std::string>(
|
|
|
|
conf.defineOption<std::string>(
|
|
|
|
@ -459,9 +459,8 @@ namespace llarp
|
|
|
|
"owned-range",
|
|
|
|
"owned-range",
|
|
|
|
MultiValue,
|
|
|
|
MultiValue,
|
|
|
|
Comment{
|
|
|
|
Comment{
|
|
|
|
"When in exit mode announce we allow a private range in our introset"
|
|
|
|
"When in exit mode announce we allow a private range in our introset. For example:",
|
|
|
|
"exmaple:",
|
|
|
|
" owned-range=10.0.0.0/24",
|
|
|
|
"owned-range=10.0.0.0/24",
|
|
|
|
|
|
|
|
},
|
|
|
|
},
|
|
|
|
[this](std::string arg) {
|
|
|
|
[this](std::string arg) {
|
|
|
|
IPRange range;
|
|
|
|
IPRange range;
|
|
|
|
@ -475,12 +474,17 @@ namespace llarp
|
|
|
|
"traffic-whitelist",
|
|
|
|
"traffic-whitelist",
|
|
|
|
MultiValue,
|
|
|
|
MultiValue,
|
|
|
|
Comment{
|
|
|
|
Comment{
|
|
|
|
"List of ip traffic whitelist, anything not specified will be dropped by us."
|
|
|
|
"Adds an IP traffic type whitelist; can be specified multiple times. If any are",
|
|
|
|
"examples:",
|
|
|
|
"specified then only matched traffic will be allowed and all other traffic will be",
|
|
|
|
"tcp for all tcp traffic regardless of port",
|
|
|
|
"dropped. Examples:",
|
|
|
|
"0x69 for all packets using ip protocol 0x69"
|
|
|
|
" traffic-whitelist=tcp",
|
|
|
|
"udp/53 for udp port 53",
|
|
|
|
"would allow all TCP/IP packets (regardless of port);",
|
|
|
|
"tcp/smtp for smtp port",
|
|
|
|
" traffic-whitelist=0x69",
|
|
|
|
|
|
|
|
"would allow IP traffic with IP protocol 0x69;",
|
|
|
|
|
|
|
|
" traffic-whitelist=udp/53",
|
|
|
|
|
|
|
|
"would allow UDP port 53; and",
|
|
|
|
|
|
|
|
" traffic-whitelist=tcp/smtp",
|
|
|
|
|
|
|
|
"would allow TCP traffic on the standard smtp port (21).",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
[this](std::string arg) {
|
|
|
|
[this](std::string arg) {
|
|
|
|
if (not m_TrafficPolicy)
|
|
|
|
if (not m_TrafficPolicy)
|
|
|
|
@ -497,9 +501,12 @@ namespace llarp
|
|
|
|
MultiValue,
|
|
|
|
MultiValue,
|
|
|
|
Comment{
|
|
|
|
Comment{
|
|
|
|
"Specify a `.loki` address and an optional ip range to use as an exit broker.",
|
|
|
|
"Specify a `.loki` address and an optional ip range to use as an exit broker.",
|
|
|
|
"Example:",
|
|
|
|
"Examples:",
|
|
|
|
"exit-node=whatever.loki # maps all exit traffic to whatever.loki",
|
|
|
|
" exit-node=whatever.loki",
|
|
|
|
"exit-node=stuff.loki:100.0.0.0/24 # maps 100.0.0.0/24 to stuff.loki",
|
|
|
|
"would map all exit traffic through whatever.loki; and",
|
|
|
|
|
|
|
|
" exit-node=stuff.loki:100.0.0.0/24",
|
|
|
|
|
|
|
|
"would map the IP range 100.0.0.0/24 through stuff.loki.",
|
|
|
|
|
|
|
|
"This option can be specified multiple times (to map different IP ranges).",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
[this](std::string arg) {
|
|
|
|
[this](std::string arg) {
|
|
|
|
if (arg.empty())
|
|
|
|
if (arg.empty())
|
|
|
|
@ -580,10 +587,10 @@ namespace llarp
|
|
|
|
Default{true},
|
|
|
|
Default{true},
|
|
|
|
Comment{
|
|
|
|
Comment{
|
|
|
|
"Enable / disable automatic route configuration.",
|
|
|
|
"Enable / disable automatic route configuration.",
|
|
|
|
"When this is enabled and an exit is used Lokinet will automatically configure "
|
|
|
|
"When this is enabled and an exit is used Lokinet will automatically configure the",
|
|
|
|
"operating system routes to route traffic through the exit node.",
|
|
|
|
"operating system routes to route public internet traffic through the exit node.",
|
|
|
|
"This is enabled by default, but can be disabled to perform advanced exit routing "
|
|
|
|
"This is enabled by default, but can be disabled if advanced/manual exit routing",
|
|
|
|
"configuration manually."},
|
|
|
|
"configuration is desired."},
|
|
|
|
AssignmentAcceptor(m_EnableRoutePoker));
|
|
|
|
AssignmentAcceptor(m_EnableRoutePoker));
|
|
|
|
|
|
|
|
|
|
|
|
conf.defineOption<bool>(
|
|
|
|
conf.defineOption<bool>(
|
|
|
|
@ -593,8 +600,8 @@ namespace llarp
|
|
|
|
Default{true},
|
|
|
|
Default{true},
|
|
|
|
Comment{
|
|
|
|
Comment{
|
|
|
|
"Enable / disable route configuration blackholes.",
|
|
|
|
"Enable / disable route configuration blackholes.",
|
|
|
|
"When enabled lokinet will drop ip4 and ip6 not included in exit config.",
|
|
|
|
"When enabled lokinet will drop IPv4 and IPv6 traffic (when in exit mode) that is not",
|
|
|
|
"Enabled by default."},
|
|
|
|
"handled in the exit configuration. Enabled by default."},
|
|
|
|
AssignmentAcceptor(m_BlackholeRoutes));
|
|
|
|
AssignmentAcceptor(m_BlackholeRoutes));
|
|
|
|
|
|
|
|
|
|
|
|
conf.defineOption<std::string>(
|
|
|
|
conf.defineOption<std::string>(
|
|
|
|
@ -602,7 +609,7 @@ namespace llarp
|
|
|
|
"ifname",
|
|
|
|
"ifname",
|
|
|
|
Comment{
|
|
|
|
Comment{
|
|
|
|
"Interface name for lokinet traffic. If unset lokinet will look for a free name",
|
|
|
|
"Interface name for lokinet traffic. If unset lokinet will look for a free name",
|
|
|
|
"lokinetN, starting at 0 (e.g. lokinet0, lokinet1, ...).",
|
|
|
|
"matching 'lokinetN', starting at N=0 (e.g. lokinet0, lokinet1, ...).",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
AssignmentAcceptor(m_ifname));
|
|
|
|
AssignmentAcceptor(m_ifname));
|
|
|
|
|
|
|
|
|
|
|
|
@ -626,10 +633,10 @@ namespace llarp
|
|
|
|
"ip6-range",
|
|
|
|
"ip6-range",
|
|
|
|
ClientOnly,
|
|
|
|
ClientOnly,
|
|
|
|
Comment{
|
|
|
|
Comment{
|
|
|
|
"For all ipv6 exit traffic you will use this as the base address bitwised or'd with "
|
|
|
|
"For all IPv6 exit traffic you will use this as the base address bitwised or'd with ",
|
|
|
|
"the v4 address in use.",
|
|
|
|
"the v4 address in use.",
|
|
|
|
"To disable ipv6 set this to an empty value.",
|
|
|
|
"To disable ipv6 set this to an empty value.",
|
|
|
|
"!!! WARNING !!! Disabling ipv6 tunneling when you have ipv6 routes WILL lead to "
|
|
|
|
"!!! WARNING !!! Disabling ipv6 tunneling when you have ipv6 routes WILL lead to ",
|
|
|
|
"de-anonymization as lokinet will no longer carry your ipv6 traffic.",
|
|
|
|
"de-anonymization as lokinet will no longer carry your ipv6 traffic.",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
IP6RangeDefault,
|
|
|
|
IP6RangeDefault,
|
|
|
|
@ -720,9 +727,13 @@ namespace llarp
|
|
|
|
ClientOnly,
|
|
|
|
ClientOnly,
|
|
|
|
MultiValue,
|
|
|
|
MultiValue,
|
|
|
|
Comment{
|
|
|
|
Comment{
|
|
|
|
"Specify SRV Records for services hosted on the SNApp",
|
|
|
|
"Specify SRV Records for services hosted on the SNApp for protocols that use SRV",
|
|
|
|
"for more info see https://docs.loki.network/Lokinet/Guides/HostingSNApps/",
|
|
|
|
"records for service discovery. Each line specifies a single SRV record as:",
|
|
|
|
"srv=_service._protocol priority weight port target.loki",
|
|
|
|
" srv=_service._protocol priority weight port target.loki",
|
|
|
|
|
|
|
|
"and can be specified multiple times as needed.",
|
|
|
|
|
|
|
|
"For more info see",
|
|
|
|
|
|
|
|
"https://docs.oxen.io/products-built-on-oxen/lokinet/snapps/hosting-snapps",
|
|
|
|
|
|
|
|
"and general description of DNS SRV record configuration.",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
[this](std::string arg) {
|
|
|
|
[this](std::string arg) {
|
|
|
|
llarp::dns::SRVData newSRV;
|
|
|
|
llarp::dns::SRVData newSRV;
|
|
|
|
@ -737,8 +748,8 @@ namespace llarp
|
|
|
|
"path-alignment-timeout",
|
|
|
|
"path-alignment-timeout",
|
|
|
|
ClientOnly,
|
|
|
|
ClientOnly,
|
|
|
|
Comment{
|
|
|
|
Comment{
|
|
|
|
"time in seconds how long to wait for a path to align to pivot routers",
|
|
|
|
"How long to wait (in seconds) for a path to align to a pivot router when establishing",
|
|
|
|
"if not provided a sensible default will be used",
|
|
|
|
"a path through the network to a remote .loki address.",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
[this](int val) {
|
|
|
|
[this](int val) {
|
|
|
|
if (val <= 0)
|
|
|
|
if (val <= 0)
|
|
|
|
@ -753,9 +764,10 @@ namespace llarp
|
|
|
|
ClientOnly,
|
|
|
|
ClientOnly,
|
|
|
|
Default{fs::path{params.defaultDataDir / "addrmap.dat"}},
|
|
|
|
Default{fs::path{params.defaultDataDir / "addrmap.dat"}},
|
|
|
|
Comment{
|
|
|
|
Comment{
|
|
|
|
"persist mapped ephemeral addresses to a file",
|
|
|
|
"If given this specifies a file in which to record mapped local tunnel addresses so",
|
|
|
|
"on restart the mappings will be loaded so that ip addresses will not be mapped to a "
|
|
|
|
"the same local address will be used for the same lokinet address on reboot. If this",
|
|
|
|
"different address",
|
|
|
|
"is not specified then the local IP of remote lokinet targets will not persist across",
|
|
|
|
|
|
|
|
"restarts of lokinet.",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
[this](fs::path arg) {
|
|
|
|
[this](fs::path arg) {
|
|
|
|
if (arg.empty())
|
|
|
|
if (arg.empty())
|
|
|
|
@ -879,7 +891,7 @@ namespace llarp
|
|
|
|
"on systems which use resolveconf)",
|
|
|
|
"on systems which use resolveconf)",
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
// forwad the rest to libunbound
|
|
|
|
// forward the rest to libunbound
|
|
|
|
conf.addUndeclaredHandler("dns", [this](auto, std::string_view key, std::string_view val) {
|
|
|
|
conf.addUndeclaredHandler("dns", [this](auto, std::string_view key, std::string_view val) {
|
|
|
|
m_ExtraOpts.emplace(key, val);
|
|
|
|
m_ExtraOpts.emplace(key, val);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
@ -1150,7 +1162,7 @@ namespace llarp
|
|
|
|
RelayOnly,
|
|
|
|
RelayOnly,
|
|
|
|
Default{true},
|
|
|
|
Default{true},
|
|
|
|
Comment{
|
|
|
|
Comment{
|
|
|
|
"Whether or not we should talk to lokid. Must be enabled for staked routers.",
|
|
|
|
"Whether or not we should talk to oxend. Must be enabled for staked routers.",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
AssignmentAcceptor(whitelistRouters));
|
|
|
|
AssignmentAcceptor(whitelistRouters));
|
|
|
|
|
|
|
|
|
|
|
|
@ -1159,8 +1171,8 @@ namespace llarp
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
throw std::invalid_argument(
|
|
|
|
throw std::invalid_argument(
|
|
|
|
"the [lokid]:jsonrpc option is no longer supported; please use the [lokid]:rpc config "
|
|
|
|
"the [lokid]:jsonrpc option is no longer supported; please use the [lokid]:rpc config "
|
|
|
|
"option instead with lokid's lmq-local-control address -- typically a value such as "
|
|
|
|
"option instead with oxend's lmq-local-control address -- typically a value such as "
|
|
|
|
"rpc=ipc:///var/lib/loki/lokid.sock or rpc=ipc:///home/snode/.loki/lokid.sock");
|
|
|
|
"rpc=ipc:///var/lib/oxen/oxend.sock or rpc=ipc:///home/snode/.oxen/oxend.sock");
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
conf.defineOption<std::string>(
|
|
|
|
conf.defineOption<std::string>(
|
|
|
|
@ -1168,12 +1180,12 @@ namespace llarp
|
|
|
|
"rpc",
|
|
|
|
"rpc",
|
|
|
|
RelayOnly,
|
|
|
|
RelayOnly,
|
|
|
|
Comment{
|
|
|
|
Comment{
|
|
|
|
"lokimq control address for for communicating with lokid. Depends on lokid's",
|
|
|
|
"oxenmq control address for for communicating with oxend. Depends on oxend's",
|
|
|
|
"lmq-local-control configuration option. By default this value should be",
|
|
|
|
"lmq-local-control configuration option. By default this value should be",
|
|
|
|
"ipc://LOKID-DATA-DIRECTORY/lokid.sock, such as:",
|
|
|
|
"ipc://OXEND-DATA-DIRECTORY/oxend.sock, such as:",
|
|
|
|
" rpc=ipc:///var/lib/loki/lokid.sock",
|
|
|
|
" rpc=ipc:///var/lib/oxen/oxend.sock",
|
|
|
|
" rpc=ipc:///home/USER/.loki/lokid.sock",
|
|
|
|
" rpc=ipc:///home/USER/.oxen/oxend.sock",
|
|
|
|
"but can use (non-default) TCP if lokid is configured that way:",
|
|
|
|
"but can use (non-default) TCP if oxend is configured that way:",
|
|
|
|
" rpc=tcp://127.0.0.1:5678",
|
|
|
|
" rpc=tcp://127.0.0.1:5678",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
[this](std::string arg) { lokidRPCAddr = oxenmq::address(arg); });
|
|
|
|
[this](std::string arg) { lokidRPCAddr = oxenmq::address(arg); });
|
|
|
|
@ -1202,7 +1214,7 @@ namespace llarp
|
|
|
|
"add-node",
|
|
|
|
"add-node",
|
|
|
|
MultiValue,
|
|
|
|
MultiValue,
|
|
|
|
Comment{
|
|
|
|
Comment{
|
|
|
|
"Specify a bootstrap file containing a signed RouterContact of a service node",
|
|
|
|
"Specify a bootstrap file containing a list of signed RouterContacts of service nodes",
|
|
|
|
"which can act as a bootstrap. Can be specified multiple times.",
|
|
|
|
"which can act as a bootstrap. Can be specified multiple times.",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
[this](std::string arg) {
|
|
|
|
[this](std::string arg) {
|
|
|
|
@ -1292,9 +1304,9 @@ namespace llarp
|
|
|
|
m_UniqueHopsNetmaskSize = arg;
|
|
|
|
m_UniqueHopsNetmaskSize = arg;
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Comment{
|
|
|
|
Comment{
|
|
|
|
"Netmask for router path selection; each router must be from a distinct IP subnet "
|
|
|
|
"Netmask for router path selection; each router must be from a distinct IPv4 subnet",
|
|
|
|
"of the given size.",
|
|
|
|
"of the given size.",
|
|
|
|
"E.g. 16 ensures that all routers are using distinct /16 IP addresses."});
|
|
|
|
"E.g. 16 ensures that all routers are using IPs from distinct /16 IP ranges."});
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef WITH_GEOIP
|
|
|
|
#ifdef WITH_GEOIP
|
|
|
|
conf.defineOption<std::string>(
|
|
|
|
conf.defineOption<std::string>(
|
|
|
|
@ -1306,9 +1318,11 @@ namespace llarp
|
|
|
|
m_ExcludeCountries.emplace(lowercase_ascii_string(std::move(arg)));
|
|
|
|
m_ExcludeCountries.emplace(lowercase_ascii_string(std::move(arg)));
|
|
|
|
},
|
|
|
|
},
|
|
|
|
Comment{
|
|
|
|
Comment{
|
|
|
|
"exclude a country given its 2 letter country code from being used in path builds",
|
|
|
|
"Exclude a country given its 2 letter country code from being used in path builds.",
|
|
|
|
"e.g. exclude-country=DE",
|
|
|
|
"For example:",
|
|
|
|
"can be listed multiple times to exclude multiple countries"});
|
|
|
|
" exclude-country=DE",
|
|
|
|
|
|
|
|
"would avoid building paths through routers with IPs in Germany.",
|
|
|
|
|
|
|
|
"This option can be specified multiple times to exclude multiple countries"});
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -1399,6 +1413,7 @@ namespace llarp
|
|
|
|
params->isRelay = isRelay;
|
|
|
|
params->isRelay = isRelay;
|
|
|
|
params->defaultDataDir = m_DataDir;
|
|
|
|
params->defaultDataDir = m_DataDir;
|
|
|
|
ConfigDefinition conf{isRelay};
|
|
|
|
ConfigDefinition conf{isRelay};
|
|
|
|
|
|
|
|
addBackwardsCompatibleConfigOptions(conf);
|
|
|
|
initializeConfig(conf, *params);
|
|
|
|
initializeConfig(conf, *params);
|
|
|
|
|
|
|
|
|
|
|
|
for (const auto& item : m_Additional)
|
|
|
|
for (const auto& item : m_Additional)
|
|
|
|
@ -1616,11 +1631,11 @@ namespace llarp
|
|
|
|
initializeConfig(def, *params);
|
|
|
|
initializeConfig(def, *params);
|
|
|
|
generateCommonConfigComments(def);
|
|
|
|
generateCommonConfigComments(def);
|
|
|
|
|
|
|
|
|
|
|
|
// lokid
|
|
|
|
// oxend
|
|
|
|
def.addSectionComments(
|
|
|
|
def.addSectionComments(
|
|
|
|
"lokid",
|
|
|
|
"lokid",
|
|
|
|
{
|
|
|
|
{
|
|
|
|
"Settings for communicating with lokid",
|
|
|
|
"Settings for communicating with oxend",
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
return def.generateINIConfig(true);
|
|
|
|
return def.generateINIConfig(true);
|
|
|
|
|
Jason Rhinelander
2 years ago