Commit Graph

6749 Commits

Author SHA1 Message Date
Jeff Becker
ad6dcd683b
fix segfault 2021-03-11 08:35:14 -05:00
Jeff Becker
80a76c9386
fix segfault 2021-03-11 08:34:14 -05:00
Jason Rhinelander
181953b4a6 Replace ::Hash nested structs with std::hash specializations 2021-03-10 11:19:52 -04:00
Jason Rhinelander
d1dadb530c SockAddr endian cleanups & add uint128 ctors
- Make SockAddr endian arguments explicit
- Consolidate port-less contructors and port constructors into one with
  a default port of 0.
- Add {h,n}uint128_t ctors for construction from IPv6 addrs
2021-03-10 11:17:00 -04:00
Jason Rhinelander
fe0d099e86 Code cleanups
- De-lambda a lambda that is only called once, immediately after it is
  defined.
- C++17 modernize key-value for loops
- Remove unused (and useless) method
2021-03-10 11:17:00 -04:00
Jason Rhinelander
0339bd941a Convert protocol type to enum class 2021-03-10 11:16:55 -04:00
Jeff
9bf002cc8d
Merge pull request #1574 from tewinget/header_fixup
standardize include format and pragma once
2021-03-10 09:17:18 -05:00
Jason Rhinelander
59a363b0a2
Merge pull request #1575 from tewinget/format_sh_fix
let format.sh try system clang-format in case it is the correct version
2021-03-09 21:38:30 -04:00
Jeff
0ddea9b103
Merge pull request #1571 from oxen-io/dev
merge dev to stable for 0.8.4
2021-03-09 20:25:21 -05:00
Jason Rhinelander
f47e0cf7a2 Fix UB -- use after move 2021-03-09 21:23:40 -04:00
Thomas Winget
43bd6a9842 remove vestigal file
a file that was accidentally committed after being moved was
suddenly being chosen as an include target over the correct
one due to an amusing coincidence of cmake configuration.  that
file is now gone.
2021-03-09 20:09:29 -05:00
Thomas Winget
09ebe77860 let format.sh try system clang-format in case it is the correct version 2021-03-09 19:36:57 -05:00
Thomas Winget
7caa87862e standardize include format and pragma once
All #ifndef guards on headers have been removed, I think,
in favor of #pragma once

Headers are now included as `#include "filename"` if the included file
resides in the same directory as the file including it, or any
subdirectory therein.  Otherwise they are included as
`#include <project/top/dir/relative/path/filename>`

The above does not include system/os headers.
2021-03-09 19:01:41 -05:00
Thomas Winget
35fb54d131 add project source dir to util include directories 2021-03-09 16:55:10 -05:00
Jeff Becker
a8885c5405
update gui hashpin for windows 2021-03-09 16:07:41 -05:00
Jason Rhinelander
e0bb7b7d0f Bump oxen-mq submodule to tagged 1.2.4 2021-03-09 15:45:50 -04:00
Jeff
1de2bb7ecf
Merge pull request #1572 from majestrate/tag-v0.8.4-2021-03-09
bump version for 0.8.4
2021-03-09 08:06:29 -05:00
Jeff Becker
084e0aa023
bump version for 0.8.4 2021-03-09 07:51:37 -05:00
Jason Rhinelander
39e2647b1c
Merge pull request #1570 from majestrate/unbreak-android-2021-03-07
Unbreak android
2021-03-08 11:55:44 -04:00
Jeff Becker
324498fe9a
flip order of parameters so it works 2021-03-08 06:59:55 -05:00
Jeff Becker
3d09b94590
make android work again
ip packet on read error was returning an uninitialized ip packet with non zero size so it was thinking it was a valid packet.
value initialize it to set the packet size to zero by default.

