Archives/lokinet
2
0
Fork 0
mirror of https://github.com/oxen-io/lokinet.git synced 2024-11-02 03:40:12 +00:00
Code Issues Projects Releases Wiki Activity
6,832 Commits 25 Branches 59 Tags 39 MiB
2a9d041644
Commit Graph

273 Commits

Author SHA1 Message Date
Jeff Becker
c4b5b641bb
default to default data dir given by params instead 2020-05-04 13:14:46 -04:00
Jeff Becker
e33a1a2e0f
proper autodetect of ifname and ifaddr 2020-05-04 12:51:57 -04:00
Jason Rhinelander
4f09090c58 Add [network]:enabled to ignored settings list 
No one knows what this option does or did, but it is in some generated
config files.
 2020-05-04 13:02:28 -03:00
Jason Rhinelander
1d98632fd3
Merge pull request #1254 from majestrate/network-ifaddr-ifname-2020-05-04 
add ifname and ifaddr to network config parsing
 2020-05-04 12:52:37 -03:00
Jeff Becker
96a6d81380
add ifname and ifaddr to network config parsing 2020-05-04 11:44:56 -04:00
Jason Rhinelander
4be7b2c8a5
Merge pull request #1253 from notlesh/better-config-error-messages-2020-05-04 
Use more user-friendly error messages in config
 2020-05-04 12:44:32 -03:00
Stephen Shelton
f96fded525
Use more user-friendly error messages in config 2020-05-04 09:42:38 -06:00
Stephen Shelton
78eb0d976d
nonstd::optional -> std::optional 2020-05-04 09:21:26 -06:00
Jeff Becker
7c12347e80
upstream-dns -> upstream 2020-05-04 11:08:25 -04:00
Stephen Shelton
42a7bcd434
Less invasive fix for Addr 2020-05-04 11:08:25 -04:00
Stephen Shelton
15918ff1c9
log-- 2020-05-04 11:07:21 -04:00
Stephen Shelton
f2a26adcaa
Move all [endpoint] options to [network] 2020-05-04 11:07:21 -04:00
Stephen Shelton
559610ec94
Properly handle empty config default values 2020-05-04 11:07:21 -04:00
Stephen Shelton
dd9ab0f1d5
Remove ability to have multiple endpoints/snodes from config 2020-05-04 11:07:21 -04:00
Stephen Shelton
b7451b7632
Rip out tag, prefetch tags/addrs from Endpoint 2020-05-04 11:06:47 -04:00
Stephen Shelton
1d12e9d14e
Lokinet_INIT() is already checked in main(), so remove from config 2020-05-04 11:06:47 -04:00
Stephen Shelton
3198a8b139
Handle blacklist-snode validation in config 2020-05-04 11:06:47 -04:00
Stephen Shelton
2730491641
Remove NetworkConfig's freehand options 2020-05-04 11:06:18 -04:00
Stephen Shelton
2bc908cd40
Remove [dns]:local-dns in favor of [dns]:bind 2020-05-04 11:05:52 -04:00
Stephen Shelton
779658edd0
Refactor ExitEndpoint's config, mv dns ops from [network] to [dns] 2020-05-04 11:05:51 -04:00
Stephen Shelton
21ad442b55
Remove NetConfig_t 2020-05-04 11:05:51 -04:00
Stephen Shelton
df01770466
Rename SnappConfig -> EndpointConfig 2020-05-04 11:05:51 -04:00
Stephen Shelton
93b35c92a7
Eradicate service::Config 2020-05-04 11:05:51 -04:00
Stephen Shelton
cbd93fcb09
Find "-snapp" conf sections, add more snapp conf options 2020-05-04 11:03:53 -04:00
Jason Rhinelander
3efaf9ff76 Add string header (reportedly needed for libc++) 2020-05-01 19:41:20 -03:00
Jason Rhinelander
5cf2126bb9 make format 2020-05-01 19:25:32 -03:00
Jason Rhinelander
1697bf90fe C++17 
Compiles with C++17, replaces ghc::filesystem with std::filesystem,
nonstd::optional with std::optional, and llarp::string_view with
std::string_view.
 2020-05-01 17:43:27 -03:00
