Commit Graph

3855 Commits

Author SHA1 Message Date
Jeff Becker
1fd6b5ae74
Merge remote-tracking branch 'origin/master' into ipv6-tun 2019-07-12 09:53:52 -04:00
Jeff
96a4c027d7
Merge pull request #699 from majestrate/disable-shell-hooks-compile
disable shell hooks by default
2019-07-12 09:50:49 -04:00
Jeff
1a145ea515
Merge pull request #697 from majestrate/fix-freebsd-pthread
typo fix
2019-07-12 09:50:37 -04:00
Jeff Becker
095330b787
disable shell hooks by default 2019-07-12 09:06:59 -04:00
Jeff Becker
8c67f14838
typo fix lel 2019-07-12 08:31:37 -04:00
Jeff
ceaef9d9e3
Merge pull request #696 from michael-loki/minor_warnings
Fixup two minor warnings
2019-07-12 08:25:19 -04:00
Michael
be997020dd
Fixup two minor warnings 2019-07-12 07:27:21 +01:00
Jeff
a768a9ad59
Merge pull request #695 from majestrate/fix-freebsd-pthread
fix freebsd build for real
2019-07-11 13:29:48 -04:00
Jeff Becker
ebab9b8905
fix freebsd build for real 2019-07-11 11:07:16 -04:00
Jeff
8e6c830641
Merge pull request #691 from majestrate/fix-freebsd-pthread
fix freebsd build
2019-07-11 10:00:37 -04:00
Jeff Becker
b207990d01
use elseif 2019-07-11 07:27:00 -04:00
michael-loki
b63893de9d
Merge pull request #692 from michael-loki/fs_path_constructor
Add missing cppbackport fs::path constructor
2019-07-11 09:59:11 +01:00
Jeff Becker
4206132ea1
use correct function from free bsd pthread 2019-07-10 18:03:52 -04:00
Michael
89eb1ded76
Add missing cppbackport fs::path constructor 2019-07-10 22:56:06 +01:00
Jeff Becker
e0d8e34369
fix freebsd build 2019-07-10 12:46:21 -04:00
michael-loki
ea2c19904f
Merge pull request #690 from michael-loki/clang-tidy-pass1
Remove redundant else blocks
2019-07-10 15:38:44 +01:00
Jeff Becker
749ee7cb9f
make it compile 2019-07-10 10:11:06 -04:00
Jeff Becker
fcc3c05124
Merge remote-tracking branch 'origin/master' into ipv6-tun 2019-07-10 10:07:19 -04:00
Michael
99798a74e1
Address Jeff's comment 2019-07-09 23:04:07 +01:00
Michael
488695047f
Remove redundant else blocks 2019-07-09 22:54:46 +01:00
michael-loki
0cd9b4c380
Merge pull request #687 from michael-loki/config_env
Allow environment variable override of config
2019-07-09 21:42:31 +01:00
Jeff Becker
5460cb5aa6
* pump after stopping hidden service context
* flush nodedb after stopping links
2019-07-09 15:44:53 -04:00
Jeff Becker
d86633bc96
remove comment that is wrong 2019-07-09 15:27:48 -04:00
Jeff Becker
f5291951f6
use logical or not bitwise or and change function name to be plural 2019-07-09 15:20:01 -04:00
Jeff Becker
3ed8dec78b
use const reference and don't log invalid packets 2019-07-09 15:17:27 -04:00
Jeff Becker
454fb3bb72
use logical or instead of bitwise or 2019-07-09 14:51:43 -04:00
Jeff Becker
edd3611166
correct name 2019-07-09 10:05:31 -04:00
Jeff Becker
ec6a1cfddc
make it compile 2019-07-09 09:58:16 -04:00
Jeff Becker
84407b3557
make it compile 2019-07-09 09:54:13 -04:00
Jeff Becker
fb803cfe11
lel 2019-07-09 09:50:50 -04:00
Jeff Becker
8ac9ef6f18
Merge remote-tracking branch 'origin/master' into ipv6-tun 2019-07-09 09:48:15 -04:00
Jeff Becker
b9bcc2b775
make threadpool consice 2019-07-09 09:47:24 -04:00
Jeff
777f2fefc6
Merge pull request #688 from michael-loki/thread_name
Add function to set threadname, and use from threadpool impl
2019-07-08 20:44:51 -04:00
Michael
b01e5accbb
Add function to set threadname, and use from threadpool impl 2019-07-09 01:06:22 +01:00
Michael
3ce90b678e
Allow override of the rest of the config 2019-07-09 00:29:43 +01:00
Michael
fbb83704a0
Allow override of some config via env variables 2019-07-09 00:29:43 +01:00
Michael
08d306f6e9
Have fromSection return void 2019-07-09 00:29:43 +01:00
Michael
937f28f75d
Move router config to be encapsulated 2019-07-09 00:29:43 +01:00
Jeff Becker
0eb6431eb1
initialize tun with 0 and set defaults in correct places 2019-07-08 11:26:06 -04:00
Jeff Becker
134d36eb02
whitespace fix 2019-07-08 10:23:26 -04:00
Jeff Becker
fd911d0c52
make format 2019-07-08 10:22:47 -04:00
Jeff Becker
4edb9d9b45
fix 2019-07-08 10:22:25 -04:00
Jeff Becker
58005c5f81
Merge remote-tracking branch 'origin/master' into ipv6-tun 2019-07-08 10:17:21 -04:00
Jeff
7ce742622e
Merge pull request #685 from michael-loki/refactor_config_redux
Refactor config redux
2019-07-08 08:27:31 -04:00
Michael
6418c67f75
Set netid before doing anything else 2019-07-07 12:29:44 +01:00
Michael
661a8b6537
Fix macos build after rebase 2019-07-06 15:59:13 +01:00
Michael
f310160065
Fixup and add tests 2019-07-06 14:46:25 +01:00
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