Commit Graph

4689 Commits

Author SHA1 Message Date
Adam Ierymenko
af137fd5d3
Merge branch 'edge' of http://git.int.zerotier.com/zerotier/ZeroTierOne into edge 2019-08-12 15:37:55 -07:00
Adam Ierymenko
f7bc9f01c9
More AES stuff 2019-08-12 15:37:50 -07:00
Grant Limberg
e4ce1ffd85 Windows detection of AES-NI 2019-08-12 15:28:42 -07:00
Grant Limberg
2384b49156 set cmake windows build target to Windows 7 2019-08-12 15:28:30 -07:00
Adam Ierymenko
f5e71f64ed
Merge branch 'edge' of http://git.int.zerotier.com/zerotier/ZeroTierOne into edge 2019-08-12 13:27:07 -07:00
Adam Ierymenko
927ef22cf8
Merge branch 'dev' into edge 2019-08-12 13:27:00 -07:00
Grant Limberg
b6eaec1278 run selftest 2019-08-12 13:26:34 -07:00
Grant Limberg
c7d1eb71da build & run selftest as part of jenkins 2019-08-12 13:25:14 -07:00
Adam Ierymenko
98af3c0dc1
* Fix high CPU use bug on some platforms
* Fix issues with PostgreSQL controller DB (only affects Central)
 * Restore backward compatibility with MacOS versions prior to 10.13
2019-08-12 13:25:12 -07:00
Grant Limberg
7d41d267a3 silencing warnings for code paths that will never be hit 2019-08-12 13:18:21 -07:00
Grant Limberg
0ead65ad2d change this 2019-08-12 13:11:43 -07:00
Grant Limberg
8c5481a3d5 Merge branch 'edge' of http://git.int.zerotier.com/zerotier/ZeroTierOne into edge 2019-08-12 12:58:20 -07:00
Grant Limberg
741258051e this should work better 2019-08-12 12:58:10 -07:00
Adam Ierymenko
0f4fc8635b
Merge branch 'edge' of http://git.int.zerotier.com/zerotier/ZeroTierOne into edge 2019-08-12 12:51:38 -07:00
Adam Ierymenko
d02d3f72fe
AES-GCM code 2019-08-12 12:51:32 -07:00
Grant Limberg
710b69fc75 kill build dir before jenkins build 2019-08-12 12:44:47 -07:00
Grant Limberg
4fae382ffd Auto-generate version.h 2019-08-12 12:43:51 -07:00
Grant Limberg
68b94a3188 CMake for edge branch 2019-08-12 12:35:07 -07:00
Grant Limberg
8e04f83232 Merge branch 'edge' into cmake 2019-08-12 12:24:25 -07:00
Grant Limberg
cc9fd9f8ce Merge branch 'dev' into cmake 2019-08-12 12:23:36 -07:00
Adam Ierymenko
1e8fcf1344
Add AES to build 2019-08-09 13:42:40 -05:00
Adam Ierymenko
809c8305b1
AES code 2019-08-09 10:54:08 -05:00
Adam Ierymenko
652c7e8f37
Locator work 2019-08-08 23:23:16 -05:00
Adam Ierymenko
beebca98fe
Merge branch 'dev' into edge 2019-08-08 19:42:16 -05:00
Adam Ierymenko
5341c216a7
Comment ugly query 2019-08-08 19:20:01 -05:00
Adam Ierymenko
96a0c3d764
ugly query is ugly 2019-08-08 19:16:11 -05:00
Adam Ierymenko
783b49e383
more worky less not worky 2019-08-08 18:58:22 -05:00
Adam Ierymenko
ce67abc32f
Merge branch 'dev' into edge 2019-08-08 18:49:03 -05:00
Adam Ierymenko
d4dc983a01
fix bad column name 2019-08-08 18:31:41 -05:00
Adam Ierymenko
72ccd1020a
Another exception fix 2019-08-08 18:11:06 -05:00
Adam Ierymenko
6a9a577c59
rulesSource needs to be required in network or pgsql has issues 2019-08-08 17:56:27 -05:00
Adam Ierymenko
730305ecc7
One more sync fix. 2019-08-08 17:31:32 -05:00
Adam Ierymenko
f8f2432ece
Shutdown fix 2019-08-08 17:22:20 -05:00
Adam Ierymenko
55087521f6
Add periodic sync check when syncing LF<>another DB 2019-08-08 17:20:50 -05:00
Adam Ierymenko
760ae07d72
Sync bug fix 2019-08-08 16:30:52 -05:00
Adam Ierymenko
52cc482521
Merge branch 'dev' into edge 2019-08-08 15:59:58 -05:00
Adam Ierymenko
28d0070ce2
Fix race in multiple DB mirroring configurations. 2019-08-08 15:29:13 -05:00
Adam Ierymenko
ad2a7c2590 More windows build fixes 2019-08-08 15:15:12 -05:00
Adam Ierymenko
5eacad444d
workinprogress 2019-08-08 15:03:52 -05:00
Adam Ierymenko
8b97755fc5 Windows fixes. 2019-08-08 14:08:35 -05:00
Adam Ierymenko
e8155cbbeb
Merge dev 2019-08-08 13:05:28 -05:00
Adam Ierymenko
7bb0d9be1b
warning removal 2019-08-08 11:04:11 -05:00
Adam Ierymenko
6c44fcc290
more warning cleanup 2019-08-08 10:28:57 -05:00
Adam Ierymenko
c8e7031198
warning cleanup 2019-08-08 10:01:57 -05:00
Adam Ierymenko
fb3b2820b5
centos 7 docs 2019-08-08 09:50:05 -05:00
Adam Ierymenko
663376e385
cleanup 2019-08-08 08:42:27 -05:00
Adam Ierymenko
3c590994db
Finish up ECC384 identity generation. 2019-08-07 23:50:47 -05:00
Adam Ierymenko
14c8564893
Merge branch 'dev' into edge 2019-08-07 22:35:27 -05:00
Adam Ierymenko
91a37f8868
Add base64 code (unpadded standard alphabet) 2019-08-07 22:35:17 -05:00
Adam Ierymenko
c83a4aef55
cleanup 2019-08-07 21:47:06 -05:00