Stephen Shelton
f0f9b1abdd
Allow 0 as outbound port 2020-04-29 14:23:50 -06:00
Stephen Shelton
f8439dab61
Misc aesthetic tweaks 2020-04-29 14:19:48 -06:00
Stephen Shelton
7d83611a0a
Default outbound port to 0, not 1090 2020-04-29 14:19:35 -06:00
Stephen Shelton
c4de0f8493
Add more ignored config options 2020-04-29 13:42:06 -06:00
Stephen Shelton
517922e4c3
Reintroduce support for configurable key files 2020-04-29 13:41:39 -06:00
Stephen Shelton
320564d792
Specialize ConfigOption for bool to accept "truthy" / "falsy" values 2020-04-29 12:32:07 -06:00
Stephen Shelton
331770b348
Add ability to tolerate (ignore) old config options 
This allows us to explicitly ignore (with a warning) old options
that are no longer supported.
 2020-04-29 10:47:51 -06:00
Stephen Shelton
cdd4439cff
Temporary fix for [dns]bind and [dns]local-dns 2020-04-29 10:10:33 -06:00
Stephen Shelton
936fbb2424
Fix config not falling back to undeclared handler for missing option 2020-04-29 09:41:07 -06:00
Stephen Shelton
526b1320b7
Some maybe-fixes for RouterHive post config cleanup 2020-04-24 11:18:25 -06:00
Stephen Shelton
dfcf8fb62e
Update RouterHive to reflect config changes 2020-04-07 17:50:50 -06:00
Stephen Shelton
de8e44ba21
Re-apply clang-format rules after rebasing 2020-04-07 14:41:11 -06:00
Stephen Shelton
a66f502ed6
Remove [netdb] conf and place it under data-dir 
This does three things:

1) Remove the [netdb] conf section,
2) Rename the subdir 'netdb' -> 'nodedb'
3) Place 'nodedb' under 'data-dir'
 2020-04-07 14:28:23 -06:00
Stephen Shelton
be014175e9
Consolidate logging initialization logic 2020-04-07 14:27:31 -06:00
Stephen Shelton
6909e20588
Fix logging initialization and flush at program exit 2020-04-07 14:27:30 -06:00
Stephen Shelton
d3bcc05aa6
Organize some constants and default values 2020-04-07 14:26:32 -06:00
Stephen Shelton
da6bda15a1
Where did rc.signed come from?! 2020-04-07 14:26:31 -06:00
Stephen Shelton
7ea8d62640
Use fs::path over std::string for files 2020-04-07 14:26:30 -06:00
Stephen Shelton
7ce256d846
Prefer fs::path over std::string @ KeyManager 2020-04-07 14:25:51 -06:00
Stephen Shelton
0a9515a94a
Proper support for multiple values @ ConfigDefinition 2020-04-07 14:25:20 -06:00
Stephen Shelton
28c1ca9c7a
Handle missing IP address in conf properly 2020-04-07 14:25:19 -06:00
Stephen Shelton
0697d57190
Important TODO 2020-04-07 14:25:19 -06:00
Stephen Shelton
0e5e9a1222
Silently ignore config file if it exists already 2020-04-07 14:25:19 -06:00
Stephen Shelton
1fc7c61d1f
Share common conf comments for client and relay 2020-04-07 14:24:50 -06:00
Stephen Shelton
3739fc1d70
Reinstate multi-valued option 2020-04-07 14:24:50 -06:00
Stephen Shelton
a6787657be
Refactor config comments to take list of strings 2020-04-07 14:24:49 -06:00
Stephen Shelton
a8671cf9c7
Rename config classes for clarity 
ConfigDefinition -> OptionDefiniton
Configuration -> ConfigDefinition
 2020-04-07 14:24:49 -06:00
