Commit Graph

297 Commits

Author SHA1 Message Date
Jeff Becker
5b8ebb269c changes for liblokinet-ffi
* cmake option BUILD_DAEMON for toggling building of daemon directory
* when WITH_BOOTSTRAP is OFF dont build curl or cpr
2022-01-31 10:53:48 -05:00
Jeff
996de3d4c6 make it so github sees the repo is gpl3 2022-01-28 11:20:22 -05:00
Jeff
388fc53380
match io loop event order on windows/apple to match linux.
on win32/apple reading packets from the interface does not count as an io operation.
manually trigger pump on win32/apple to pretend that it is an io event.
add platform quark function MaybeWakeUpperLayers on vpn::Interface to manaully wake up the other components on platforms that need that (ones on which packet io is not done via io events).
on non linux platforms, use uv_prepare_t instead of uv_check_t as the former triggers before blocking for io, instead of after. this better matches linux's order of operations in libuv.
2021-12-15 15:25:53 -05:00
Jeff Becker
b5f5d07f03
bump libunbound static dep hashpin 2021-10-25 11:35:50 -04:00
Jason Rhinelander
9c32058a50 Remove windows linefeeds 2021-10-16 15:16:55 -03:00
Jeff
12bca7031b
Merge pull request #1638 from majestrate/log-refactor-source-location-2021-05-11
refactor logging to use std::source_location
2021-10-06 15:14:55 -04:00
Jeff Becker
5c457ff486
refactor logging to use std::source_location
* use std::source_location instead of godawful macros in logging
* remove unused/absolutely haram af json logstream
* fix bug in android logger where it doesn't respect eLogNone
2021-10-06 11:10:48 -04:00
Jeff Becker
d354a35869
always build ngtcp2 as static
squashme
2021-10-06 10:09:04 -04:00
Jason Rhinelander
488ed47cda Remove duplicate handling of jemalloc
We were linking/loading it in different ways, one with cmake option
`USE_JELLOC` and the other, older version `WITH_JEMALLOC`.  This removes
the latter (which was default OFF) and keeps the former (which was added
and has been default ON since 0.9.4 or so).

