Commit Graph

1614 Commits

Author SHA1 Message Date
Ryan Tharp
5248283128 Merge branch 'master' of https://github.com/loki-project/loki-network 2018-10-29 23:15:53 +00:00
Jeff Becker
46bd47438f
Merge branch 'dev' 2018-10-29 18:45:26 -04:00
Jeff Becker
2b51b8a5d7
Merge branch 'master' of ssh://github.com/loki-project/loki-network 2018-10-29 18:45:20 -04:00
Jeff Becker
1623deb020
really make it compile 2018-10-29 13:22:26 -04:00
Jeff Becker
69e187cfd7
make it compile 2018-10-29 13:20:50 -04:00
Jeff Becker
5fdb2ce7ff
try better freebsd tun route 2018-10-29 13:17:42 -04:00
Jeff Becker
e722e69543
more freebsd stuff 2018-10-29 13:15:18 -04:00
Jeff Becker
0d09dbb1c2
disable special tun behavior for freebsd 2018-10-29 13:06:32 -04:00
Jeff Becker
51bfcb5493
milliseconds not microseconds 2018-10-29 12:58:19 -04:00
Jeff Becker
0320736cae
don't shadow 2018-10-29 12:51:52 -04:00
Jeff Becker
cda6bd3919
update docs 2018-10-29 12:49:36 -04:00
Jeff Becker
56132f365f
update test 2018-10-29 12:49:09 -04:00
Jeff Becker
dbd2c41909
use event loop for time 2018-10-29 12:48:36 -04:00
Jeff Becker
c5e2cffdbb
this may be better? 2018-10-29 10:37:20 -04:00
Jeff Becker
d21c2a3288
get rid of junk 2018-10-29 10:29:52 -04:00
Jeff Becker
dc3492d374
this may work 2018-10-29 10:29:28 -04:00
Jeff Becker
59f5cd70f5
idk any d 2018-10-29 10:27:27 -04:00
Jeff Becker
a234e9ad86
this? 2018-10-29 10:24:01 -04:00
Jeff Becker
1513915415
try this 2018-10-29 10:20:45 -04:00
Jeff Becker
129de103f2
try this 2018-10-29 10:17:54 -04:00
Jeff Becker
bc95f0eaba
try clearing (idk any D HELP I NEED AN ADULT !) 2018-10-29 10:16:45 -04:00
Jeff Becker
303ee9c692
correct call (?) 2018-10-29 10:13:37 -04:00
Jeff Becker
cf81e0fd63
fug 2018-10-29 10:12:54 -04:00
Jeff Becker
7565e455a9
remove line 2018-10-29 10:12:22 -04:00
Jeff Becker
e68462a568
correct shebang 2018-10-29 10:11:28 -04:00
Jeff Becker
b0ebce5c36
initial lokinet d-trace profiler (toy) 2018-10-29 09:31:37 -04:00
Jeff
d0b2c9863e
Merge pull request #35 from michael-loki/cmake_tidy
Modernise CMake build
2018-10-28 18:01:25 -04:00
Michael Thorpe
4690aceb0d
Modernise CMake build
- Bump to require version 3.7.0
- Change to use `add_compile_options` over manually appending to
  `CMAKE_C_FLAGS` or `CMAKE_CXX_FLAGS`.
- Use CMake machinery to set expected C++ standard
- Use CMake machinery to find flag(s) for pthread build
2018-10-28 18:57:04 +00:00
Jeff Becker
15c237a5a2
typofix from fediverse, thnx m4iler 2018-10-28 12:46:09 -04:00
Jeff Becker
486a48b796
update manpage 2018-10-28 12:12:09 -04:00
Jeff Becker
0cbdad6711
typo 2018-10-28 10:43:42 -04:00
Jeff Becker
f1fbb808da
Merge branch 'dev' of ssh://github.com/loki-project/loki-network into dev 2018-10-28 10:42:18 -04:00
Jeff Becker
6ae16a6895
freebsd add route 2018-10-28 10:41:59 -04:00
Jeff Becker
e196d909c2
port bootstrap script to sh 2018-10-28 10:31:02 -04:00
Jeff Becker
7d06bd0652
freebsd shebang fix 2018-10-28 10:30:21 -04:00
Jeff Becker
5fa9eb180b
freebsd fix 2018-10-28 10:29:09 -04:00
Jeff Becker
d1d323a9b8
freebsd stuff 2018-10-28 10:28:13 -04:00
Jeff Becker
1645000a5e
Merge branch 'master' of ssh://github.com/loki-project/loki-network 2018-10-28 10:12:10 -04:00
Jeff Becker
7d00dc7800
fix readme indentation 2018-10-28 10:12:00 -04:00
Ryan Tharp
7bfbe78d73 Merge branch 'master' of https://github.com/neuroscr/loki-network 2018-10-28 13:11:12 +00:00
Jeff
b842f5af20 tweak lookup timeout 2018-10-28 08:56:14 -04:00
Ryan Tharp
3f424e545d Merge branch 'master' of https://github.com/loki-project/loki-network 2018-10-27 22:57:19 +00:00
Ryan Tharp
1877498fce Merge branch 'master' of https://github.com/loki-project/loki-network 2018-10-27 15:40:20 -07:00
Ryan Tharp
9205b8172c scan-build fixes 2018-10-27 15:40:12 -07:00
Jeff
9f9d4cd0e0 flush during tick 2018-10-27 18:07:16 -04:00
Jeff
2ca152f43f make tun work on kqueue 2018-10-27 16:02:37 -04:00
Jeff
678f9e30eb call cleanup timer 2018-10-27 16:02:24 -04:00
Jeff
04b738aa9e make it work on osx for real 2018-10-27 15:03:23 -04:00
Jeff
d3531ca561 fix macos build and add anaylze target 2018-10-27 14:26:08 -04:00
Jeff Becker
320be02b21
Merge branch 'dev' of ssh://github.com/loki-project/loki-network into dev 2018-10-27 08:47:15 -04:00