Stephen Shelton
f250b7adcb
Remove pidfile support 2020-04-07 14:24:48 -06:00
Stephen Shelton
4f77080f75
Remove optional<> from block-bogons 2020-04-07 14:23:53 -06:00
Stephen Shelton
4d053231d3
Define config defaults as constexpr 2020-04-07 14:23:32 -06:00
Stephen Shelton
adfcbd1d0b
Slight cleanup of k:v option maps 2020-04-07 14:23:11 -06:00
Stephen Shelton
e06c2e4502
Check that [router]min-connections <= [router]max 2020-04-07 14:22:53 -06:00
Stephen Shelton
6fd270ba09
Rip out link type spec and factory 
We only support IWP now, so this is all effectively dead code.
 2020-04-07 14:22:53 -06:00
Stephen Shelton
9e850705b4
Add 'AssignmentAcceptor' convenience for simple config acceptors 2020-04-07 14:20:59 -06:00
Stephen Shelton
f2a8dd10ce
Modernize Snapp config 2020-04-07 14:20:59 -06:00
Stephen Shelton
733efbab40
Reflect removal of accessors on config structs 2020-04-07 14:20:31 -06:00
Stephen Shelton
c8c940b0f5
Replace individual file locations with dataDir 2020-04-07 14:19:21 -06:00
Stephen Shelton
5d0b53e1be
Remove environment variable support in config 2020-04-07 14:19:21 -06:00
Stephen Shelton
05257126fe
Make distinction between config dir and data dir 2020-04-07 14:18:14 -06:00
Stephen Shelton
923e73f693
Plumb isRelay CLI arg through to config 2020-04-07 14:17:13 -06:00
Stephen Shelton
028e55e997
Remove pre-refactor config test 2020-04-07 14:14:33 -06:00
Stephen Shelton
6301fefd43
Add router-specific config comments 2020-04-07 14:14:01 -06:00
Stephen Shelton
5b520a4dff
Simplify connection limit constants 2020-04-07 14:13:27 -06:00
Stephen Shelton
14e7789847
Add padding to config file generated output 2020-04-07 14:12:31 -06:00
Stephen Shelton
1273f11ce8
First pass at updating comments to lokinet config 2020-04-07 14:12:31 -06:00
Stephen Shelton
18ee23c2a3
Support for comments in config definition 2020-04-07 14:11:58 -06:00
Stephen Shelton
1653b73ee5
Clean up the logic around generating default confs 2020-04-07 14:11:57 -06:00
Stephen Shelton
c5ff672c79
Use 'undeclared handler' for multi-valued 'add-node' config option 2020-04-07 14:10:11 -06:00
Stephen Shelton
feacde7864
Hook up 'undeclared handlers' to mop up loosely-structured INI values 2020-04-07 14:10:11 -06:00
Stephen Shelton
9a1b7b20de
Add "undeclared value" handler to Configuration 2020-04-07 14:09:14 -06:00
Stephen Shelton
ffc58fcedb
Remove dead code (serverOptions) 2020-04-07 14:09:13 -06:00
Stephen Shelton
2e47262350
Demystify LinksConfig 2020-04-07 14:08:45 -06:00
Stephen Shelton
cd1e7713de
Clean up / consolidate config logging logic 2020-04-07 14:07:40 -06:00
Stephen Shelton
4c00c6238e
Join config definition and config parser 2020-04-07 14:06:10 -06:00
Stephen Shelton
653a650cf9
Fix typo 2020-04-07 14:05:11 -06:00
Stephen Shelton
9f0ae43149
Remove dead code 2020-04-07 14:05:11 -06:00
Stephen Shelton
d82f5e6b93
First pass at replacing config value logic 2020-04-07 14:04:36 -06:00
Stephen Shelton
69331f1571
Remove multiValued as an argument to ConfigDefinition 2020-04-07 14:01:45 -06:00
Stephen Shelton
f6d000838f
Clarity and convenience for defining config options 2020-04-07 14:01:45 -06:00
Stephen Shelton
02e31f3867
Introduce acceptor function in ConfigDefinition 2020-04-07 14:01:44 -06:00
Stephen Shelton
60d0bf2a9b
Rename function for clarity 2020-04-07 14:01:44 -06:00
Stephen Shelton
8160c13458
More documentation around Configuration/ConfigDefinition 2020-04-07 14:01:44 -06:00
Stephen Shelton
8352de7bd4
Config documentation, clarity 2020-04-07 14:01:43 -06:00
Stephen Shelton
d9340a873e
Consolidate Configuration generate INI functions 2020-04-07 14:01:43 -06:00
Stephen Shelton
1b19314278
Implement Configuration::generateDefaultConfig(), maintain insertion order 2020-04-07 14:01:43 -06:00
Stephen Shelton
7dacc30862
Conveience and clarity around config definiton maps 2020-04-07 14:01:42 -06:00
Stephen Shelton
105dd30fd9
More ConfigDefinition unit tests, fixes, support std::string as type 2020-04-07 14:01:42 -06:00
Stephen Shelton
25212b929c
Add ConfigDefinition unit tests, fixes 2020-04-07 14:01:41 -06:00
Stephen Shelton
a856e772c8
Stylistic clean up 2020-04-07 14:01:41 -06:00
Stephen Shelton
0fb888890f
First pass at Configuration definition classes 2020-04-07 14:01:41 -06:00
Stephen Shelton
9d71228e74
Replace config visit pattern with explicit lookups 
This is an initial pass at doing explicit value checks when handling
config parsing, as opposed to using a visiting pattern. The latter
made it difficult to check for conditions such as missing required
values, multiple values, etc.

