Commit Graph

4058 Commits

Author SHA1 Message Date
Michael
2acb163083
Fix llvm 8 build 2019-07-06 14:46:25 +01:00
Michael
a2326efa37
Revert "Merge pull request #679 from tewinget/revert-config-refactor"
This reverts commit 2996a7f29c, reversing
changes made to 10df3bd4b3.
2019-07-06 14:46:25 +01:00
Jeff
c15fc4c8fb
Merge pull request #684 from majestrate/fix-mac-os-tun-pi
Fix mac os tun pi
2019-07-05 11:50:15 -04:00
Jeff Becker
89a3e375d2
fix last commit 2019-07-05 10:48:10 -04:00
Jeff Becker
a781589b52
try fix for localhost.loki 2019-07-05 10:41:26 -04:00
Jeff
ce034b3dff
make it work 2019-07-05 10:14:07 -04:00
Jeff Becker
6467d21ba0
* fix testnet codepath
* add packet info for osx
2019-07-05 10:13:58 -04:00
Jeff
adcc866478 make it work 2019-07-05 08:51:54 -04:00
Jeff
0c5ee8a5a5 Merge remote-tracking branch 'origin/master' into ipv6-tun 2019-07-05 08:33:13 -04:00
Jeff Becker
81cab62bb9
* fix testnet codepath
* add packet info for osx
2019-07-05 08:07:06 -04:00
Jeff Becker
c4aaa80e75
use sane defaults and deprecated "auto" as it's horribly bad style 2019-07-03 10:32:51 -04:00
Jeff Becker
3638496e8d
Merge remote-tracking branch 'origin/master' into ipv6-tun 2019-07-03 09:43:34 -04:00
Jeff
7a4b48ca05
Merge pull request #682 from majestrate/fix-locking
don't lock when visiting links
2019-07-03 09:09:28 -04:00
Jeff Becker
fdfd8c6150
don't lock when visiting links 2019-07-03 08:42:11 -04:00
Jeff
b1fa0135ba
Merge pull request #681 from majestrate/fix-locking
fix locking types
2019-07-02 20:13:19 -04:00
Jeff
3b006e67e8
Merge pull request #680 from loki-project/api-docs
update LTRP docs
2019-07-02 15:16:27 -04:00
Jeff Becker
ec1910b8ca
remove threadpool.hpp
make link layer not use null lock and null mutex
2019-07-02 15:01:14 -04:00
Jeff Becker
fc8f58822c
remove threadpool.hpp
make link layer not use null lock and null mutex
2019-07-02 15:00:24 -04:00
Jeff
17c1ab689e
Update api_v0.txt 2019-07-02 14:51:17 -04:00
Jeff
0b4cb50ac1
Update readme.md 2019-07-02 11:29:28 -04:00
Jeff Becker
04c9c61dfb
Merge remote-tracking branch 'origin/master' into ipv6-tun 2019-07-02 11:25:10 -04:00
Jeff
2996a7f29c
Merge pull request #679 from tewinget/revert-config-refactor
Reverts #678 #677 and #669 with hashes:
2019-07-02 11:07:01 -04:00
Thomas Winget
d044d60101 Reverts #678 #677 and #669 with hashes:
10df3bd
766ece8
979f095

See those commits for further details
2019-07-02 11:02:20 -04:00
Jeff
10df3bd4b3
Merge pull request #678 from majestrate/disable-rpc
actually set config for network
2019-07-02 09:38:37 -04:00
Jeff Becker
191ebe32ce
actually set config for network 2019-07-02 09:33:36 -04:00
Jeff
766ece8355
Merge pull request #677 from majestrate/disable-rpc
disable rpc by default
2019-07-02 09:23:15 -04:00
Jeff Becker
a82be1d040
disable rpc by default 2019-07-02 09:19:28 -04:00
Jeff
979f095415
Merge pull request #669 from michael-loki/refactor_config
Refactor config
2019-07-02 09:09:10 -04:00
Michael
8c2d67f8f1
Fix tests 2019-07-02 10:06:29 +01:00
Michael
b51f7d8015
Convert to load config in config loader 2019-07-02 01:58:39 +01:00
Michael
bd78471dae
Move ini parser as well 2019-07-02 01:58:38 +01:00
Michael
00c237dc6d
Move config class to its own dir 2019-07-02 01:58:38 +01:00
Jeff
52314d81fa
Merge pull request #673 from michael-loki/unfuck_fslib
Re-import cppbackport
2019-07-01 20:17:13 -04:00
Michael
80d1e4aef9
Add in-source version of std::filesystem::permissions 2019-07-02 00:01:25 +01:00
Jeff Becker
5874c38b38
swap path on inbound convo if expires soon 2019-07-01 17:35:49 -04:00
Jeff Becker
f211ff182a
pick ready paths for reply 2019-07-01 16:45:00 -04:00
Jeff Becker
20e5f8964c
Merge remote-tracking branch 'origin/master' into ipv6-tun 2019-07-01 16:39:43 -04:00
Jeff
94cf18e3af
Merge pull request #676 from majestrate/utp-timeout-2019-07-01
relax timeouts for handshake and make format
2019-07-01 14:28:40 -04:00
Jeff Becker
0b090b671a
relax timeouts for handshake and make format 2019-07-01 14:06:17 -04:00
Jeff Becker
2216376fe2
Merge remote-tracking branch 'origin/master' into ipv6-tun 2019-07-01 13:58:00 -04:00
Jeff
d044de9e73
Merge pull request #675 from majestrate/utp-timeout-2019-07-01
pump write when handshaking
2019-07-01 13:56:33 -04:00
Jeff Becker
915b11b0bb
ping on send idle not recv idle 2019-07-01 13:53:08 -04:00
Jeff Becker
abb1924eef
pump write when handshaking 2019-07-01 13:48:46 -04:00
Jeff
b40b4bdce9
Merge pull request #674 from majestrate/utp-timeout-2019-07-01
close after 30 seconds of dead
2019-07-01 13:37:04 -04:00
Jeff Becker
45384deaa0
close after 30 seconds of dead 2019-07-01 13:21:34 -04:00
Jeff Becker
00ca1c6f3e
close after 30 seconds of dead 2019-07-01 13:20:41 -04:00
Jeff Becker
d6ec528a72
start work on seperating ips out of endpoint 2019-07-01 10:56:56 -04:00
Jeff Becker
64e9622270
start seperating tun and endpoint 2019-07-01 09:44:25 -04:00
Jeff Becker
ef50c726b1
better logging 2019-07-01 08:55:01 -04:00
Jeff Becker
5eb7ec493f
do direct lookup when in endgame scenario as client when looking for router 2019-07-01 08:17:59 -04:00