Commit Graph

339 Commits

Author SHA1 Message Date
Jeff
0e1e0aaef3
allow for relative file paths in config (#1432)
* llarp::Config constructor can take an empty fs::path now and it will default to fs::current_path
* llarp::ensureConfig now throws on fs error
* updates to daemon/main.cpp to reflect changes to llarp::ensureConfig's new throwability
* dowse parts of the code with holy water for the 0.8.1 tag
2020-10-30 09:38:17 -04:00
Jeff
f4e2f93c8e
use correct path for windows service (#1418) 2020-10-21 17:29:46 -04:00
Thomas Winget
a91bb35dbf
Some Windows fixes (#1415)
* Should fix some windows service issues

* fix return condition inversion

* Add some Trace level logging

also make the logger actually respect the log level you set.

* event loop should not queue things to itself...

at present, logic thread queue continues until it is empty, so
queueing things onto itself is just wasteful.

* call_later(foreach thing) is better than foreach thing (call later)

also if you already queued those things but they have not happened yet,
there is no sense to queue them to happen again.

* do not queue read on write finish, only on read finish

* failure to start DNS server should be proper startup failure.

without the DNS server working lokinet is...kinda pointless, right?

* format

* don't queue stuff to logic thread if in logic thread
the thing that clears the queue...clears it.  So you're just delaying and adding overhead.

* windows unbound thread sleep instead of just busy-waiting

also clang-format decided I can't have a blank line for some reason...

* fix unbound async worker on windows
2020-10-21 09:06:43 -04:00
Jeff
12eb32a816
add conf.d directory for config overrides (#1410)
* add conf.d directory for config overrides

* refactor llarp::Config

* add explicit constructor with datadir as parameter
* have all config files be passed as std::optional
* make Config::LoadDefault private and use std::optional in Config::Load to remove ambiguity
* update rest of codebase to reflect above changes

* fix pybind

* rename bootstrap config skipBootstrap to seednode as it's more descriptive
* make seednode configurable
* make pybind layer compile
* make pybind layer run
2020-10-21 08:58:08 -04:00
Jason Rhinelander
af6caf776a
Config file improvements (#1397)
* Config file API/comment improvements

API improvements:
=================

Make the config API use position-independent tag parameters (Required,
Default{123}, MultiValue) rather than a sequence of bools with
overloads.  For example, instead of:

    conf.defineOption<int>("a", "b", false, true, 123, [] { ... });

you now write:

    conf.defineOption<int>("a", "b", MultiValue, Default{123}, [] { ... });

The tags are:
- Required
- MultiValue
- Default{value}
plus new abilities (see below):
- Hidden
- RelayOnly
- ClientOnly
- Comment{"line1", "line2", "line3"}

Made option definition more powerful:
=====================================

- `Hidden` allows you to define an option that won't show up in the
  generated config file if it isn't set.

- `RelayOnly`/`ClientOnly` sets up an option that is only accepted and
  only shows up for relay or client configs.  (If neither is specified
  the option shows up in both modes).

- `Comment{...}` lets the option comments be specified as part of the
  defineOption.

Comment improvements
====================

- Rewrote comments for various options to expand on details.
- Inlined all the comments with the option definitions.
- Several options that were missing comments got comments added.
- Made various options for deprecated and or internal options hidden by
  default so that they don't show up in a default config file.
- show the section comment (but not option comments) *after* the
  [section] tag instead of before it as it makes more sense that way
  (particularly for the [bind] section which has a new long comment to
  describe how it works).

Disable profiling by default
============================

We had this weird state where we use and store profiling by default but
never *load* it when starting up.  This commit makes us just not use
profiling at all unless explicitly enabled.

Other misc changes:
===================

- change default worker threads to 0 (= num cpus) instead of 1, and fix
  it to allow 0.
- Actually apply worker-threads option
- fixed default data-dir value erroneously having quotes around it
- reordered ifname/ifaddr/mapaddr (was previously mapaddr/ifaddr/ifname)
  as mapaddr is a sort of specialization of ifaddr and so makes more
  sense to come after it (particularly because it now references ifaddr
  in its help message).
- removed peer-stats option (since we always require it for relays and
  never use it for clients)
- removed router profiles filename option (this doesn't need to be
  configurable)
- removed defunct `service-node-seed` option
- Change default logging output file to "" (which means stdout), and
  also made "-" work for stdout.

* Router hive compilation fixes

* Comments for SNApp SRV settings in ini file

* Add extra blank line after section comments

* Better deprecated option handling

Allow {client,relay}-only options in {relay,client} configs to be
specified as implicitly deprecated options: they warn, and don't set
anything.

Add an explicit `Deprecated` tag and move deprecated option handling
into definition.cpp.

* Move backwards compat options into section definitions

Keep the "addBackwardsCompatibleConfigOptions" only for options in
sections that no longer exist.

* Fix INI parsing issues & C++17-ify

- don't allow inline comments because it seems they aren't allowed in
ini formats in general, and is going to cause problems if there is a
comment character in a value (e.g. an exit auth string).  Additionally
it was breaking on a line such as:

    # some comment; see?

because it was treating only `; see?` as the comment and then producing
an error message about the rest of the line being invalid.

- make section parsing stricter: the `[` and `]` have to be at the
beginning at end of the line now (after stripping whitespace).

- Move whitespace stripping to the top since everything in here does it.

- chop off string_view suffix/prefix rather than maintaining position
values

- fix potential infinite loop/segfault when given a line such as `]foo[`

* Make config parsing failure fatal

Load() LogError's and returns false on failure, so we weren't aborting
on config file errors.

* Formatting: allow `{}` for empty functions/structs

Instead of using two lines when empty:

    {
    }

* Make default dns bind 127.0.0.1 on non-Linux

* Don't show empty section; fix tests

We can conceivably have sections that only make sense for clients or
relays, and so want to completely omit that section if we have no
options for the type of config being generated.

Also fixes missing empty lines between tests.

Co-authored-by: Thomas Winget <tewinget@gmail.com>
2020-10-07 18:22:58 -04:00
Jeff
03d6f191d1
add status command to lokinet-vpn (#1393) 2020-10-05 11:50:59 -04:00
Jason Rhinelander
63a876cc78
Allow -DWITH_SETCAP=OFF to disable setcap during make install (#1363)
The debs don't want it (and so this will save needing to patch it out),
nor do you need it if running via a systemd service file that sets the
capabilities.
2020-09-22 17:45:42 -04:00
Rick V
7136f77c2e
allow running lokinet as root on windows (#1347)
* - allow running lokinet as root on windows
  ($PROGRAMDATA/.lokinet/lokinet.ini)
- oops forgot to eat my own command line args

* cursed windows

* now that we eat our own startup options the entry in cxxopts is fully
ded

* aha our command line options get smashed up

* revert plus DRY fix
2020-09-17 15:20:50 -04:00
Jeff
dfd8df5e7f
add uninstall target (#1340)
* add uninstall target

* * redo cmake uninstall
* remove lokinet-vpn python script
* don't install lokinet-vpn twice
2020-09-09 12:06:57 -04:00
jeff
bbc749294e fix windows build typo 2020-08-27 16:48:27 +00:00
Jeff Becker
21bc3bd9a0
format 2020-08-24 20:35:31 -04:00
jeff
f6f56029d3
working netlink route poker 2020-08-24 20:23:26 -04:00
jeff
099831719a
update macos command for default route poker. 2020-08-24 20:21:18 -04:00
jeff
528340e056
dont include sys/wait.h on windows 2020-08-24 20:21:18 -04:00
jeff
d0374ce083
windows does not have fork/wait 2020-08-24 20:21:18 -04:00
jeff
6d91ac8e4e
rename r flag to router 2020-08-24 20:21:17 -04:00
jeff
f5e4d8bd1b
execv needs program name as first argument 2020-08-24 20:19:52 -04:00
jeff
0ee1c4a60a
use full path for ip on linux and report exit code 2020-08-24 20:19:51 -04:00
jeff
bc8e867dfb
use exec for lokinet-vpn 2020-08-24 20:19:51 -04:00
Rick V
f283c565e7
make x.x.x.y+1 the default router on windows 2020-08-24 20:19:50 -04:00
Jeff Becker
400f5d3902
windows uses multiple commands for default route. 2020-08-24 20:19:50 -04:00
Jeff Becker
d1abee84d1
windows route hack because lol windows 2020-08-24 20:19:50 -04:00
Jeff Becker
b2e5a178a4
verbose logging of executed commands 2020-08-24 20:19:50 -04:00
Jeff Becker
d9d63ba14b
add metric to windows 2020-08-24 20:19:50 -04:00
Jeff Becker
876b8db1a1
windows fixes 2020-08-24 20:19:50 -04:00
Jeff Becker
dde6bbeeb8
fix for windows as it is cursed 2020-08-24 20:19:50 -04:00
Jeff Becker
88de4c6f91
windows fixes 2020-08-24 20:19:50 -04:00
Jeff Becker
65b9b55335
fixes for windows 2020-08-24 20:19:50 -04:00
Jeff Becker
7e562a5b37
add netmask for macos 2020-08-24 20:19:49 -04:00
Jeff Becker
49eb42d63f
formatting and typo fix 2020-08-24 20:19:49 -04:00
Jeff Becker
9e24a5bfca
add check for no default route on down
fix macos bits for down
install lokinet-vpn with cmake
2020-08-24 20:19:49 -04:00
Jeff Becker
c49e11031a
fix variable name 2020-08-24 20:19:49 -04:00
Jeff Becker
778792f8fc
fix compile error on macos and exclude excluded interface 2020-08-24 20:19:49 -04:00
Jeff Becker
c2e484d14b
fix apple build 2020-08-24 20:19:49 -04:00
Jeff Becker
847fdb4f6b
add initial macos bits for lokinet-vpn (apple made macos so that man may suffer) 2020-08-24 20:19:49 -04:00
Jeff Becker
34ffd8e869
dont put the "gateway" into the return value use the interface address instead because that is what we are looking for 2020-08-24 20:19:49 -04:00
Jeff Becker
45b6fcd7cb
forgot hunk 2020-08-24 20:19:49 -04:00
Jeff Becker
04392a5115
tweak windows bits so that they compile 2020-08-24 20:19:49 -04:00
Jeff Becker
36a2bc5d66
add forgotten array header 2020-08-24 20:19:48 -04:00
Jeff Becker
22e4aef4f9
initial windows platform specific bits for lokinet-vpn 2020-08-24 20:19:48 -04:00
Jeff Becker
37e16291cb
working on linux with root 2020-08-24 20:19:48 -04:00
Jeff Becker
a8239af73a
initial lokinet-vpn tool rewrite 2020-08-24 20:19:48 -04:00
Rick V
98241c6c1a this is what c-f v10 thinks it should look like 2020-08-13 12:06:57 -05:00
Rick V
59b8b1ba6d add service description 2020-08-12 20:00:54 -05:00
Rick V
7de4c509d7 haha lokinet is cursed now 2020-08-12 19:49:26 -05:00
Rick V
7bd3731e98 first draft of daemon control code 2020-08-12 15:27:39 -05:00
Rick V
d56706b626 more daemon fluff 2020-08-12 14:55:03 -05:00
Rick V
8c62a726c0 stupid trampoline to return control to lokinet
after SCM starts
2020-08-12 14:11:47 -05:00
Rick V
ca9984cc69 win32 daemon install/remove goo 2020-08-12 13:03:52 -05:00
Stephen Shelton
0f074cff8c
Remove ambguity WRT loading and passing of Config 2020-07-06 13:38:02 -06:00