It was also generally less readable (think declarative) which further
made it difficult to get a grasp for what our actual configuration file
requirements were.
 2020-04-07 14:01:40 -06:00
Stephen Shelton
ca67c12928
Why template when we only use one type?? 2020-04-07 13:56:01 -06:00
Stephen Shelton
273270916e
The Great Wall of Blame 
This commit reflects changes to clang-format rules. Unfortunately,
these rule changes create a massive change to the codebase, which
causes an apparent rewrite of git history.

Git blame's --ignore-rev flag can be used to ignore this commit when
attempting to `git blame` some code.
 2020-04-07 12:38:56 -06:00
Jeff
d3091cf9fc
Merge pull request #1167 from tewinget/tooling 
RouterHive initial PR
 2020-04-07 13:13:02 -04:00
Jeff
bf82740c08
only try fetching identity key once so we can interrupt lokinet (#1178) 2020-03-11 13:05:46 -03:00
Thomas Winget
84a1d7dbcc clang format....... 2020-03-06 20:20:11 -05:00
Thomas Winget
0f34a950a9 pybind config object, working 2020-03-03 19:57:09 -05:00
Jeff Becker
a5dc41b049 OMG IT DOES STUFF :DDDDDD 2020-03-03 19:57:09 -05:00
Jason Rhinelander
04c618ddae gcc 5 compatibility workaround 2020-02-25 13:33:39 -04:00
Jason Rhinelander
3bd400f6fe Fix string_view C++17 compatibility 
string_view was implicitly convertible to std::string, but
std::string_view is only explicitly convertible.  This makes the
`operator std::string` explicit to be more compatible, and re-adds a
bunch of explicit string casts to the code where needed.

(This also fixes the build if changing the standard to c++17)
 2020-02-25 11:52:43 -04:00
Jason Rhinelander
46242ba69b TrimWhiteSpace -> TrimWhitespace 
Fix my dumb initial capitalization choice.
 2020-02-24 14:27:44 -04:00
Jason Rhinelander
74d4afad51 Remove metric config parsing 2020-02-24 14:27:44 -04:00
Jason Rhinelander
54186c4a89 Replace absl string_view with string_view from lokimq 
When we add loki-mq has a dependency we can just alias it, but for now
it's easier to copy the header than add the whole submodule library.
 2020-02-24 14:27:44 -04:00
Jason Rhinelander
089056ca5b Remove all ABSL_ATTRIBUTE_UNUSED uses 2020-02-24 14:27:44 -04:00
Jason Rhinelander
5efcd49a3b Deabseil: remove absl::StrCat, de-templatize fromEnv 
fromEnv here wasn't usefully templatized (the base template basically
couldn't be used for anything except a string anyway), so just replaced
it with the overloads we need and moved the implementations out of the
header.
 2020-02-24 14:27:44 -04:00
Jason Rhinelander
98c34d995b De-abseil: Add our own llarp::TrimWhiteSpace 
Adds a TrimWhiteSpace instead of using abseil's.

Adds Catch2 tests for it, and also converts the existing str tests to
catch (which look much, much nicer than the gtest ones).
 2020-02-24 14:27:44 -04:00
Jason Rhinelander
b4440094b0 De-abseil, part 2: mutex, locks, (most) time 
- util::Mutex is now a std::shared_timed_mutex, which is capable of
  exclusive and shared locks.

- util::Lock is still present as a std::lock_guard<util::Mutex>.

- the locking annotations are preserved, but updated to the latest
  supported by clang rather than using abseil's older/deprecated ones.

- ACQUIRE_LOCK macro is gone since we don't pass mutexes by pointer into
  locks anymore (WTF abseil).

- ReleasableLock is gone.  Instead there are now some llarp::util helper
  methods to obtain unique and/or shared locks:
    - `auto lock = util::unique_lock(mutex);` gets an RAII-but-also
      unlockable object (std::unique_lock<T>, with T inferred from
      `mutex`).
    - `auto lock = util::shared_lock(mutex);` gets an RAII shared (i.e.
      "reader") lock of the mutex.
    - `auto lock = util::unique_locks(mutex1, mutex2, mutex3);` can be
      used to atomically lock multiple mutexes at once (returning a
      tuple of the locks).
  This are templated on the mutex which makes them a bit more flexible
  than using a concrete type: they can be used for any type of lockable
  mutex, not only util::Mutex.  (Some of the code here uses them for
  getting locks around a std::mutex).  Until C++17, using the RAII types
  is painfully verbose:

  ```C++
  // pre-C++17 - needing to figure out the mutex type here is annoying:
  std::unique_lock<util::Mutex> lock(mutex);
  // pre-C++17 and even more verbose (but at least the type isn't needed):
  std::unique_lock<decltype(mutex)> lock(mutex);
  // our compromise:
  auto lock = util::unique_lock(mutex);
  // C++17:
  std::unique_lock lock(mutex);
  ```

  All of these functions will also warn (under gcc or clang) if you
  discard the return value.  You can also do fancy things like
  `auto l = util::unique_lock(mutex, std::adopt_lock)` (which lets a
  lock take over an already-locked mutex).

- metrics code is gone, which also removes a big pile of code that was
  only used by metrics:
  - llarp::util::Scheduler
  - llarp:🧵:TimerQueue
  - llarp::util::Stopwatch
 2020-02-21 23:22:47 -04:00
Jason Rhinelander
ac1486d0be Replace absl::optional with optional-lite 
Step 1 of removing abseil from lokinet.

For the most part this is a drop-in replacement, but there are also a
few changes here to the JSONRPC layer that were needed to work around
current gcc 10 dev snapshot:

- JSONRPC returns a json now instead of an optional<json>.  It doesn't
  make any sense to have a json rpc call that just closes the connection
  with returning anything.  Invoked functions can return a null (default
  constructed) result now if they don't have anything to return (such a
  null value won't be added as "result").
 2020-02-19 18:21:25 -04:00
Jeff Becker
40876a6e3f
configurable log level 2020-01-20 16:00:08 -05:00
Stephen Shelton
1300de2387 Enable the JSON RPC API by default 2019-12-19 14:54:09 -07:00
Jeff Becker
c4f08e5145
finish remaining changes 2019-12-11 16:18:47 -05:00
Jeff Becker
e90cb2929e
disable metrics by default 2019-12-09 08:13:38 -05:00
Stephen Shelton
2c6226f54a Backup SNApp keys when migrating to new ed25519 crypto 2019-12-06 11:21:14 -07:00
Stephen Shelton
11410a2748 Avoid trivial getters/setters in KeyManager 2019-12-06 10:31:19 -07:00
Stephen Shelton
66a058a2af Make format 2019-12-06 10:13:09 -07:00
Stephen Shelton
eb5184ee09 Reinstate link test / update to use KeyManager 2019-12-04 13:13:41 -07:00
Stephen Shelton
23fc2ad042 Init key manager before InitOutboundLinks are configured 2019-12-03 16:55:16 -07:00
Stephen Shelton
af2259db5f Move lokid key API request to KeyManager 2019-12-03 12:32:19 -07:00
Stephen Shelton
93b8832026
Merge branch 'dev' into private-keys-backup-support 2019-12-03 11:20:45 -07:00
Stephen Shelton
521ef9b5bb Handle link transport key in KeyManager 2019-12-03 10:58:53 -07:00
Rick V
cf3469e11a
crash on wine, we support linux, ucb_unix, svr4 
natively ffs. i tested this patch on wine 4.4 on fuckin
Solaris 11 snv_151
 2019-12-01 19:01:40 -06:00
Stephen Shelton
a0699ad229 Undo adding of crypto version to RouterContact, other fixes 2019-11-27 11:30:19 -07:00
Stephen Shelton
e8e2e21fa2 Reorganize priv key file loading a bit and hook KeyManager into Router 2019-11-26 12:42:41 -07:00
Jeff Becker
dd48b149ca
make job queue size configurable 2019-11-25 16:30:34 -05:00
Stephen Shelton
7084dae79a Implement code to move old key files out of the way 2019-11-22 16:11:59 -07:00
Stephen Shelton
fd02e3e149 Stub out KeyManager class 2019-11-21 20:57:41 -07:00
Michael
f6adacf936
Review fixes 2019-10-09 23:00:50 +01:00
Michael
3371da98cf
Use libcurl (optional dependency) to hit jsonrpc 2019-10-09 23:00:50 +01:00
Michael
86a07e2a80
Enable more sanitisers 2019-09-23 11:47:58 +01:00
Michael
4d8fe2a8a8
Move meta programming to subdirectory 2019-09-03 20:52:28 +01:00
Michael
1aec0dfa2b
Move logging to subdirectory 2019-09-03 20:52:27 +01:00
Jeff Becker
b5402dc6c3
Merge remote-tracking branch 'origin/master' into iwp-redux 2019-08-27 08:15:41 -04:00
Jeff Becker
0241851b72
add likn layer delivery timeout notification for iwp 2019-08-27 08:07:48 -04:00
Michael
70937ab503
Fix docker-compose isolated network 2019-08-27 01:57:37 +01:00
Jeff Becker
94f8531776
more fixups 2019-08-26 10:29:29 -04:00
Jeff Becker
6a48a3b402
code review fixes: 
* use std::unordered_set
* use default for ctor/dtor
* don't crash on short packet with nack
 2019-08-26 07:16:46 -04:00
Jeff Becker
4ac07ea9fb
use std::make_tuple 2019-08-23 08:40:56 -04:00
Jeff Becker
ba316f85ba
default to iwp 2019-08-22 16:56:27 -04:00
Jeff Becker
3c3338e801
Merge remote-tracking branch 'origin/master' into memlink 2019-08-21 10:53:25 -04:00
Michael
cd27f96832
replace endl with '\n in config.cpp 2019-08-19 23:56:02 +01:00
Jeff
ecf3c37d2e
Merge pull request #768 from majestrate/sane-limits 
Sane limits
 2019-08-14 06:28:28 -04:00
Michael
16cdfbd5f0
clang-tidy modernize pass 2019-08-12 16:52:58 +01:00
Jeff Becker
2345dd3239
try adding proper limits 2019-08-12 07:20:57 -04:00