this fixed it in an emulator at least...
2021-03-08 06:17:20 -05:00
Jeff Becker
6550aa844c
try to unbreak more 2021-03-08 06:17:20 -05:00
Jeff Becker
7af4807302 correctly set size of OwnedBuffer when using OwnedBuffer::copy_used 2021-03-07 12:16:15 -04:00
Jeff
6daf5c6ea6
Merge pull request #1568 from jagerman/clang-format-11
Clang format 11
2021-03-05 13:21:36 -05:00
Jason Rhinelander
91d6698a9d Reformat with clang-format-11 2021-03-05 13:36:31 -04:00
Jason Rhinelander
e5aa96ed7c Upgrade to clang-format 11
The formatting changes here are not too large and also nice: in
particular clang-format-11 appears to do better handling of `{...}`
constructor braces/arguments.
2021-03-05 13:36:31 -04:00
Jeff
76ee6734db
Merge pull request #1557 from jagerman/uvw-overhaul
libuv -> uvw overhaul
2021-03-04 17:12:10 -05:00
Jeff
57a5f8cb15
Merge pull request #1567 from jagerman/loki-core-docker-deps
Add oxen-core deps to docker images
2021-03-04 17:04:26 -05:00
Jeff Becker
27685b1b6e
fix docker lines and dont install recommended packages 2021-03-04 17:03:02 -05:00
Jason Rhinelander
78a43e7163 Add oxen-core deps to docker images 2021-03-04 17:21:45 -04:00
Jason Rhinelander
c00de1e4ec Add wakeup call into transit_hop UpstreamHandler 2021-03-04 16:51:18 -04:00
Jason Rhinelander
89b582bf60 Modernize [[maybe_unused]] attribute 2021-03-04 16:51:18 -04:00
Jason Rhinelander
4b5387a078 Remove unused ShouldFlushNow method 2021-03-04 16:51:18 -04:00
Jason Rhinelander
f9dc308f75 Tick event loop on data queuing 2021-03-04 16:51:18 -04:00
Jason Rhinelander
895acc45ff EventLoop: add public wakeup() method, and call it from call()
call(), when invoked from the logic thread, wasn't triggering a wakeup
which stalled some traffic (such as client-to-snode packets).

Fix it by triggering a wakeup on `call()`, and expose it because this is
a useful thing to be able to do.
2021-03-04 16:51:18 -04:00
Jason Rhinelander
f8d5e106a0 Uncurse SockAddr's sockaddr* operator
The `const sockaddr*` conversion was returning a pointer to the
sockaddr_in6, but with its family set to AF_INET, so the receiving code
would have treated interpreting the result as a sockaddr_in pointer --
but it isn't, and trying to get the IPv4 from the mis-reinterpreted
sockaddr_in6 fails; this then prevented uvw UDP binding (which uses the
sockaddr* operator) from working.

This changes it to always leave the family value at the proper value and
using the ipv6_is_mapped_ipv4 check to determine when we have (and
should return) a pointer to the sockaddr_in rather than the
sockaddr_in6.

Also fixes toString() to compare the full prefix instead of just bytes
10 and 11.
2021-03-04 16:51:18 -04:00
Jason Rhinelander
62fc1bbc48 Make llarp_buffer_t constructible from an rvalue reference 2021-03-04 16:51:18 -04:00
Jason Rhinelander
f8486604c4 Export UDP file descriptor (for android) 2021-03-04 16:51:18 -04:00
Jason Rhinelander
d995766436 Android & hive fixes 2021-03-04 16:51:18 -04:00
Jason Rhinelander
673d065ed8 Remove HasNextPacket() (and fix win32)
We don't use it anymore (instead we just ReadNextPacket until it returns
an empty result).
2021-03-04 16:51:18 -04:00
Jason Rhinelander
6e05dc693f Remove unused arguments (and ants) 2021-03-04 16:51:18 -04:00
Jason Rhinelander
2c827870c9 Simplify code of many f's
We don't need to go through the contention killer here, that was mainly
for (long ago) debugging reasons.
2021-03-04 16:51:18 -04:00
Jason Rhinelander
36edabd9b0 Rename EventLoop::udp to EventLoop::make_udp
Makes it consistent with the make_waker, etc.