Also removes the `ifdef`ed JEMALLOC code in lokinet.cpp because we don't
need it; just linking to jemalloc is enough to get the malloc/free
replacements.
2021-09-13 13:26:12 -03:00
Jeff
baa89771fb
Merge pull request #1735 from majestrate/cmake-lokinet-bootstrap-tweaks-2021-09-10
make lokinet-bootstrap target toggleable
2021-09-10 22:13:34 -04:00
Jason Rhinelander
62d7192a50 Add mainnet/testnet bootstrap files into repo
We use them everywhere now (include the debs) so it makes sense to have
them bundled here rather than needing a download during package build
(in particular for debs that's considered a bad thing).
2021-09-10 19:38:32 -03:00
Jason Rhinelander
089fc026d8 Redo how we build ngtcp2 lib
ngtcp2's top-level CMakeLists.txt is not friendly to being used as a
subdirectory (for instance, it always adds a `check` target when cunit
is installed), so stop using it in favour of skipping directly into the
ngtcp2/lib subdir.

This requires some hackery to set up a couple of the things the
top-level cmake does, but it isn't *too* painful.
2021-09-10 15:12:57 -03:00
Jeff Becker
7e1236503c
make lokinet-bootstrap target toggleable
add cmake option to disable building lokinet-bootstrap binary
2021-09-10 10:41:42 -04:00
Jason Rhinelander
2b8ef416c3 Remove old mac installer packaging 2021-09-02 19:13:51 -03:00
jeff
0708a0d897
initial network extension code for macos
probably does not work
2021-09-02 14:17:08 -04:00
Jeff Becker
439183bf19
bump openssl static deps version for upstream security update 2021-08-31 12:05:01 -04:00
Jeff Becker
ae186f7000
use $(MAKE) only on makefile generator 2021-06-19 09:35:49 -04:00
Jeff Becker
e5bc34a7b1
[buildsystem] remove use of ninja entirely
* modify contrib/window.sh now uses makefiles
* create contrib/android.sh for building shared libs for android apk
* update drone ci jizz for android
* update cmake/StaticBuild.cmake to use $(MAKE) so that builds can parallelize (super epic)
* remove android directory as it is no longer needed
2021-06-18 11:48:23 -04:00
Jeff Becker
046ab3d453
export functions in liblokinet for win32 dll 2021-06-08 08:32:52 -04:00
Jeff Becker
37a9bd768e
fix linking on win32 for lokinet.dll
only apply static link flags for executables
2021-06-08 08:32:44 -04:00
Jeff Becker
d583f8bd72
windows cmake upgrades:
* dont call lokinet-bootstrap.exe on install
* bump lokinet gui version with hashpin update
2021-06-04 16:23:30 -04:00
Jeff Becker
499bb38e6f
fix route poking via rpc:
* immediately poke routes when we are told to use an exit so that packets get pushed which makes an exit path happen
* fix up cmake oddity in nsis section
2021-05-13 07:30:53 -04:00
Jeff Becker
8c0f448e12
add liblokinet option to nsis cpack installer 2021-05-13 06:30:40 -04:00
Jeff Becker
94f24b2fde
win32 installer
* make tuntap driver its own install component so that we can optionally not install it
2021-05-01 10:16:57 -04:00
Jeff Becker
16ff8b4149
link against core foundation as a fix for static macos build 2021-04-21 13:03:23 -04:00
Jeff Becker
c4dad12f2e
libunbound patch no longer needed as fixes have been upstreamed 2021-04-21 10:38:23 -04:00
Jason Rhinelander
b54d608b3f Fix curl hash
Hash was for the bz2 instead of xz
2021-04-21 11:33:57 -03:00
Jeff Becker
ecd41e7a31
bump libuv version to match the tarball fetched 2021-04-21 10:08:04 -04:00
Jason Rhinelander
ed1a80170a Update submodules and static build deps
Static deps:
- expat 2.3.0
- unbound 1.13.1
- sqlite 3.35.5
- libuv 1.41.0
- curl 7.76.1

Submodules:
- ghc-filesystem 1.5.4
- ngtcp2 (latest master)
- oxenmq 1.2.5
- pybind11 2.6.2
- sqlite_orm 1.6
2021-04-20 19:58:11 -03:00
Jeff Becker
0c37cc7f60
lokinet-bootstrap native binary 2021-04-15 13:39:45 -04:00
Jeff Becker
9e05e245e0
rebrand and bump version 2021-04-14 12:55:52 -04:00
Jeff Becker
143c66b332
lokimq -> oxenmq artifact
* fix dep to lokimq in macos installer gui target when doing make package, change it to oxenmq
2021-03-17 07:53:11 -04:00
Jeff Becker
a8885c5405
update gui hashpin for windows 2021-03-09 16:07:41 -05:00
Jason Rhinelander
8aa1b702cd Disallow evil compilation
-fpermissive allows nasty things that are (apparently) needed on
Windows, so only enable it there.

vla are evil, so don't just warn but error on it.

remove duplicate -Wno-unknown-pragmas
2021-03-04 16:51:18 -04:00
Thomas Winget
4c630e0437 Large collection of changes to make android work
- Previous android java and jni code updated to work, but with much love
  still needed to make it work nicely, e.g. handling when the VPN is
  turned off.

- DNS handling refactored to allow android to intercept and handle DNS
  requests as we can't set the system DNS to use a high port
  (and apparently Chrome ignores system DNS settings anyway)

- add packet router structure to allow separate handling of specific
  intercepted traffic, e.g. UDP traffic to port 53 gets handled by our
  DNS handler rather than being naively forwarded as exit traffic.

- For now, android lokinet is exit-only and hard-coded to use exit.loki
  as its exit.  The exit will be configurable before release, but
  allowing to not use exit-only mode is more of a challenge.

- some old gitignore remnants which were matching to things we don't
  want them to (and are no longer relevant) removed

- some minor changes to CI configuration
2021-03-02 13:18:22 -05:00
Jeff Becker
85867bd7be
make service restart 2021-02-24 14:08:20 -05:00
Jeff Becker
df4ea34a56
nodedb refactor
* bump zmq static dep
* lokimq -> oxenmq
* llarp_nodedb -> llarp::NodeDB
* remove all crufty api parts of NodeDB
* make NodeDB rc selection api not suck
* make path builder api not suck
* propagate all above changes so that unit tests work and it all compiles
2021-02-02 09:35:40 -05:00
Jason Rhinelander
3d0c9a90a8 Link against libdl for libuv 2021-01-25 15:52:15 -04:00
Jason Rhinelander
b3d2177e73
Fix build server name & path (#1516)
builds.lokinet.dev -> oxen.rocks
/loki-project/ -> /oxen-io/
2021-01-19 07:39:53 -05:00
Jeff
0ed8942dc6
libuv cmake fixups (#1511)
* fix up cmake parts for libuv
* make libuv use external project via StaticBuild.cmake
* remove libuv submodule
2021-01-16 19:11:28 -05:00
Jeff
49b9ad7197
tun code refactor (#1495)
* partial tun code refactor

* take out the trash

* move vpn platform code into llarp/vpn/platform.cpp

* fix hive build

* fix win32

* fix memory leak on win32

* reduce cpu use

* make macos compile

* win32 patches:

* use wepoll for zmq
* use all cores on windows iocp read loop

* fix zmq patch for windows

* clean up cmake for win32

* add uninstall before reinstall option to win32 installer

* more ipv6 stuff

* make it compile

* fix up route poker

* remove an unneeded code block in macos wtf

* always use call to system

* fix route poker behavior on macos

* disable ipv6 on windows for now

* cpu perf improvement:

* colease calls to Router::PumpLL to 1 per event loop wakeup

* set up THEN add addresses

* emulate proactor event loop on win32

* remove excessively verbose error message

* fix issue #1499

* exclude uv_poll from win32 so that it can start up

* update logtag to include directory

* create minidump on windows if there was a crash

* make windows happy

* use dmp suffix on minidump files

* typo fix

* address feedback from jason
* use PROJECT_SOURCE_DIR instead of CMAKE_SOURCE_DIR
* quote $@ in apply-patches in case path has spaces in it

* address feedback from tom

* remove llarp/ev/pipe
* add comments for clairification
* make event loop queue size constant named
2021-01-11 18:13:22 -05:00
Jason Rhinelander
7ad1030736
Add full-static-deps armhf build (+upload) (#1505)
* Add armhf static build + upload

* openssl build fix for static armhf build

Without this it tries building for arm64.

* Disable LTO for armhf static build

* Fix static lib check for arm
2021-01-04 16:17:29 -05:00
Jason Rhinelander
f9be8b6b73
Bump version & gui build (#1501) 2020-12-16 12:26:15 -05:00
Jason Rhinelander
f1b074bb95
Merge pull request #1487 from jagerman/revert-uninstaller-subdir
Revert "Build mac uninstaller as subproject instead of externalprojec…
2020-11-18 18:15:56 -04:00
Jeff
b18546086a
make macos uninstaller actually kill and uninstall lokinet (#1484)
* macos fluff

* make uninstaller work, the uninstall script needs to be called with /usr/bin/sudo to work because god know why it needs that even though it's already root.
* add logrotation
* make the uninstall script kill all the things

* revert

* use correct regular expression

* remove logrotate configs rename logrotate config file name to be more descriptive
2020-11-18 17:06:48 -05:00
Jason Rhinelander
bc62e9dd2d Revert "Build mac uninstaller as subproject instead of externalproject (#1485)"
This reverts commit e62f04c601.
2020-11-18 17:54:29 -04:00
Jason Rhinelander
e62f04c601
Build mac uninstaller as subproject instead of externalproject (#1485)
This makes it easier to build/rebuild via a target, and is a bit
cleaner.
2020-11-18 12:49:16 -05:00
Jason Rhinelander
a753e96d8d
Version bump (#1483)
* Bump version to 0.8.2

* Let cmake set PROJECT_NAME

`project(x ...)` already sets PROJECT_NAME (and CMAKE_PROKECT_NAME if
this is the top-level build) to `x`; the logic here seemed sort of
backwards.

* Get rid of uninstaller entitlement

We don't seem to need it anymore with Qt 5.15.1.

* Bump windows lokinet-gui build
2020-11-18 06:08:56 -05:00
Jason Rhinelander
deae302571 macos: pass our pre-built static libs into the gui sub-build
Avoids the mac build needing to build lokimq & libzmq twice (once in
lokinet, then again in the gui)
2020-11-17 19:22:19 -04:00
Jason Rhinelander
1c0e4dc4e7 Move all patches into contrib/patches 2020-11-17 19:22:19 -04:00
Jason Rhinelander
f9144a7bb3 Patch to avoid IP_DONTFRAG bug in latest xcode with broken Big Sur SDK 2020-11-17 19:22:19 -04:00
Jason Rhinelander
8c01201a2f Upgrade libunbound to latest stable 2020-11-17 19:22:19 -04:00
Jeff Becker
bacb95962f try installing to lokinet subdirectory 2020-11-17 19:22:19 -04:00
Jeff Becker
ca5df6436a add initial uninstaller code that is horrible 2020-11-17 19:22:19 -04:00
Jeff Becker
41311c020a preflight -> preinstall 2020-11-17 19:22:19 -04:00
Jeff Becker
0afe9f0138 update packaging for macos add preinstall script that nukes any existing lokinet make uninstaller revert dns to "empty" make cpack use preinstall script in pkg file 2020-11-17 19:22:19 -04:00
Jason Rhinelander
bcdb521974 Update win32 gui download with smaller svg icon 2020-11-11 20:00:02 -04:00
Jeff
f18f18372a
stop lokinet before uninstalling service (#1469)
* stop lokinet before uninstalling service

* kill gui in uninstaller

* add helper script for building windows installers because i forgot how to most of the time.
2020-11-11 09:55:00 -05:00
Jason Rhinelander
b5bbe17479
Update gui win32 package url (#1466) (#1468)
Co-authored-by: Jeff <jeff@i2p.rocks>
2020-11-11 09:10:12 -05:00
Jeff
8a6ad2b7ee remove dpi flag for windows 2020-11-09 14:34:55 -04:00
Jeff
ede6de708d
run without highdpi scaling on windows (#1456) 2020-11-06 12:38:43 -05:00
Jeff Becker
681de5fdaf bump lokinet wi32 gui build 2020-11-06 12:14:55 -04:00
Jeff Becker
9d8b724cae fix path in uninstall command 2020-11-04 20:35:41 -04:00
Jeff
d1181d0ebb
Bump win32 gui version (#1446)
* bump gui build and hashpin

* run gui in no-tray mode by default

* bump gui version and hashpin
2020-11-02 20:17:04 -05:00
Jeff
f3ef81b28c
use same directory for windows installer, remove version. (#1435) 2020-10-29 20:05:41 -04:00
Jason Rhinelander
e47b70a82f
CMake fixes: libuv static build, base_libs, shared lib install dir (#1431)
* Update how we build libuv

- Update submoduled libuv to latest stable (1.40.0)
- Don't look for a system libuv if we're under BUILD_STATIC_DEPS
- Add a libuv interface library rather than using globals
- Make the windows build fall back to the submodule if not explicitly
  given a LIBUV_ROOT

* Replace ${LIBS} global with `base_libs` interface

This simplifies linking and include handling a bit.

* Remove unneeded header

* Add missing csignal header

(This was previously being pulled in incredibly indirectly via some
stuff that eventually includes some other stuff that eventually included
uv.h)

* Use GNUInstallDirs to get lib dir instead of hard-coding lib

Fixes #1429
2020-10-28 18:26:43 -04:00
Jeff
32f4287df6
handle libuv case when we don't have it (#1403)
* add case for cmake when libuv is not found

* update error case in cmake
2020-10-27 16:34:22 -04:00
Jeff
4354a270c0
bump win32 gui build\ * add hashpin for gui * add installer icon (#1424) 2020-10-27 16:27:38 -04:00
Jeff
c5c73568a5
redo cpack for win32 (#1420)
* bundle gui
* bundle bootstrap.signed
* add shortcut
* install/remove service
2020-10-22 17:16:42 -04:00
Jason Rhinelander
a888b7bbc2
Reduce macOS target to 10.12, and fix target for deps (#1414)
This is relatively painless for lokinet as it already had workarounds
during 0.8 dev work for the things macos hated in 10.13.

Dependencies, however, were not being built with the proper macos target
junk, so this fixes that.
2020-10-16 05:18:45 -04:00
Jason Rhinelander
62a90f4c82 macos package fixes for 0.3.0
- bumps deployment target to 10.15 because earlier versions don't
  support C++17.
- remove double-include of installer.cmake
- use new static dep lokinet build system
- replace lokinetctl with lokinet-vpn
2020-10-07 12:51:26 -03:00
Jeff
fe30193a97
revive android build system (#1339)
* it lives?

* clean up

* add readme and add x86_64 to abi filters

* disable route poking on android

* make it compile on android

* it compiles!!111

* typofix

* re-enable ccache for android
2020-09-22 15:04:15 -04:00
Jeff
686b13b2f3 fix up cmake lokimq target 2020-09-19 09:50:54 -04:00
Jason Rhinelander
f5e5066bd5
Update deps (#1348)
* Update submodules/static deps to latest versions

* Add mingw zmq build patch

* Drop support for Windows 2000
2020-09-16 15:47:35 -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 Becker
d70e11feba
change what patches are applied 2020-08-25 09:44:12 -04:00
Jeff Becker
ab568b27d0
bump windows version for CI until patches are updated 2020-08-25 08:51:55 -04:00
Jeff Becker
fc75da174e
disable second path for now until it works 2020-08-25 08:36:26 -04:00
Rick V
5c34665fce
move win32 lokimq patch 2020-08-10 13:51:48 -05:00
Jeff Becker
4bb214eba0
attempt fix for libunbound on win32
* run unbound stuff in another thread because LOL windows
* because unbound runs in another thread callbacks for libunbound need to be wrapped in a deferred call so they are done in the logic thread
* bump sqlite3 dep because it's gone, repin hash.
2020-08-04 10:53:32 -04:00
Jason Rhinelander
2b2c41fdf6
Fix sqlite3 external target name 2020-07-02 10:22:07 -06:00
Stephen Shelton
eb9a862f51
Sqlite3 deps for Windows / static targets 2020-07-02 10:22:06 -06:00
Stephen Shelton
6e1a23cdc7
Use pkg_check_modules instead of find_package for sqlite3 2020-07-02 10:22:05 -06:00
Stephen Shelton
4aa6f8e2df
Use find_package() for sqlite3 2020-07-02 10:22:04 -06:00
Jeff Becker
8772c05a13
revert download libsodium target name change 2020-07-02 11:13:31 -04:00
Jeff Becker
2737cd6f98
remove FindSodium.cmake and use the cmake incantations from loki-core for setting sodium target up 2020-07-02 11:13:31 -04:00
Jeff Becker
c6bd0afe96
move sodium cmake target about so that it is detected earlier 2020-07-02 11:13:31 -04:00
Jeff Becker
9f7ac7a9a3
apply patch 2020-07-02 11:13:31 -04:00
Jeff Becker
c2f9c46686
zmq requires win xp or higher. 2020-07-02 11:13:30 -04:00
Jeff Becker
fc08f92425
move lokimq cmake code 2020-07-02 11:10:06 -04:00
Jeff Becker
e13e886df9
fix up event loop crap so that unit tests pass 2020-07-02 11:10:06 -04:00
Jeff Becker
970cdf212b
fix up cmake cruft 2020-07-02 11:07:33 -04:00
Jeff Becker
7003eda305
add FindLokiMQ.cmake for finding lokimq package 2020-07-02 11:07:32 -04:00
Jeff Becker
31304dbd9f
fix up cmake cruft 2020-07-02 11:07:31 -04:00
Jeff Becker
520e472bcd
add FindLokiMQ.cmake for finding lokimq package 2020-07-02 11:07:31 -04:00
Jeff Becker
ad882d0d70
initial working code 2020-07-02 11:07:31 -04:00
Jeff Becker
0006751d80
initial wack at lokimq 2020-07-02 11:07:31 -04:00
Jeff Becker
a9de1ad277
fix typo 2020-06-17 11:09:22 -04:00
Jeff Becker
c66e925fb2
add more cmake incantations for windows cross compile 2020-06-17 11:06:12 -04:00
Jeff Becker
fdfdd2a1d2
turn off lto, add patches 2020-06-17 10:37:41 -04:00