Commit Graph

414 Commits

Author SHA1 Message Date
Jason Rhinelander dfed73940b Merge remote-tracking branch 'origin/stable' into ubuntu/groovy 2021-04-22 01:49:06 -03:00
Jason Rhinelander 51754037ea
Merge pull request #37 from oxen-io/dev
v1.2.5
2021-04-20 19:14:02 -03:00
Jason Rhinelander 4ef1060e3f
Merge pull request #36 from jagerman/optional-send-parts
Add support for std::optional<T> send arguments
2021-04-20 14:06:16 -03:00
Jason Rhinelander 5ccacafdb1 Add support for std::optional<T> send arguments
If the optional is set it gets applied as if you specified the `T` in
the send(...), if unset it works as if you didn't specify the argument
at all.
2021-04-20 13:54:42 -03:00
Jason Rhinelander 6d20a3614a Don't warn when we can't send back to an non-SN incoming connection
This happens commonly when the remote has gone away and we shouldn't be
warning about it.
2021-04-15 20:17:59 -03:00
Jason Rhinelander 39dce56e14
Merge pull request #34 from jagerman/per-connection-pubkey-routing
Per connection pubkey routing
2021-04-15 15:46:09 -03:00
Jason Rhinelander ac58e5b574 Rename PUBKEY_BASED_ROUTING_ID to EPHEMERAL_ROUTING_ID
And similarly for the connect_option
2021-04-15 15:42:04 -03:00
Jason Rhinelander 99a3f1d840 Bump (and cmake-modernize) version 2021-04-15 15:15:44 -03:00
Jason Rhinelander dc40ebd428 Add connect_option::*; allow per-connection pubkey-based routing setting
Storage server, in particular, needs to disable pubkey-based routing on
its connection to oxend (because it is sharing oxend's own keys), but
wants it by default for SS-to-SS connections.  This allows the oxend
connection to turn it off so that we don't have oxend omq connections
replacing each other.
2021-04-15 15:11:54 -03:00
Jason Rhinelander d75a93f2bf 1.2.4 release 2021-03-09 15:52:16 -04:00
Jason Rhinelander fba779605e Rediff patches 2021-03-09 15:52:15 -04:00
Jason Rhinelander 1d69070235 Merge remote-tracking branch 'origin/stable' into ubuntu/groovy 2021-03-09 15:52:14 -04:00
Jason Rhinelander d570093f23 Merge branch 'dev' into stable 2021-03-09 15:49:50 -04:00
Jason Rhinelander e3e79e1fb7 Bump version 2021-03-09 15:43:44 -04:00
Jason Rhinelander f9ef827075 Make is_bt_tuple constexpr variables inline
Silence clang misc-definitions-in-headers warnings about it.
2021-02-09 21:46:33 -04:00
Jason Rhinelander 506bd65b05 Add better deferred reply capabilities to Message
This provides an interface for sending a reply to a message later (i.e.
after the Message& itself is no longer valid) by using a new
`send_later()` method of the Message instance that returns an object
that can properly route replies (and can outlive the Message it was
called on).

Intended use is:

    run_this_lambda_later([send=msg.send_later()] {
        send.reply("content");
    });

which is equivalent to:

    run_this_lambda_later([&msg] {
        msg.send_reply("content");
    });

except that it works properly even if the lambda is invoked beyond the
lifetime of `msg`.
2021-01-21 11:59:39 -04:00
Jason Rhinelander fbe9981cb9 Fix debian/rules cmake variables 2021-01-14 23:35:13 -04:00
Jason Rhinelander 3cde790dae 1.2.3-2 version bump 2021-01-14 23:29:25 -04:00
Jason Rhinelander d31ac7a6d9 Merge branch 'stable' into ubuntu/groovy 2021-01-14 21:50:30 -04:00
Jason Rhinelander 46e28dc93d Add missing header 2021-01-14 21:48:29 -04:00
Jason Rhinelander 86247bc5c7 Add missing header 2021-01-14 21:48:09 -04:00
Jason Rhinelander 9b58dfbe38 1.2.3 release 2021-01-14 16:13:24 -04:00
Jason Rhinelander 8faf9ad5c2 Rename deb package name 2021-01-14 16:13:19 -04:00
Jason Rhinelander 67e2691063 Rediff patches 2021-01-14 15:42:22 -04:00
Jason Rhinelander 4f8d74f4c5 Merge remote-tracking branch 'origin/stable' into ubuntu/groovy 2021-01-14 15:39:44 -04:00
Jason Rhinelander 46c1a97b14 Merge branch 'dev' into stable 2021-01-14 15:32:59 -04:00
Jason Rhinelander 396f591fae Remove deprecated string_view compat shim 2021-01-14 15:32:38 -04:00
Jason Rhinelander b49a94fb83 Export compile commands and use ccache by default 2021-01-14 15:32:38 -04:00
Jason Rhinelander 0738695eb9 Add lokimq compatibility headers 2021-01-14 15:32:38 -04:00
Jason Rhinelander 2ae6b96016 Rename LokiMQ to OxenMQ 2021-01-14 15:32:38 -04:00
Jason Rhinelander bd9313bf19 Fix decoding into a std::byte
Decoding into a std::byte output iterator was not working because the
`*out++ = val` assignment doesn't work when the output is std::byte and
val is a char/unsigned char/uint8_t.  Instead we need to explicitly
cast, but figuring out what we have to cast to is a little bit tricky.

This PR makes it work (and bumps the version for this and the is_hex
fix).
2020-12-14 13:05:14 -04:00
Jason Rhinelander 1959f8747d
Merge pull request #28 from jagerman/is-hex-mod-2
Make lokimq::is_hex check for size being a multiple of 2
2020-12-12 21:06:59 -04:00
Jason Rhinelander 90701e5d62 Make lokimq::is_hex check for size being a multiple of 2
`is_hex()` is a bit misleading as `from_hex()` requires an even-length
hex string, but `is_hex()` also allows odd-length hex strings, which
means currently callers should be doing `if (lokimq::is_hex(str) &&
str.size() % 2 == 0)`, but probably aren't.

Since the main point of `lokimq/hex.h` is for byte<->hex conversions it
doesn't make much sense to allow `is_hex()` to return true for something
that can't be validly decoded via `from_hex()`, thus this PR changes it
to return false.

If someone *really* wants to test for an odd-length hex string (though
I'm skeptical that there is a need for this), this also exposes
`is_hex_digit` so that they could use:

    bool all_hex = std::all_of(str.begin(), str.end(), lokimq::is_hex_digit<char>)
2020-12-12 20:25:01 -04:00
Jason Rhinelander 94d4ef50fb fix lib version 2020-11-17 15:47:00 -04:00
Jason Rhinelander 28dc643ba9 Refresh .so versioning patch 2020-11-17 15:47:00 -04:00
Jason Rhinelander 5831f1b569 1.2.2 stable release 2020-11-17 15:29:48 -04:00
Jason Rhinelander 4e837f9cc0 Merge remote-tracking branch 'origin/stable' into ubuntu/groovy 2020-11-17 15:29:46 -04:00
Jason Rhinelander e7487fd0c8
Merge pull request #26 from loki-project/dev
1.2.2 release
2020-11-17 14:32:48 -04:00
Jason Rhinelander 178bd4f674 Bump version for 1.2.2 release 2020-11-17 12:42:37 -04:00
Jason Rhinelander b1543513bb Don't install when building as a static subdirectory
This is making lokimq headers & static lib get installed when lokimq is
used as a project subdirectory, which is very annoying.

This adds an option for enabling the install lines, and only enables it
if doing a shared library or a top-level project build.
2020-11-17 12:40:59 -04:00
Jason Rhinelander 253f1ee66e Move socket holding into LokiMQ instance
The thread_local `std::map` here can end up being destructed *before*
the LokiMQ instance (if both are being destroyed during thread joining),
in which case we segfault by trying to use the map.  Move the owning
container into the LokiMQ instead (indexed by the thread) to prevent
that.

Also cleans this code up by:

- Don't close control sockets from the proxy thread; socket_t's aren't
necessarily thread safe so this could be causing issues where we trouble
double-closing or using a closed socket.

- We can just let them get closed during destruction of the LokiMQ.

- Avoid needing shared_ptr's; instead we can just use a unique pointer
with raw pointers in the thread_local cache.  This simplifies closing
because all closing will happen during the LokiMQ destruction.
2020-11-17 11:54:39 -04:00
Jason Rhinelander d889f308ae cppzmq 4.7+ compatibility
Updates bundled cppzmq to 4.7.1, and replaces deprecated functions with
new API.
2020-11-13 15:20:30 -04:00
Jason Rhinelander 768a639dea Crank clang to 11 2020-10-23 18:18:18 -03:00
Jason Rhinelander e99f07bc6d 1.2.1 deb package 2020-10-21 00:22:35 -03:00
Jason Rhinelander 2ec37a7bac Merge branch 'stable' into ubuntu/groovy 2020-10-21 00:21:07 -03:00
Jason Rhinelander 95d7e0964f Merge branch 'dev' into stable 2020-10-19 23:45:57 -03:00
Jason Rhinelander ec0d44e143 Stable release bump 2020-10-19 23:44:24 -03:00
Jason Rhinelander ea484729c7 Fix var::get<I> to return references 2020-10-15 17:43:25 -03:00
Jason Rhinelander 7049d3cb5a Test suite: use different ports for each test
Apple, in particular, often fails tests with an address already in use
if attempt to reuse a port that the process just closed, because it is a
wonderful OS.
2020-10-15 16:55:33 -03:00
Jason Rhinelander 8ed529200b macOS 10.12 compatibility
Add var::get/var::visit implementations of std::get/std::visit that get
used if compiling for an old macos target, and use those.

The issue is that on a <10.14 macos target Apple's libc++ is missing
std::bad_variant_access, and so any method that can throw it (such as
std::get and std::visit) can't be used.  This workaround is ugly, but
such is life when you want to support running on Apple platforms.
2020-10-15 16:55:33 -03:00