Also removes some debugging.
2021-03-04 16:51:18 -04:00
Jason Rhinelander
afd856bca0 Remove unused junk (also fix win32 compilation fail) 2021-03-04 16:51:18 -04:00
Jason Rhinelander
ced035d401 Switch uvw to a fork with libuv backwards compat support 2021-03-04 16:51:18 -04:00
Jason Rhinelander
096f37fe4e Fix linux compilation & narrowing conversion warning 2021-03-04 16:51:18 -04:00
Jason Rhinelander
e198bfd3e1 Remove unused variable 2021-03-04 16:51:18 -04:00
Jason Rhinelander
c4559d158e Make format 2021-03-04 16:51:18 -04:00
Jason Rhinelander
ccc7b5c9e9 Merge Logic functions into EventLoop
loop->call(...) is similar to the old logic->Call(...), but is smart
about the current thread: if called from within the event loop it simply
runs the argument directly, otherwise it queues it.

Similarly most of the other event loop calls are also now thread-aware:
for example, `call_later(...)` can queue the job directly when called if
in the event loop rather than having to double-queue through the even
loop (once to call, then inside the call to initiate the time).
2021-03-04 16:51:18 -04:00
Jason Rhinelander
5b555ee5aa Replace libuv with uvw & related refactoring
- removes all the llarp_ev_* functions, replacing with methods/classes/functions in the llarp
  namespace.
- banish ev/ev.h to the void
- Passes various things by const lvalue ref, especially shared_ptr's that don't need to be copied
  (to avoid an atomic refcount increment/decrement).
- Add a llarp::UDPHandle abstract class for UDP handling
- Removes the UDP tick handler; code that needs tick can just do a separate handler on the event
  loop outside the UDP socket.
- Adds an "OwnedBuffer" which owns its own memory but is implicitly convertible to a llarp_buffer_t.
  This is mostly needed to take over ownership of buffers from uvw without copying them as,
  currently, uvw does its own allocation (pending some open upstream issues/PRs).
- Logic:
  - add `make_caller`/`call_forever`/`call_every` utility functions to abstract Call wrapping and
    dependent timed tasks.
  - Add inLogicThread() so that code can tell its inside the logic thread (typically for
    debugging assertions).
  - get rid of janky integer returns and dealing with cancellations on call_later: the other methods
    added here and the event loop code remove the need for them.
- Event loop:
  - redo everything with uvw instead of libuv
  - rename EventLoopWakeup::Wakeup to EventLoopWakeup::Trigger to better reflect what it does.
  - add EventLoopRepeater for repeated events, and replace the code that reschedules itself every
    time it is called with a repeater.
  - Split up `EventLoop::run()` into a non-virtual base method and abstract `run_loop()` methods;
    the base method does a couple extra setup/teardown things that don't need to be in the derived class.
  - udp_listen is replaced with ev->udp(...) which returns a new UDPHandle object rather that
    needing gross C-style-but-not-actually-C-compatible structs.
  - Remove unused register_poll_fd_(un)readable
  - Use shared_ptr for EventLoopWakeup rather than returning a raw pointer; uvw lets us not have to
    worry about having the event loop class maintain ownership of it.
  - Add factory EventLoop::create() function to create a default (uvw-based) event loop (previously
    this was one of the llarp_ev_blahblah unnamespaced functions).
  - ev_libuv: this is mostly rewritten; all of the glue code/structs, in particular, are gone as
    they are no longer needed with uvw.
- DNS:
  - Rename DnsHandler to DnsInterceptor to better describe what it does (this is the code that
    intercepts all DNS to the tun IP range for Android).
- endpoint:
  - remove unused "isolated network" code
  - remove distinct (but actually always the same) variables for router/endpoint logic objects
- llarp_buffer_t
  - make constructors type-safe against being called with points to non-size-1 values
- tun packet reading:
  - read all available packets off the device/file descriptor; previously we were reading one packet
    at a time then returning to the event loop to poll again.
  - ReadNextPacket() now returns a 0-size packet if the read would block (so that we can implement
    the previous point).
  - ReadNextPacket() now throws on I/O error
- Miscellaneous code cleanups/simplifications
2021-03-04 16:51:18 -04:00