Commit Graph

2767 Commits

Author SHA1 Message Date
Jeff Becker
df0120f161
fix limit 2019-03-04 11:05:27 -05:00
Jeff
d75704739c
Merge pull request #370 from michael-loki:rapidjson
Convert from using rapidjson to use nlohmann::json
2019-03-04 09:01:39 -05:00
Michael
ab83d3d54e
Fixup build on debian 2019-03-03 21:17:03 +00:00
Michael
31441b46dc
Convert from rapidjson to use nlohmann::json 2019-03-02 02:32:50 +00:00
Michael
93399fdbb4
Make nlohmann::json part of the build 2019-03-02 02:32:18 +00:00
Michael
1b331ea6f7
Remove mention of rapidjson from readme/docker files etc 2019-03-02 02:32:18 +00:00
Michael
3e741e4b07
Import nlohmann json v3.5.0 2019-03-02 02:32:18 +00:00
Jeff
0a44d1b730
Merge pull request #367 from majestrate/staging
delay dns resolution for snode until we have a session with it
2019-03-01 14:13:20 -05:00
Jeff Becker
159415c363
delay dns resolution for snode until we have a session with it 2019-03-01 14:10:42 -05:00
Jeff
f032f71026
Merge pull request #366 from sachaaaaa/missing_override
Add missing override in evp.hpp
2019-02-28 18:03:57 -05:00
sachaaaaa
d08169f104 Add missing override in evp.hpp 2019-03-01 09:59:36 +11:00
Jeff
f034bfc184
Merge pull request #365 from majestrate/fix-libabyss-352
updates
2019-02-28 11:04:25 -05:00
Jeff Becker
86098b198f
clear errno and log invalid data 2019-02-28 11:02:36 -05:00
Jeff Becker
9e9818febe
Merge branch 'staging' into fix-libabyss-352 2019-02-28 10:47:50 -05:00
Jeff
db92d44a57
Merge pull request #356 from neuroscr/master
output pubkey in base32z
2019-02-28 08:55:54 -05:00
Jeff
d255ce50ac
Merge branch 'staging' into master 2019-02-28 08:55:45 -05:00
Jeff
c0c3c20954
Merge pull request #362 from neuroscr/issue324
Fix cname lookups on mojave: issue #324
2019-02-28 08:54:44 -05:00
Jeff Becker
679a0cc7f0
update debian parts 2019-02-28 08:49:04 -05:00
Ryan Tharp
fd61ac2f6a Merge branch 'issue324' of https://github.com/neuroscr/loki-network into issue324 2019-02-27 21:40:08 -08:00
Ryan Tharp
1757426d63 Merge branch 'staging' of https://github.com/loki-project/loki-network into issue324 2019-02-27 21:39:25 -08:00
Ryan Tharp
4d6451aaa2 fix mojave random.snode lookup issue #324 2019-02-27 21:39:24 -08:00
Ryan Tharp
5e37211f87 Merge branch 'staging' of https://github.com/loki-project/loki-network into issue324 2019-02-27 21:23:50 -08:00
Ryan Tharp
1ec1b132ea Merge branch 'staging' of https://github.com/loki-project/loki-network 2019-02-27 21:21:42 -08:00
Ryan Tharp
58b54b96f9 fix mojave random.snode lookup issue #324 2019-02-27 21:17:40 -08:00
Ryan Tharp
f1ff247240 convert pubKey to RouterID 2019-02-27 21:11:52 -08:00
Ryan Tharp
6e4e6c997e undo previous change 2019-02-27 21:11:17 -08:00
Jeff
c10f7d82cf
Merge pull request #359 from majestrate/fix-libabyss-352
Fix #352
2019-02-27 11:18:46 -05:00
Jeff Becker
46b80e465d
* fix jsonrpc endpoint path for caller
* make epoll not crash and leak
* correct key name in config
2019-02-27 10:19:55 -05:00
Jeff Becker
71302ee48b
Merge remote-tracking branch 'origin/staging' into fix-libabyss-352 2019-02-27 07:55:38 -05:00
Jeff Becker
f8d6becce8
make whitelist happy 2019-02-27 07:55:26 -05:00
Ryan Tharp
4b5e96c414 output in base32z 2019-02-26 17:22:12 -08:00
Ryan Tharp
6b763807e6 add missing include to make linux gcc 7.3 happy 2019-02-27 00:03:25 +00:00
Ryan Tharp
2906a89e62 make linux compile 2019-02-27 00:02:36 +00:00
Jeff
db504e8044
Merge pull request #354 from despair86/dev
regression fixes
2019-02-26 17:40:48 -05:00
Jeff
e8fb7d34c0
Merge pull request #349 from michael-loki/printer
Create Printer - A general-purpose, stateful printer class
2019-02-26 17:40:24 -05:00
Jeff
9578d10b8b
Merge pull request #348 from michael-loki/string_view_abseil
Use string_view for string_view
2019-02-26 17:40:17 -05:00
Rick V
975b4ca743
clang-format 2019-02-26 15:48:03 -06:00
Rick V
0de253065e
remove ded code
add code for proper DNSc search
2019-02-26 15:35:04 -06:00
Rick V
bc4f049af1
properly detect the presence of the TAP network driver
plus some other installer nitpicks
2019-02-26 15:32:43 -06:00
Jeff Becker
a6b9a19b3d
start working on 352 2019-02-26 10:09:37 -05:00
Jeff Becker
ef13ec7499
Merge remote-tracking branch 'origin/staging' into staging 2019-02-26 07:55:27 -05:00
Rick V
01871a4cbc
fix openbsd 2019-02-25 21:06:28 -06:00
Rick V
d67eb40697
require full C++11 toolset for mingw-w64 (see loki-project/loki #441) 2019-02-25 21:06:02 -06:00
Rick V
95835a50f9
move critical section to cover all handler entry points 2019-02-25 18:47:59 -06:00
Rick V
e94d1ebb4f
combine these 2019-02-25 17:35:37 -06:00
Rick V
6e91547b39
ok serialising tun::FlushSend should get rid of that crash from #192 2019-02-25 16:55:05 -06:00
Rick V
f0ce9a0afb
try fixing threading bug
XXX: get jeff to go over threadpool code for overview
2019-02-25 16:15:01 -06:00
Jeff
335e66a608
Merge pull request #350 from majestrate/fix-convotag-issue
fixes
2019-02-25 10:35:06 -05:00
Jeff Becker
66e503b6aa
print snode not hex 2019-02-25 08:24:26 -05:00
Jeff Becker
88f988d142
use std::set 2019-02-25 08:03:34 -05:00