Compare commits

...
458 Commits
Author SHA1 Message Date
Grant Limberg b849e23536 Moved zerotier-root code to its own repo 2025-01-07 11:06:42 -08:00
Adam Ierymenko 0ab4e2f750 Roots now understand encrypted HELLO. 2024-09-26 19:47:57 -04:00
Adam Ierymenko 2316a45a45 clang-format root 2024-09-26 13:41:59 -04:00
Adam Ierymenko 0a6c22a9b8 . 2024-08-14 08:10:44 -04:00
Adam Ierymenko 8adf064a04 Yet another fix. 2021-09-21 12:36:00 -04:00
Adam Ierymenko 7fe00f4247 Another dumb RENDEZVOUS bug. 2021-09-21 12:13:47 -04:00
Adam Ierymenko 5eae02068d Fix bass ackwards addresses making RENDEZVOUS packets not make it, improve P2P. 2021-09-21 11:58:39 -04:00
Adam Ierymenko 5d429cedbb Send error. 2021-09-20 16:56:16 -04:00
Adam Ierymenko 3c85322067 Meh... fixed now. 2021-09-20 15:54:12 -04:00
Adam Ierymenko 9fb902bdf6 Pointer deref fix. 2021-09-20 15:43:27 -04:00
Adam Ierymenko 262cb7a4b5 Generate new peer if old was bad. 2021-09-20 15:12:56 -04:00
Adam Ierymenko 104fade420 Thinko. 2021-09-20 15:04:25 -04:00
Adam Ierymenko bcf8c30ce0 Simplify validation logic too. 2021-09-20 14:56:49 -04:00
Adam Ierymenko c2413fca4d Clean out a bunch of old code related to the possibility of multiple peers sharing virtual addresses. Does not seem to be currently exploitable but we are never going back to that idea, so this simplifies things. May also speed up the root. 2021-09-20 14:42:49 -04:00
Adam Ierymenko 5028aca372 Fix some identity verification stuff, performance improvements, build of root now requires libjemalloc. 2021-06-18 16:14:59 -04:00
Adam Ierymenko 311f9c5c2a A few minor changes: (1) bind sockets to peers so the same socket is always used to send as most recently received, (2) pick the most recently active IP (v4 or v6) if both exist, and (3) introduce expiry of V4 or V6 IPs in addition to the peer overall. 2021-05-26 19:37:48 -04:00
Adam Ierymenko 32ca1a09da Set version threshold correctly for v2 2020-08-27 10:00:11 -07:00
Adam Ierymenko bba1324145 One more sanity check. 2020-01-21 11:04:18 -08:00
Adam Ierymenko ff655292fb Allocate packet on heap, add extra sanity checks on packet size. 2020-01-21 10:58:41 -08:00
Grant Limberg 2558bd1b9b include iomanip 2020-01-16 09:11:12 -08:00
Grant Limberg 95d0944b9f add /metrics endpoint for exposing root metrics to Prometheus 2020-01-16 09:08:52 -08:00
Adam Ierymenko 68ac884d47 . 2019-10-02 14:30:46 -07:00
Adam Ierymenko e2f3996843 Fix callbacks 2019-10-02 13:39:48 -07:00
Adam Ierymenko 57ade250af . 2019-10-02 12:19:37 -07:00
Adam Ierymenko c3e0f262d1 Regularize JSON stuff 2019-10-02 09:34:44 -07:00
Adam Ierymenko b9911d0db7 More plumbing 2019-10-02 07:09:54 -07:00
Adam Ierymenko d1b780c7be addroot 2019-10-01 13:09:53 -07:00
Adam Ierymenko 1711cced3e . 2019-09-30 20:31:48 -07:00
Adam Ierymenko 63e6693255 . 2019-09-30 20:10:53 -07:00
Adam Ierymenko 9b8d191bb1 Locator fix 2019-09-30 20:09:35 -07:00
Adam Ierymenko 6db2b8c66d . 2019-09-30 20:03:03 -07:00
Adam Ierymenko 47a08ccbd4 Identity management plumbing to Go 2019-09-30 18:59:57 -07:00
Adam Ierymenko 7fc78129f4 A bunch of CLI work 2019-09-30 16:12:08 -07:00
Adam Ierymenko c4504fd3ff Vendor Go modules 2019-09-30 12:41:21 -07:00
Adam Ierymenko e4799ff8c4 Bunch of small warnings and stylistic things... 2019-09-30 11:10:47 -07:00
Adam Ierymenko f680924585 Build fixes 2019-09-30 09:48:44 -07:00
Adam Ierymenko b0d222768a Root admin stuff 2019-09-30 09:32:00 -07:00
Adam Ierymenko 4303c43db7 . 2019-09-27 14:55:46 -07:00
Adam Ierymenko 3b3e6d2bfc Simplify root API 2019-09-26 13:35:56 -07:00
Adam Ierymenko 7061f13b24 . 2019-09-26 09:34:31 -07:00
Adam Ierymenko 5175636d36 . 2019-09-25 14:31:08 -07:00
Adam Ierymenko 570032484f . 2019-09-25 14:16:55 -07:00
Adam Ierymenko 9c37fc1a5f . 2019-09-25 13:32:46 -07:00
Adam Ierymenko 105023bd87 Build fix 2019-09-25 12:43:14 -07:00
Adam Ierymenko 8a9669f130 . 2019-09-25 12:36:49 -07:00
Adam Ierymenko e5bd230fb0 . 2019-09-24 16:44:29 -07:00
Adam Ierymenko e3d47e588a . 2019-09-24 12:32:35 -07:00
Adam Ierymenko f4a5abeed9 Go CLI work 2019-09-24 12:19:28 -07:00
Adam Ierymenko a7e38d2b00 . 2019-09-23 16:58:55 -07:00
Adam Ierymenko 84ba396ed3 . 2019-09-23 16:47:13 -07:00
Adam Ierymenko 6683280a37 . 2019-09-23 16:46:58 -07:00
Adam Ierymenko 1edf680464 . 2019-09-23 16:46:31 -07:00
Adam Ierymenko 4df090469a Clean out obsolete dependencies. 2019-09-23 16:42:23 -07:00
Adam Ierymenko 3c63f58532 Build fix. 2019-09-23 16:21:43 -07:00
Adam Ierymenko 64c8171e13 Port binding check. 2019-09-23 16:21:02 -07:00
Adam Ierymenko b6175bd408 Gogogogogogogo 2019-09-23 15:18:52 -07:00
Adam Ierymenko b44bd19c53 . 2019-09-22 22:33:11 -07:00
Adam Ierymenko 536bc59abb . 2019-09-22 22:25:55 -07:00
Adam Ierymenko 70d5da1e2a . 2019-09-22 19:25:40 -07:00
Adam Ierymenko 90d4d79828 Peers and paths 2019-09-22 17:41:15 -07:00
Adam Ierymenko ccc9be2d4d All that cgo crap compiles! 2019-09-22 00:06:07 -07:00
Adam Ierymenko 3341c4a670 Rooting around 2019-09-21 22:54:58 -07:00
Adam Ierymenko bcb9df9cdf Network config stuff in Go 2019-09-21 20:40:06 -07:00
Adam Ierymenko 2eef9d22e6 getting there... 2019-09-21 18:22:25 -07:00
Adam Ierymenko 5e35346f17 Gogog 2019-09-21 15:35:27 -07:00
Adam Ierymenko bb53ee9567 Going once... going twice! 2019-09-21 15:04:00 -07:00
Adam Ierymenko 9934a856dd More go 2019-09-21 12:54:45 -07:00
Adam Ierymenko 24904c5083 Go F yourself 2019-09-21 11:56:31 -07:00
Adam Ierymenko 6ce4663a31 GoGoGo 2019-09-21 00:19:20 -07:00
Adam Ierymenko fbf74d3baa Go! Go! https://www.youtube.com/watch?v=hyGYdqMfrQQ 2019-09-20 21:00:54 -07:00
Adam Ierymenko b540181990 Go! Go! Go! - Moby 2019-09-20 20:34:31 -07:00
Adam Ierymenko 02a6b15e6b Moar Go 2019-09-20 19:51:57 -07:00
Adam Ierymenko b34aa10bf8 Go code! 2019-09-20 18:48:48 -07:00
Adam Ierymenko e0ddbc2f28 Update build process, Go glue builds now. 2019-09-20 15:00:53 -07:00
Adam Ierymenko ed2024285d More Go boilerplate. 2019-09-20 14:11:15 -07:00
Adam Ierymenko ae2120eb96 New service, work in progress 2019-09-20 09:09:05 -07:00
Adam Ierymenko 3ceb2257e5 Plumb through roots via API. 2019-09-19 09:47:12 -07:00
Adam Ierymenko 624efde7e4 Make sure threads dont exit on spurious return values from recvfrom unless we are really dying. 2019-09-16 20:41:23 -07:00
Adam Ierymenko 50009fef6f Merge branch 'dev' into edge 2019-09-16 20:26:41 -07:00
Adam Ierymenko de127056c2 Add notarization to "make official". 2019-09-16 20:13:20 -07:00
Adam Ierymenko dde937e197 cleanup 2019-09-16 19:58:21 -07:00
Adam Ierymenko 07a480b37a Build fix. 2019-09-16 18:04:32 -07:00
Adam Ierymenko 9f5bccec30 Add a recv timeout to root 2019-09-16 18:03:17 -07:00
Adam Ierymenko ade52bf81e Fix RENDEZVOUS issue and possibly improve GeoIP resolution. 2019-09-16 17:04:13 -07:00
Adam Ierymenko 71c766a3b2 Build fix 2019-09-16 15:09:56 -07:00
Adam Ierymenko eef66aee9a build fix 2019-09-16 14:51:02 -07:00
Adam Ierymenko e245eb1eb5 Trim some unnecessary locks from root, and cleanup elsewhere. 2019-09-16 14:48:27 -07:00
Adam Ierymenko e08fc81397 More threading improvements in root, more DNS TXT and multicast work (in progress) 2019-09-16 10:33:59 -07:00
Adam Ierymenko 9f9032ae36 Cleanup and warning removal. 2019-09-13 16:24:02 -07:00
Adam Ierymenko 063a16fcd6 Ensure SSE is enabled for Salsa20 on x64 2019-09-13 11:16:21 -07:00
Adam Ierymenko 0db4151492 cleanup 2019-09-13 11:10:56 -07:00
Adam Ierymenko e44d7a553f The root technically does not need to do this, and its slow. 2019-09-13 10:29:11 -07:00
Adam Ierymenko 53a2de98de Packet ID fix 2019-09-13 10:23:35 -07:00
Adam Ierymenko 2deaaeef28 Some root cleanup and more lock contention reduction. 2019-09-13 10:20:29 -07:00
Adam Ierymenko 1f9e16f63e AES optimization rabbit hole 2019-09-13 09:37:09 -07:00
Adam Ierymenko 87fe69c27c AES optimization rabbit hole 2019-09-13 09:35:49 -07:00
Adam Ierymenko 2d1eeda188 Cleanup, optimization 2019-09-12 14:32:37 -07:00
Adam Ierymenko 5c06d40358 cleanup 2019-09-12 10:37:26 -07:00
Adam Ierymenko 31e193756d cleanup 2019-09-12 09:59:46 -07:00
Adam Ierymenko 5aa744db84 Simplification and further concurrency improvements. 2019-09-12 08:41:34 -07:00
Adam Ierymenko 0ad82dad80 Linux build fix 2019-09-12 08:25:26 -07:00
Adam Ierymenko 99c36ed2f2 Parallelization improvements 2019-09-12 08:20:38 -07:00
Adam Ierymenko 44878e583a Bug fixes 2019-09-11 16:10:06 -07:00
Adam Ierymenko 0723a85ab3 Build fixes. 2019-09-11 15:52:18 -07:00
Adam Ierymenko d8dae365f6 Cleanup, optimization, multicast stuff, and it now compiles again. 2019-09-11 15:34:55 -07:00
Adam Ierymenko bccb86a401 More multicast work... 2019-09-10 16:20:28 -07:00
Adam Ierymenko 592e743349 Yet more multicast work. 2019-09-09 15:49:17 -07:00
Adam Ierymenko fb6161e9ac May as well make it a full self-signature. 2019-09-09 10:45:49 -07:00
Adam Ierymenko 787277d282 More multicast work, add a signature in identity for safety margin, cleanup. 2019-09-09 10:44:31 -07:00
Adam Ierymenko 540ee69773 A bunch of multicast work... in progress. 2019-09-07 19:15:21 -07:00
Adam Ierymenko 0d2c87fe4e map fix 2019-09-06 08:54:27 -07:00
Adam Ierymenko 2460de9713 map fix 2019-09-06 08:50:36 -07:00
Adam Ierymenko 0d32f42d26 map fix 2019-09-06 08:47:32 -07:00
Adam Ierymenko 277497684e Revert "map fix"
This reverts commit f4a83e516c.
2019-09-06 08:45:39 -07:00
Adam Ierymenko f4a83e516c map fix 2019-09-06 08:41:03 -07:00
Adam Ierymenko d2eb1ed9a5 map fix 2019-09-06 08:27:03 -07:00
Adam Ierymenko a3ec5846df map fix 2019-09-06 08:18:11 -07:00
Adam Ierymenko b6047899a8 map fix 2019-09-06 08:12:46 -07:00
Adam Ierymenko 3516070b6e map fix 2019-09-06 08:11:20 -07:00
Adam Ierymenko 56ec87e00e map fix 2019-09-06 08:03:59 -07:00
Adam Ierymenko fe0b896665 map fix 2019-09-06 07:58:43 -07:00
Adam Ierymenko e4721417e6 map fix 2019-09-06 07:55:36 -07:00
Adam Ierymenko 45f5b3b648 map fix 2019-09-06 07:40:32 -07:00
Adam Ierymenko 3123102211 root cleanup and add nifty geoip thing 2019-09-06 07:37:44 -07:00
Adam Ierymenko c6141ffbc7 cleanup 2019-09-05 18:06:48 -07:00
Adam Ierymenko c0e92d06a5 faster without const variable second-guessing of the compiler 2019-09-05 17:31:12 -07:00
Adam Ierymenko 274b2682d6 cleanup and docs 2019-09-05 15:09:20 -07:00
Adam Ierymenko 171d661b84 cleanup 2019-09-05 12:17:04 -07:00
Adam Ierymenko 5cea8da664 Optimization and naming cleanup 2019-09-05 12:03:11 -07:00
Adam Ierymenko 44dd52d08f KBKDF 2019-09-05 11:39:16 -07:00
Adam Ierymenko 70648d006d Merge branch 'dev' into edge 2019-09-05 11:06:27 -07:00
Adam Ierymenko 0767ea5d69 * Update default root list to latest
* ARM32 platform build and flag fixes
 * Add a clarification line to LICENSE.txt
 * Fix license message in CLI
 * Windows service now looks for service command line arguments
 * Fixed a bug that could cause excessive queued multicasts
2019-09-05 11:02:16 -07:00
Adam Ierymenko 43e6a9e9ee more fastitude 2019-09-05 09:54:30 -07:00
Adam Ierymenko 0599c1710b Merge branch 'dev' into edge 2019-09-04 16:41:05 -07:00
Adam Ierymenko abf218a9cd cleanup 2019-09-04 16:38:55 -07:00
Adam Ierymenko 55f4f9aaeb cleanup 2019-09-04 16:15:10 -07:00
Adam Ierymenko 82b7e1dbcb HMAC fix 2019-09-04 15:22:15 -07:00
Adam Ierymenko e8f8b0f8e5 cleanup 2019-09-04 14:40:36 -07:00
Adam Ierymenko 7566d4fbab Merge dev 2019-09-04 14:38:35 -07:00
Adam Ierymenko 3a0d385119 Implement changes to AES-GMAC-CTR: four keys with one for each role/purpose instead of just two, and simpler CTR-IV calculation. 2019-09-04 14:37:38 -07:00
Adam Ierymenko 8454a14eac new Windows GUID for build #2 2019-09-04 14:25:57 -07:00
Adam Ierymenko ecee310087 Update built-in root list. 2019-09-04 14:17:41 -07:00
Adam Ierymenko bcdab95e4c Windows installer version bump, build fix. 2019-09-04 14:13:45 -07:00
Adam Ierymenko a16377cea5 Add mitigations against borked ARM32 exception unrollers, possibly fix GitHub issue #1003 2019-09-04 12:48:28 -07:00
Adam Ierymenko ef69f1bb27 ARM wrestling 2019-09-04 12:37:54 -07:00
Adam Ierymenko 27c8eb0d6d GitHub issue #1019 2019-09-04 12:21:51 -07:00
Adam Ierymenko a465afa83d Merge branch 'dev' into edge 2019-09-04 08:19:39 -07:00
Adam Ierymenko 3c0f54257b Debian typo fix 2019-09-04 08:19:33 -07:00
Adam Ierymenko 185e90c40f AES-GMAC-CTR tweaks, self test tweaks, debian typo fix. 2019-09-04 08:19:12 -07:00
Adam Ierymenko e29c2d0260 Fix field headers 2019-09-03 15:59:34 -07:00
Adam Ierymenko acf6425ae9 Formatting fix 2019-09-03 15:55:23 -07:00
Adam Ierymenko 5e8d49de0f Stats, tweak P2P success rate stat. 2019-09-03 15:48:10 -07:00
Adam Ierymenko 1f9456a462 Estimate P2P Success Rate 2019-09-03 15:19:17 -07:00
Adam Ierymenko a7d8285c3a Don't require siblings field 2019-09-03 14:57:54 -07:00
Adam Ierymenko 5f1dc4b851 cleanup 2019-09-03 14:57:02 -07:00
Adam Ierymenko b1c22949c5 Cleanup, add support for distributing a new planet file 2019-09-03 14:44:13 -07:00
Adam Ierymenko 29be175743 Make relay max hops configurable on roots 2019-09-03 13:17:12 -07:00
Adam Ierymenko b6c5ba264b One more fix for discarding hops exceeded packets. 2019-09-03 13:01:01 -07:00
Adam Ierymenko 8e7e3c2b11 Fix max hops. 2019-09-03 12:58:23 -07:00
Adam Ierymenko 0e7df129d8 Fix variable shadowing bug. 2019-09-03 12:51:32 -07:00
Adam Ierymenko 50709cbd21 Fix siblings in peers list, fix meter. 2019-09-03 12:44:09 -07:00
Adam Ierymenko fd6e8d8c5c Add instrumentation to root, add capability to forward to siblings if no path is known to a peer. 2019-09-03 12:21:57 -07:00
Adam Ierymenko 2e7496130c Fix silly thinko in root that harms p2p establishment. 2019-08-30 21:17:34 -07:00
Adam Ierymenko 9666ab5797 Merge branch 'dev' into edge 2019-08-30 17:57:11 -07:00
Adam Ierymenko e6ead35884 docs 2019-08-30 17:48:22 -07:00
Adam Ierymenko a6dff8ff2f Add an extra catch as workaround for possible cause of ARM crash. 2019-08-30 17:47:13 -07:00
Adam Ierymenko 4281b6b448 Ignore MULTICAST_GATHER replies with the wrong count. 2019-08-30 17:45:10 -07:00
Adam Ierymenko 4c08ac7873 Fix MULTICAST_GATHER reply problem in root 2019-08-30 17:34:05 -07:00
Adam Ierymenko 5435ec7545 Merge dev 2019-08-30 15:40:00 -07:00
Adam Ierymenko 6897f602bf 1.4.6 version bump 2019-08-30 15:30:37 -07:00
Adam Ierymenko 8764d50179 Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into edge 2019-08-30 15:16:21 -07:00
Adam Ierymenko 075321fd0d debian build version bump 2019-08-30 15:16:05 -07:00
Adam Ierymenko 62cdb8dc94 cleanup 2019-08-30 12:47:19 -07:00
Adam Ierymenko 5e8e935189 world! 2019-08-30 11:57:18 -07:00
Adam Ierymenko ebb5f1256f ARM wrestling 2019-08-30 10:03:07 -07:00
Adam Ierymenko 7c6d0d3c0f ARM wrestling 2019-08-30 09:50:37 -07:00
Adam Ierymenko 9918a1092f JSON fix 2019-08-30 09:39:46 -07:00
Adam Ierymenko 7d89511fda JSON fix 2019-08-30 09:38:18 -07:00
Adam Ierymenko 795b6d13d1 Simple status output on root of HTTP tree 2019-08-30 09:29:06 -07:00
Adam Ierymenko 8328b6f657 Lib fix 2019-08-30 09:10:11 -07:00
Adam Ierymenko 9994e591bd More root work and CMake-ify root 2019-08-30 09:08:39 -07:00
Adam Ierymenko b27a38e55e Implement WHOIS 2019-08-29 14:27:41 -07:00
Adam Ierymenko f6d747a5a0 Fix some more multicast stuff (minor) 2019-08-29 12:02:37 -07:00
Adam Ierymenko b7da7574d1 Helps to decompress the packet 2019-08-29 11:40:31 -07:00
Adam Ierymenko dbad9585cd Fix parsing of MULTICAST_GATHER 2019-08-29 11:23:23 -07:00
Adam Ierymenko 2d7a97bb94 Fix V4/V6 forwarding issue in root 2019-08-29 10:58:47 -07:00
Adam Ierymenko da19da0360 RENDEZVOUS works now 2019-08-29 08:00:54 -07:00
Adam Ierymenko ee7361ee2e crash fix 2019-08-29 07:25:16 -07:00
Adam Ierymenko 6e3e09bed4 Add RENDEZVOUS to high throughput root 2019-08-29 07:17:18 -07:00
Adam Ierymenko 86762d2b40 high throughput root is working! 2019-08-28 15:52:18 -07:00
Adam Ierymenko ef12c5af99 . 2019-08-28 15:22:28 -07:00
Adam Ierymenko 933404b1dd . 2019-08-28 15:20:34 -07:00
Adam Ierymenko ccec49e444 . 2019-08-28 15:17:16 -07:00
Adam Ierymenko e5f1bf81f7 . 2019-08-28 15:15:21 -07:00
Adam Ierymenko 0e627f4f68 . 2019-08-28 15:07:38 -07:00
Adam Ierymenko d33f7d2bf5 . 2019-08-28 14:49:16 -07:00
Adam Ierymenko e07a019615 . 2019-08-28 14:47:05 -07:00
Adam Ierymenko 34ca3012e6 . 2019-08-28 14:43:37 -07:00
Adam Ierymenko 62634ca2da . 2019-08-28 14:39:31 -07:00
Adam Ierymenko 846c96e8d5 . 2019-08-28 14:36:29 -07:00
Adam Ierymenko 63775723c1 . 2019-08-28 14:28:07 -07:00
Adam Ierymenko 2f7d3e655a . 2019-08-28 14:26:13 -07:00
Adam Ierymenko b19634d7e4 . 2019-08-28 14:21:02 -07:00
Adam Ierymenko a92967a7c1 . 2019-08-28 14:16:14 -07:00
Adam Ierymenko 8915b88de5 . 2019-08-28 14:06:45 -07:00
Adam Ierymenko 7bca81464b . 2019-08-28 14:04:42 -07:00
Adam Ierymenko b974ece24f . 2019-08-28 13:59:23 -07:00
Adam Ierymenko b1c8e6ad59 . 2019-08-28 13:51:13 -07:00
Adam Ierymenko 64f7185e3a . 2019-08-28 13:44:15 -07:00
Adam Ierymenko 807cc9afc3 . 2019-08-28 13:40:49 -07:00
Adam Ierymenko 0adf306dd4 . 2019-08-28 13:38:52 -07:00
Adam Ierymenko db0f602e86 . 2019-08-28 13:10:36 -07:00
Adam Ierymenko 17ec47f5c0 . 2019-08-28 13:09:14 -07:00
Adam Ierymenko cf831d9cd3 . 2019-08-28 13:04:58 -07:00
Adam Ierymenko 5e3c633f74 root work 2019-08-28 11:59:13 -07:00
Adam Ierymenko 4e4b27b6ab build fix 2019-08-28 11:54:09 -07:00
Adam Ierymenko c0c9590904 High throughput root stuff 2019-08-28 11:49:45 -07:00
Adam Ierymenko 24c9577e39 cleanup 2019-08-28 11:28:51 -07:00
Adam Ierymenko 59ee0cfe88 Safety upgrades to code 2019-08-28 10:34:32 -07:00
Adam Ierymenko 1977b9b764 Use -flto on Mac for release 2019-08-28 07:45:49 -07:00
Adam Ierymenko 6f9d1fc14c Merge branch 'dev' into edge 2019-08-28 07:43:36 -07:00
Adam Ierymenko 1b6b38e395 Add default addIps() implementation to EthernetTap base class to fix build on systems that do not need addIps(). 2019-08-28 07:43:18 -07:00
Adam Ierymenko 8ac59ae2be cleanup 2019-08-28 07:40:13 -07:00
Adam Ierymenko 46db37e06c Yield in ticket lock 2019-08-28 07:34:24 -07:00
Adam Ierymenko 9d1207b339 Merge branch 'dev' into edge 2019-08-28 07:31:33 -07:00
Adam Ierymenko 6e730cfad1 Cleanup, multicast fingerprint, benchmark asymmetric crypto 2019-08-28 07:31:17 -07:00
Grant Limberg 1cf953c046 working docker image for end users.
GitHub Issue #1013
2019-08-27 16:57:07 -07:00
Grant Limberg e5bf4565da readme in central controller docker folder 2019-08-27 15:43:11 -07:00
Grant Limberg ddc904a502 remove docker line from readme 2019-08-27 15:27:41 -07:00
Grant Limberg 5cda292d15 comment out docker docker target from makefile because broken 2019-08-27 15:16:05 -07:00
Grant Limberg e51cf0d4d2 moved elsewhere for controller builds 2019-08-27 15:14:55 -07:00
Joseph Henry d8de837c60 LinuxEthernetTap addIps virtual function fix for SYNOLOGY builds 2019-08-27 14:43:30 -07:00
Adam Ierymenko 199b3345a0 cleanup 2019-08-27 14:42:49 -07:00
Adam Ierymenko b7f504b8a4 cleanup 2019-08-27 14:40:01 -07:00
Adam Ierymenko 1b459b0560 cleanup 2019-08-27 14:31:04 -07:00
Adam Ierymenko 40803a4dc1 cleanup 2019-08-27 14:25:11 -07:00
Adam Ierymenko 6f22570648 Optimization and cleanup 2019-08-26 20:18:28 -07:00
Adam Ierymenko 8203547cfc Warning removal. 2019-08-26 20:01:54 -07:00
Adam Ierymenko dad160209e Add -mmacosx-version-min=10.9 2019-08-26 19:54:24 -07:00
Adam Ierymenko 8faaaec710 Add check for PCLMUL instruction too. Virtually all CPUs with AES-NI have it but good to be sure. 2019-08-26 19:48:56 -07:00
Adam Ierymenko 012fba617d Set SSE/AES-NI flags only on x86/x64 targets. 2019-08-26 19:40:22 -07:00
Adam Ierymenko 9ca495229b Revert "optimization stuff"
This reverts commit e63f624d3a.
2019-08-26 19:03:09 -07:00
Adam Ierymenko e63f624d3a optimization stuff 2019-08-26 19:02:28 -07:00
Adam Ierymenko e1dd413266 cleanup 2019-08-26 18:44:56 -07:00
Adam Ierymenko b9ef09dd58 Optimization stuff 2019-08-26 18:15:32 -07:00
Adam Ierymenko 990333e7ec cleanup, re-enable AES-NI check 2019-08-26 16:35:28 -07:00
Adam Ierymenko ec9582f3f2 More test vectors, software mode GCM. 2019-08-26 16:24:42 -07:00
Adam Ierymenko ea65386e15 Merge branch 'dev' into edge 2019-08-26 12:22:20 -07:00
Adam Ierymenko ca89695270 Fix make central-controller-docker 2019-08-26 12:19:50 -07:00
Adam Ierymenko a0fd4ad23f Cleanup, Linux build fix. 2019-08-26 12:17:23 -07:00
Adam Ierymenko b6d7a95028 Merge branch 'dev' into edge 2019-08-26 11:09:19 -07:00
Adam Ierymenko 91b16310ea * Change license from GPL3 to BSL 1.1, see LICENSE.txt
* Fix an issue with the "ipauth" rule and auto-generated unforgeable IPv6 addresses
 * Fix socket/bind errors setting IPs and routes on Linux
2019-08-26 10:33:26 -07:00
Adam Ierymenko 609873e6d1 Windows version bump 2019-08-23 22:10:15 -07:00
Adam Ierymenko 4c616621c2 Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev 2019-08-23 21:38:15 -07:00
Adam Ierymenko 05470bf202 Fix RPM targets 2019-08-23 21:38:04 -07:00
Adam Ierymenko 633cf9ec04 Warning removal 2019-08-23 21:28:26 -07:00
Adam Ierymenko f3c3a90393 Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev 2019-08-23 21:24:34 -07:00
Adam Ierymenko 25a48f2f44 Fix RedHat sub-version. 2019-08-23 21:24:05 -07:00
Adam Ierymenko 1d8f3cee62 cleanup 2019-08-23 21:12:24 -07:00
Adam Ierymenko 5ba6e21967 cleanup 2019-08-23 20:34:09 -07:00
Adam Ierymenko 52f7f6e6cf Fully implement the packet encryption/decryption algorithms. 2019-08-23 20:20:32 -07:00
Adam Ierymenko 9fd5ec673b Get rid of complicated AES-GCM + scramble construct in favor of a simpler construct thanks to "Squeamish Ossifrage" on crypto.stackexchange.com 2019-08-23 18:41:21 -07:00
Adam Ierymenko e905b3c963 cleanup 2019-08-23 17:22:23 -07:00
Adam Ierymenko d214a5437f Bump Mac pkg version 2019-08-23 15:24:52 -07:00
Adam Ierymenko f12370c348 more opt 2019-08-23 12:40:08 -07:00
Adam Ierymenko b727e2a67a More opt stuff 2019-08-23 12:34:45 -07:00
Adam Ierymenko 8e87319925 Optimization stuff 2019-08-23 12:18:02 -07:00
Adam Ierymenko 1ab29b1ab0 Merge branch 'dev' into edge 2019-08-23 12:11:07 -07:00
Adam Ierymenko de0a5aa840 GitHub issue #994 2019-08-23 12:09:31 -07:00
Adam Ierymenko 52d55e34e6 Licenses, and use full strength AES-128 in scramble. 2019-08-23 12:03:13 -07:00
Adam Ierymenko c79360f58b Merge dev 2019-08-23 11:37:40 -07:00
Adam Ierymenko 6f9e3e3b78 Back out unnecessary hack 2019-08-23 11:14:17 -07:00
Adam Ierymenko 5c5e7fc7ff Merge branch 'dev' of https://github.com/zerotier/ZeroTierOne into dev 2019-08-23 11:13:13 -07:00
Adam Ierymenko 43e98930e9 distro cleanup 2019-08-23 11:12:25 -07:00
Adam Ierymenko 51ebefc3ab Ifdef these to stop non-Windows IDEs from complaining. 2019-08-23 10:34:37 -07:00
Adam Ierymenko 86add4a6d3 Tolerate any libstdc++6 package "version" for Mint and other distros with weird versions on libstdc++6. 2019-08-23 10:31:12 -07:00
Adam Ierymenko 221a3f9a08 Merge branch 'dev' of http://10.187.0.8/zerotier/ZeroTierOne into dev 2019-08-23 10:20:04 -07:00
Adam Ierymenko 2f74bd5150 Add "make docker" for GitHub issue #1013 2019-08-23 10:19:59 -07:00
Adam Ierymenko e8ae333443 Version bumps, license fixed, and GitHub issue #990 take two 2019-08-23 10:15:13 -07:00
Adam Ierymenko 8057c826bc cleanup 2019-08-23 09:34:26 -07:00
Adam Ierymenko 6f6138c500 Merge relicensing change from dev 2019-08-23 09:27:13 -07:00
Adam Ierymenko 52a166a71f Relicense: GPLv3 -> ZeroTier BSL 1.1 2019-08-23 09:23:39 -07:00
Adam Ierymenko 903a18db1d work in progress 2019-08-23 08:41:22 -07:00
Adam Ierymenko 0731f3f1a9 wiring more stuff up, and simplification of timing loops 2019-08-23 07:04:20 -07:00
Adam Ierymenko 37047a39f9 More cleanup, and fix SHA384 built-in C code. 2019-08-22 14:52:47 -07:00
Adam Ierymenko 91d0cbe892 cleanup 2019-08-22 13:08:10 -07:00
Adam Ierymenko b66431bc29 Work in progress... 2019-08-22 13:06:08 -07:00
Adam Ierymenko 0e18b14087 Merge branch 'dev' into edge 2019-08-21 14:58:26 -07:00
Adam Ierymenko 31bd413166 stub out new verbs 2019-08-21 14:57:57 -07:00
Adam Ierymenko 95a6fce2b4 Yet more cleanup, it builds again now. 2019-08-21 14:36:56 -07:00
Adam Ierymenko 0b5472f9fb Tons and tons of cleanup and cruft removal 2019-08-21 14:24:45 -07:00
Adam Ierymenko 5280d28505 cleanup 2019-08-21 10:44:52 -07:00
Adam Ierymenko 67a9898a99 Bunch more work on DNS, cleanup, removal of obsolete cruft. 2019-08-21 09:27:45 -07:00
Adam Ierymenko 509da3ac34 Merge pull request #1012 from wendelb/wendelb-patch-1
Controller-Docs little cleanup
2019-08-21 08:14:38 -07:00
Adam Ierymenko fe8815f80f cleanup 2019-08-20 15:36:18 -07:00
Adam Ierymenko 3a21fdc304 Crypto work, packet work 2019-08-20 15:34:30 -07:00
Adam Ierymenko 83d723eb79 type 1 (P-384) identities 2019-08-20 13:32:23 -07:00
Adam Ierymenko 6e771607c0 cleanup 2019-08-19 20:35:16 -07:00
Adam Ierymenko e73b220104 cleanup 2019-08-19 20:30:34 -07:00
Adam Ierymenko 5c1fc43610 cleanup 2019-08-19 20:29:24 -07:00
Adam Ierymenko cfbd7e3bf5 Add stubs to easily build and include all of libnatpmp and miniupnpc in osdep/ 2019-08-19 20:28:44 -07:00
Adam Ierymenko c8ca1cfa3c Kill old inline software update, we will use https and secondary auth for new versions. 2019-08-19 19:24:23 -07:00
Adam Ierymenko 5cfbb0a423 Clean up dead stuff from OneService and fix build errors. 2019-08-19 19:21:33 -07:00
Adam Ierymenko 900ec143a8 . 2019-08-19 16:45:29 -07:00
Adam Ierymenko 7bda3d0f74 put sse4.1 back 2019-08-19 15:49:13 -07:00
Adam Ierymenko 7650786fb5 cleanup, Locator fix and self-test 2019-08-19 15:43:15 -07:00
Adam Ierymenko ca60d08621 cleanup, scrambler functions 2019-08-19 12:49:33 -07:00
Adam Ierymenko b34218c8c2 auto-set -j option in makefile, and split out cmake setup rule 2019-08-19 10:06:39 -07:00
Adam Ierymenko b14a59629c cleanup 2019-08-19 06:58:42 -07:00
wendelb fe18579061 Removed duplicate line creationTime 2019-08-17 22:50:13 +02:00
Adam Ierymenko 0914bf8cf0 Some ARM NEON code (not finished) 2019-08-16 19:22:03 -07:00
Adam Ierymenko 7bdca83de3 Add decrypt 2019-08-16 18:40:22 -07:00
Adam Ierymenko 846f03504e Add DNS TXT resolver (need one for Windows) 2019-08-16 16:49:30 -07:00
Adam Ierymenko 01e8fd0b07 The newer C ed25519 is the same speed as the old ASM, so drop it to simplify. 2019-08-16 14:42:38 -07:00
Adam Ierymenko 7f301c44b7 more cleanup 2019-08-16 14:26:45 -07:00
Adam Ierymenko 51a25fdec9 Remove ASM Salsa20 since it will not be the default in 2.x any more... reduce build complexity. 2019-08-16 14:26:25 -07:00
Grant Limberg 2b681c37ac Consolidate common compiler flags 2019-08-16 11:42:43 -07:00
Grant Limberg cb4ebfdbd2 Dragging adam into CMake kicking and screaming :) 2019-08-16 10:45:14 -07:00
Grant Limberg 206c85222c Fix Constants.hpp inclusion of version.h 2019-08-16 09:52:13 -07:00
ZeroTier 18071e038e Fix MacEthernetTapAgent & Cmake integration 2019-08-16 09:44:31 -07:00
Grant Limberg 39f7ce15ad mac compiler flags 2019-08-15 17:40:21 -07:00
Grant Limberg e39b42bbd3 fixing some CMake stuff on Linux 2019-08-15 17:29:33 -07:00
Adam Ierymenko 607d8f72e8 cruftectomy 2019-08-15 15:43:35 -07:00
Adam Ierymenko c483f75fb4 cleanup 2019-08-15 15:32:16 -07:00
Adam Ierymenko 81f0175251 cleanup 2019-08-15 14:14:49 -07:00
Adam Ierymenko f753519729 A bit more optimization 2019-08-15 14:07:52 -07:00
Adam Ierymenko f39693f97e cleanup 2019-08-15 13:52:23 -07:00
Adam Ierymenko f83ae0e39e Add self-test for AES and AES-GCM using public test vectors. 2019-08-15 13:47:43 -07:00
Adam Ierymenko 521d371b5d A bunch more refactoring to rip out obsolete stuff related to old root system and general cleanup. 2019-08-15 10:49:50 -07:00
Adam Ierymenko b23d551d00 cleanup 2019-08-14 16:05:09 -07:00
Adam Ierymenko 1b20cc6075 More optimization and cleanup 2019-08-14 15:59:45 -07:00
Adam Ierymenko 2043e12ac2 . 2019-08-14 15:50:25 -07:00
Adam Ierymenko 9461bc948f . 2019-08-14 15:28:10 -07:00
Adam Ierymenko 9740ab8bd6 more cleanup 2019-08-14 15:17:06 -07:00
Adam Ierymenko 6947a6b1d4 more cleanup 2019-08-14 15:12:49 -07:00
Adam Ierymenko 4da8036222 More refactor 2019-08-14 15:00:18 -07:00
Adam Ierymenko e6b4006c70 Refactoring to eliminate duplicated code 2019-08-14 14:55:37 -07:00
Adam Ierymenko 8f5f7f1baa More work in progress 2019-08-14 12:48:45 -07:00
Adam Ierymenko 573d3eea87 Merge branch 'dev' into edge 2019-08-14 10:53:03 -07:00
Adam Ierymenko 2ec53df7ab Put a limit on the multicast TX queue to prevent memory use ridiculousness. 2019-08-14 10:52:21 -07:00
Adam Ierymenko eb84eec0f4 Merge branch 'dev' into edge 2019-08-14 10:48:07 -07:00
Adam Ierymenko 1c7b553331 GitHub issue #1000 2019-08-14 10:47:58 -07:00
Adam Ierymenko d7a31088ba Cleanup, warning removal, cppcheck informed cleanup. 2019-08-14 10:35:57 -07:00
Adam Ierymenko a028e04ab9 Merge branch 'dev' into edge 2019-08-13 15:51:19 -07:00
Adam Ierymenko a0fb519696 Make sure libstdc++ is in RH spec file 2019-08-13 12:58:14 -07:00
Adam Ierymenko 83e6864b78 Version bump in Linux packages for new binaries. 2019-08-13 09:34:56 -07:00
Adam Ierymenko a0520536df . 2019-08-13 08:49:25 -07:00
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
Adam Ierymenko af7a70bf02 cleanup 2019-08-07 21:11:48 -05:00
Adam Ierymenko 1a2ff884b3 Merge branch 'dev' into edge 2019-08-07 19:08:35 -05:00
Adam Ierymenko 4d70640a15 Remove debug line 2019-08-07 19:06:02 -05:00
Adam Ierymenko b11627a8bc add SDK VirtualTap to new factory method 2019-08-07 18:45:04 -05:00
Adam Ierymenko 7436f85ad0 Require MacOS 10.10 2019-08-07 18:22:03 -05:00
Adam Ierymenko 237c379866 Choose which tap to use (feth or kext) on Mac based on Darwin version. 2019-08-07 18:20:17 -05:00
Adam Ierymenko aca31c7055 Put kext back in Mac distro and use on versions older than High Sierra (which lack the feth device) 2019-08-07 18:14:12 -05:00
Adam Ierymenko 0298719be0 Use SHA384 with ECC384 to match FIPS / Suite B recommendation. 2019-08-07 17:06:03 -05:00
Adam Ierymenko d0746da5e2 Add SHA384 support, more cleanup 2019-08-07 16:41:58 -05:00
Adam Ierymenko 5b1cf33b1b Merge branch 'dev' into edge 2019-08-07 11:31:32 -05:00
Adam Ierymenko 6073e7972f Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev 2019-08-07 11:24:04 -05:00
Adam Ierymenko f7e8d8f1dd Fix LFDB path issue when using with Postgress in DBMirrorSet config 2019-08-07 11:23:48 -05:00
Adam Ierymenko 54a1bbd016 . 2019-08-07 11:20:12 -05:00
Grant Limberg 87016ae815 network update to upsert 2019-08-06 15:30:50 -07:00
Adam Ierymenko 455cd5551b . 2019-08-06 17:06:39 -05:00
Adam Ierymenko 3ed8e46782 Use devtoolset-8 on RHEL/CentOS 7 2019-08-06 16:46:41 -05:00
Adam Ierymenko b3e1783658 . 2019-08-06 16:46:13 -05:00
Adam Ierymenko 906c83af83 Merge branch 'dev' into edge 2019-08-06 15:47:54 -05:00
Adam Ierymenko 3db0197865 Add try/catch in LFDB and add introspection into multicast subscriptions in client network status API 2019-08-06 15:22:57 -05:00
Adam Ierymenko f9900cc6fb Merge dev to edge 2019-08-06 14:13:07 -05:00
Adam Ierymenko 6174c0c103 Fix deadlock bug. 2019-08-06 13:20:37 -05:00
Adam Ierymenko 8898cb342b . 2019-08-06 13:12:45 -05:00
Adam Ierymenko 9cc76d1115 Remove debug line 2019-08-06 11:01:08 -05:00
Adam Ierymenko 5289d3327c Build fixes 2019-08-06 11:00:35 -05:00
Adam Ierymenko 00fb9c475e More work on DB mirroring. 2019-08-06 10:42:54 -05:00
Adam Ierymenko 3c776675b3 Cruftectomy, work in progress on mirrorring 2019-08-06 08:51:23 -05:00
Adam Ierymenko 37d508ab96 Refactoring in prep for mirroring 2019-08-06 07:51:50 -05:00
Adam Ierymenko f4f8fef82e LFDB fix 2019-08-05 15:30:03 -05:00
Adam Ierymenko cd2e3c79f2 Windows AIP version bump 2019-08-04 20:27:09 -07:00
Adam Ierymenko 7722350178 Version bump to 1.4.2 for all but Windows AIP 2019-08-04 20:13:12 -07:00
Adam Ierymenko a77b4ecddb Add optional function in DB change listener for member online events. 2019-08-04 19:55:52 -07:00
Adam Ierymenko 818b7e4a2e GitHub issue #993 (???) 2019-08-04 15:35:43 -07:00
Adam Ierymenko 00d63f6046 GitHub issue #993 (???) 2019-08-04 15:15:02 -07:00
Adam Ierymenko 639fc60257 GitHub issue #990 2019-08-04 15:08:33 -07:00
Grant Limberg 21467596bc Merge branch 'remove_network_status_table' into dev 2019-08-04 12:38:12 -07:00
Adam Ierymenko 75ebe5172f Fix for sharing of capabilities in 1.4 (problem introduced when push frequency was reduced) 2019-08-02 20:43:02 -07:00
Adam Ierymenko 4a9030b4a0 Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev 2019-08-02 13:59:10 -07:00
Adam Ierymenko fdc708a624 GitHub issue #979 2019-08-02 13:59:03 -07:00
ZeroTier 8e20187d8c set OS X deployment target to 10.9 2019-08-01 15:58:32 -07:00
ZeroTier 28dac7ff0e build MacEthernetTapAgent 2019-08-01 15:41:50 -07:00
Grant Limberg e385b3d377 Merge branch 'dev' into cmake 2019-08-01 15:16:31 -07:00
Grant Limberg 7e5c68c553 update jenkins to use cmake for builds 2019-08-01 15:13:06 -07:00
Grant Limberg 39ad7bc741 update cmake to add LFDB and force C++11 2019-08-01 14:36:35 -07:00
Grant Limberg c2f9aab068 Merge branch 'master' into cmake 2019-08-01 13:49:30 -07:00
Adam Ierymenko 67beea1e3d Batch file to clean Windows build dir 2019-08-01 13:21:36 -07:00
Adam Ierymenko 34364ab8ee Bump version 2019-07-31 16:41:35 -07:00
Adam Ierymenko bb99ef1351 Get rid of online status stuff in FileDB, not necessary at all. 2019-07-31 16:41:12 -07:00
Adam Ierymenko b3891e5506 Version 1.4.0.1: bug fix for Mac multicast and IPv4 issues, no change for other platforms 2019-07-31 13:27:08 -07:00
Adam Ierymenko 7e105343e2 WIP 2019-07-17 16:53:33 -05:00
Adam Ierymenko fe2215df00 TON of refactoring, moon/planet is DEAD, ECC P-384 is integrated (but not enabled), and multicast work and cleanup. Whew. 2019-07-17 10:52:08 -05:00
Adam Ierymenko 640bbaabbf Safer value 2019-07-16 17:28:42 -05:00
Adam Ierymenko da2965cb4e P-384 test vectors 2019-07-16 17:25:25 -05:00
Adam Ierymenko 94ba242c33 Nist P-384 guts and glory 2019-07-16 16:09:14 -05:00
Adam Ierymenko debd5a5c5e Add capability for P2P multicast propagation, and some cleanup. 2019-07-16 13:33:11 -05:00
Adam Ierymenko 98bbb84a63 Merge branch 'dev' into edge 2019-07-15 19:40:52 -05:00
Grant Limberg 692733fffb Don't write to ztc_network_status table anymore in central controller 2019-07-15 13:00:16 -07:00
Adam Ierymenko 9d908a11ed Some new stuff, may not live forever... 2019-07-15 13:57:42 -05:00
Grant Limberg 4d599e2f9f Linux build with CMake 2019-06-21 15:16:20 -07:00
Grant Limberg d3b33e5512 Can now build the Windows UI via CMake as well 2019-06-21 12:54:53 -07:00
Grant Limberg c8487cc395 no message 2019-06-20 16:15:19 -07:00
Grant Limberg 0b3b5f6174 Beginning CMake configuration for ZT
Only tested on Windows so far
2019-06-20 16:13:52 -07:00
586 changed files with 59390 additions and 84798 deletions

No files matched your search

+75
View File
@@ -0,0 +1,75 @@
---
BasedOnStyle: LLVM
BreakBeforeBraces: Stroustrup
IndentWidth: 4
TabWidth: 4
AlignAfterOpenBracket: AlwaysBreak
AlignConsecutiveMacros: 'true'
AlignConsecutiveAssignments: 'false'
AlignConsecutiveDeclarations: 'false'
AlignEscapedNewlines: Right
AlignOperands: 'true'
AlignTrailingComments: 'true'
AllowAllArgumentsOnNextLine: 'false'
AllowAllConstructorInitializersOnNextLine: 'false'
AllowAllParametersOfDeclarationOnNextLine: 'false'
AllowShortBlocksOnASingleLine: 'true'
AllowShortCaseLabelsOnASingleLine: 'false'
AllowShortFunctionsOnASingleLine: None
AllowShortIfStatementsOnASingleLine: Never
AlwaysBreakAfterReturnType: None
BinPackArguments: 'false'
BinPackParameters: 'false'
BreakBeforeBinaryOperators: NonAssignment
BreakBeforeTernaryOperators: 'true'
BreakConstructorInitializers: BeforeComma
BreakInheritanceList: BeforeComma
CompactNamespaces: 'false'
ConstructorInitializerAllOnOneLineOrOnePerLine: 'true'
ConstructorInitializerIndentWidth: '4'
ContinuationIndentWidth: '4'
Cpp11BracedListStyle: 'false'
FixNamespaceComments: 'true'
IncludeBlocks: Regroup
IndentCaseLabels: 'true'
IndentPPDirectives: None
IndentWrappedFunctionNames: 'false'
KeepEmptyLinesAtTheStartOfBlocks: 'false'
MaxEmptyLinesToKeep: '1'
NamespaceIndentation: None
PointerAlignment: Left
ReflowComments: 'true'
SortIncludes: 'true'
SortUsingDeclarations: 'true'
SpaceAfterCStyleCast: 'false'
SpaceAfterLogicalNot: 'true'
SpaceAfterTemplateKeyword: 'true'
SpaceBeforeAssignmentOperators: 'true'
SpaceBeforeCpp11BracedList: 'true'
SpaceBeforeCtorInitializerColon: 'true'
SpaceBeforeInheritanceColon: 'true'
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: 'true'
SpaceInEmptyParentheses: 'false'
SpacesBeforeTrailingComments: '3'
SpacesInAngles: 'false'
SpacesInCStyleCastParentheses: 'false'
SpacesInContainerLiterals: 'true'
SpacesInParentheses: 'false'
SpacesInSquareBrackets: 'false'
UseTab: 'Never'
---
Language: Cpp
Standard: Cpp03
ColumnLimit: '240'
---
Language: ObjC
ColumnLimit: '240'
---
Language: Java
ColumnLimit: '240'
---
Language: CSharp
ColumnLimit: '240'
...
+6
View File
@@ -0,0 +1,6 @@
CompileFlags:
Add:
- "-std=c++17"
- "-I../ext"
- "-I../ext/prometheus-cpp-lite-1.0/core/include"
- "-I../ext/prometheus-cpp-lite-1.0/simpleapi/include"
Executable → Regular
+49 -78
View File
@@ -1,19 +1,56 @@
# Main binaries created in *nix builds
/zerotier-one
/zerotier-idtool
/zerotier-cli
/zerotier-selftest
/zerotier
/nltest
# OS-created garbage files from various platforms
build/
/version.h
.DS_Store
.Trashes
*.swp
._*
*~
*~.nib
.Apple*
Thumbs.db
@eaDir
._*
DerivedData/
*.pbxuser
*.mode1v3
*.mode2v3
*.perspectivev3
!default.pbxuser
!default.mode1v3
!default.mode2v3
!default.perspectivev3
*.xccheckout
xcuserdata/
.vscode
__pycache__
attic/world/*.c25519
attic/world/mkworld
*.log
*.opensdf
*.user
*.cache
*.obj
*.tlog
*.pid
*.pkg
*.o
*.o-*
*.core
*.deb
*.rpm
*.autosave
*.tmp
.depend
node_modules
debian/files
debian/zerotier-one
debian/zerotier-one*.debhelper
debian/*.log
debian/zerotier-one.substvars
root/identity.*
root/config.*
/ext/installfiles/windows/chocolatey/zerotier-one/*.nupkg
/go/zerotier
# Windows build droppings
/windows/ZeroTierOne.sdf
/windows/ZeroTierOne.v11.suo
/windows/x64
@@ -32,7 +69,7 @@ Thumbs.db
/ext/installfiles/windows/ZeroTier One-SetupFiles
/ext/installfiles/windows/Prerequisites
/ext/installfiles/windows/*-cache
/ZeroTier One.msi
/*.msi
/windows/.vs
*.vcxproj.backup
/windows/TapDriver6/Win7Debug
@@ -43,47 +80,6 @@ enc_temp_folder
/windows/copyutil/bin
/windows/copyutil/obj
# *nix/Mac build droppings
/build-*
/ZeroTierOneInstaller-*
/examples/docker/zerotier-one
/examples/docker/test-*.env
/world/mkworld
/world/*.c25519
zt1-src.tar.gz
/MacEthernetTapAgent
# Miscellaneous temporaries, build files, etc.
*.log
*.opensdf
*.user
*.cache
*.obj
*.tlog
*.pid
*.pkg
*.o
/*.a
*.dylib
*.so
*.so.*
*.o-*
*.core
*.deb
*.rpm
*.autosave
*.tmp
.depend
node_modules
zt1_update_*
debian/files
debian/zerotier-one
debian/zerotier-one*.debhelper
debian/*.log
debian/zerotier-one.substvars
root-watcher/config.json
# Java/Android/JNI build droppings
java/obj/
java/libs/
java/bin/
@@ -95,28 +91,3 @@ java/build_win32/
windows/WinUI/obj/
windows/WinUI/bin/
windows/ZeroTierOne/Debug/
/ext/installfiles/windows/chocolatey/zerotier-one/*.nupkg
# Miscellaneous mac/Xcode droppings
.DS_Store
.Trashes
*.swp
*~.nib
DerivedData/
build/
*.pbxuser
*.mode1v3
*.mode2v3
*.perspectivev3
!default.pbxuser
!default.mode1v3
!default.mode2v3
!default.perspectivev3
*.xccheckout
xcuserdata/
ext/librethinkdbxx/build
.vscode
__pycache__
*~
attic/world/*.c25519
attic/world/mkworld
+3
View File
@@ -0,0 +1,3 @@
# Default ignored files
/workspace.xml
+9
View File
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="Go" enabled="true" />
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
+5
View File
@@ -0,0 +1,5 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
</state>
</component>
+11
View File
@@ -0,0 +1,11 @@
<component name="ProjectDictionaryState">
<dictionary name="api">
<words>
<w>apisocket</w>
<w>nwid</w>
<w>secrand</w>
<w>sockaddr</w>
<w>unmarshals</w>
</words>
</dictionary>
</component>
+10
View File
@@ -0,0 +1,10 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
<option name="processCode" value="true" />
<option name="processLiterals" value="true" />
<option name="processComments" value="true" />
</inspection_tool>
</profile>
</component>
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
</project>
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/ZeroTierOne.iml" filepath="$PROJECT_DIR$/.idea/ZeroTierOne.iml" />
</modules>
</component>
</project>
Generated
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
+29
View File
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectTasksOptions">
<TaskOptions isEnabled="true">
<option name="arguments" value="fmt $FilePath$" />
<option name="checkSyntaxErrors" value="true" />
<option name="description" />
<option name="exitCodeBehavior" value="ERROR" />
<option name="fileExtension" value="go" />
<option name="immediateSync" value="false" />
<option name="name" value="go fmt" />
<option name="output" value="$FilePath$" />
<option name="outputFilters">
<array />
</option>
<option name="outputFromStdout" value="false" />
<option name="program" value="$GoExecPath$" />
<option name="runOnExternalChanges" value="false" />
<option name="scopeName" value="Project Files" />
<option name="trackOnlyRoot" value="true" />
<option name="workingDir" value="$ProjectFileDir$" />
<envs>
<env name="GOROOT" value="$GOROOT$" />
<env name="GOPATH" value="$GOPATH$" />
<env name="PATH" value="$GoBinDirs$" />
</envs>
</TaskOptions>
</component>
</project>
+3 -13
View File
@@ -1,3 +1,5 @@
# Authors and Third Party Code Licensing Information
## Primary Authors
* ZeroTier Core and ZeroTier One virtual networking service<br>
@@ -26,7 +28,7 @@
## Third-Party Code
ZeroTier includes the following third party code, either in ext/ or incorporated into the ZeroTier core.
ZeroTier includes the following third party code, either in ext/ or incorporated into the ZeroTier core. This third party code remains licensed under its original license and is not subject to ZeroTier's BSL license.
* LZ4 compression algorithm by Yann Collet
@@ -34,12 +36,6 @@ ZeroTier includes the following third party code, either in ext/ or incorporated
* Home page: http://code.google.com/p/lz4/
* License grant: BSD 2-clause
* http-parser by Joyent, Inc. (many authors)
* Files: ext/http-parser/*
* Home page: https://github.com/joyent/http-parser/
* License grant: MIT/Expat
* C++11 json (nlohmann/json) by Niels Lohmann
* Files: ext/json/*
@@ -60,12 +56,6 @@ ZeroTier includes the following third party code, either in ext/ or incorporated
* License grant: public domain
* ZeroTier Modifications: slight cryptographically-irrelevant modifications for inclusion into ZeroTier core
* MiniUPNPC and libnatpmp by Thomas Bernard
* Files: ext/libnatpmp/* ext/miniupnpc/*
* Home page: http://miniupnp.free.fr/
* License grant: BSD attribution no-endorsement
* cpp-httplib by yhirose
* Files: ext/cpp-httplib/*
+195 -8
View File
@@ -1,12 +1,199 @@
# CMake build script for libzerotiercore.a
cmake_minimum_required (VERSION 3.10)
cmake_minimum_required (VERSION 2.8)
project (zerotiercore)
if(${CMAKE_VERSION} VERSION_LESS 3.15)
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
else()
cmake_policy(VERSION 3.15)
endif()
set (PROJ_DIR ${PROJECT_SOURCE_DIR})
set (ZT_DEFS -std=c++11)
if(WIN32)
# If building on Windows, set minimum target to Windows 7
set(CMAKE_SYSTEM_VERSION "7" CACHE STRING INTERNAL FORCE)
endif(WIN32)
file(GLOB core_src_glob ${PROJ_DIR}/node/*.cpp)
add_library(zerotiercore STATIC ${core_src_glob})
set(ZEROTIER_ONE_VERSION_MAJOR 2 CACHE INTERNAL "")
set(ZEROTIER_ONE_VERSION_MINOR 0 CACHE INTERNAL "")
set(ZEROTIER_ONE_VERSION_REVISION 0 CACHE INTERNAL "")
set(ZEROTIER_ONE_VERSION_BUILD 0 CACHE INTERNAL "")
target_compile_options(zerotiercore PRIVATE ${ZT_DEFS})
set(default_build_type "Release")
if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
set(default_build_type "Debug")
endif()
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
message(STATUS "Setting build type to '${default_build_type}' as none was specified.")
set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE
STRING "Choose the type of build." FORCE)
# Set the possible values of build type for cmake-gui
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
"Debug" "Release" "MinSizeRel" "RelWithDebInfo")
endif()
option(BUILD_CENTRAL_CONTROLLER "Build ZeroTier Central Controller" OFF)
option(ZT_TRACE "Trace Messages" OFF)
option(ZT_DEBUG_TRACE "Debug Trace Messages" OFF)
if (BUILD_CENTRAL_CONTROLLER)
find_package(PostgreSQL REQUIRED)
set(ENABLE_SSL_SUPPORT OFF)
set(BUILD_SHARED_LIBS OFF)
set(BUILD_EXAMPLES OFF)
set(BUILD_TOOLS OFF)
set(BUILD_TESTS OFF)
set(BUILD_API_DOCS OFF)
add_subdirectory("ext/librabbitmq")
endif(BUILD_CENTRAL_CONTROLLER)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X Deployment Version")
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
add_definitions(-DZT_TRACE)
endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
project(zerotier
DESCRIPTION "ZeroTier Network Hypervisor"
LANGUAGES CXX C)
if(WIN32)
add_definitions(-DNOMINMAX)
else(WIN32)
if(APPLE)
message("Setting macOS Compiler Flags ${CMAKE_BUILD_TYPE}")
add_compile_options(
-Wall
-Wno-deprecated
-mmacosx-version-min=10.9
$<$<CONFIG:Debug>:-g>
$<$<CONFIG:DEBUG>:-O0>
$<$<CONFIG:RELEASE>:-Ofast>
$<$<CONFIG:RELEASE>:-fPIE>
$<$<CONFIG:RELEASE>:-flto>
$<$<CONFIG:RELWITHDEBINFO>:-Ofast>
$<$<CONFIG:RELWITHDEBINFO>:-fPIE>
$<$<CONFIG:RELWITHDEBINFO>:-g>
)
add_link_options(
-mmacosx-version-min=10.9
$<$<CONFIG:RELEASE>:-flto>
)
elseif (
CMAKE_SYSTEM_NAME MATCHES "Linux" OR
CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR
CMAKE_SYSTEM_NAME MATCHES "OpenBSD" OR
CMAKE_SYSTEM_NAME MATCHES "NetBSD"
)
message("Setting Linux/BSD Compiler Flags (${CMAKE_BUILD_TYPE})")
add_compile_options(
-Wall
-Wno-deprecated
$<$<CONFIG:Debug>:-g>
$<$<CONFIG:DEBUG>:-O0>
$<$<CONFIG:RELEASE>:-O3>
$<$<CONFIG:RELEASE>:-fPIE>
$<$<CONFIG:RELWITHDEBINFO>:-O3>
$<$<CONFIG:RELWITHDEBINFO>:-fPIE>
$<$<CONFIG:RELWITHDEBINFO>:-g>
)
endif(APPLE)
endif(WIN32)
if (
CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR
CMAKE_SYSTEM_PROCESSOR MATCHES "amd64" OR
CMAKE_SYSTEM_PROCESSOR MATCHES "i386" OR
CMAKE_SYSTEM_PROCESSOR MATCHES "i486" OR
CMAKE_SYSTEM_PROCESSOR MATCHES "i586" OR
CMAKE_SYSTEM_PROCESSOR MATCHES "i686"
)
message("Adding SSE and AES-NI flags for processor ${CMAKE_SYSTEM_PROCESSOR}")
add_compile_options(
-maes
-mmmx
-mrdrnd
-mpclmul
-msse
-msse2
-msse3
-msse4.1
)
endif()
if(ZT_TRACE)
add_definitions(-DZT_TRACE)
endif()
if(ZT_DEBUG_TRACE)
add_definitions(-DZT_DEBUG_TRACE)
endif()
add_subdirectory(node)
add_subdirectory(controller)
add_subdirectory(osdep)
add_subdirectory(go/native)
#if(WIN32)
# add_subdirectory("windows/WinUI")
# add_subdirectory("windows/copyutil")
# add_definitions(-DNOMINMAX)
#endif(WIN32)
set(
zt_osdep
zt_core
zt_controller
zt_go_native
)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/version.h.in
${CMAKE_CURRENT_BINARY_DIR}/version.h
)
#set(src
# one.cpp
# "ext/http-parser/http_parser.c"
#)
#set(headers
# "ext/http-parser/http_parser.h"
#)
if(WIN32)
set(libs ${libs} wsock32 ws2_32 rpcrt4 iphlpapi)
else(WIN32)
set(libs ${libs} pthread)
endif(WIN32)
#if(WIN32)
# set(libs ${libs} wsock32 ws2_32 rpcrt4 iphlpapi)
# set(src
# ${src}
# "windows/ZeroTierOne/ServiceBase.cpp"
# "windows/ZeroTierOne/ServiceInstaller.cpp"
# "windows/ZeroTierOne/ZeroTierOneService.cpp"
# "windows/ZeroTierOne/ZeroTierOne.rc"
# )
# set(headers
# ${headers}
# "windows/ZeroTierOne/ServiceBase.h"
# "windows/ZeroTierOne/ServiceInstaller.h"
# "windows/ZeroTierOne/ZeroTierOneService.h"
# )
#else(WIN32)
# set(libs ${libs} pthread resolv)
#endif(WIN32)
#if(BUILD_CENTRAL_CONTROLLER)
# set(libs ${libs} rabbitmq-static ${PostgreSQL_LIBRARIES})
#endif(BUILD_CENTRAL_CONTROLLER)
#add_executable(${PROJECT_NAME} ${src} ${headers})
#target_link_libraries(${PROJECT_NAME} ${libs})
#target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_BINARY_DIR})
add_executable(zerotier-selftest selftest.cpp)
target_link_libraries(zerotier-selftest ${libs} zt_core zt_osdep)
target_compile_features(zerotier-selftest PUBLIC cxx_std_11)
+2 -7
View File
@@ -1,13 +1,8 @@
ZeroTier One, an endpoint server for the ZeroTier virtual network layer.
Copyright © 2011–2019 ZeroTier, Inc.
ZeroTier One is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or (at
your option) any later version.
See the file ‘LICENSE.GPL-3’ for the text of the GNU GPL version 3.
If that file is not present, see <http://www.gnu.org/licenses/>.
ZeroTier is released under the terms of the BSL version 1.1. See the
file LICENSE.txt for details.
..
Local variables:
Vendored
+7 -1
View File
@@ -14,7 +14,13 @@ parallel 'centos7': {
checkout scm
stage('Build Centos 7') {
sh 'make -f make-linux.mk'
sh '''. /opt/rh/devtoolset-8/enable
rm -rf build/
mkdir build && cd build
cmake ..
make -j4
./zerotier-selftest
'''
}
}
catch (err) {
-339
View File
@@ -1,339 +0,0 @@
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have. You must make sure that they, too, receive or can get the
source code. And you must show them these terms so they know their
rights.
We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.
Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software. If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.
Finally, any free program is threatened constantly by software
patents. We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary. To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.
1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.
You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.
2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change.
b) You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.
c) If the modified program normally reads commands interactively
when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display an
announcement including an appropriate copyright notice and a
notice that there is no warranty (or else, saying that you provide
a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.
In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:
a) Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of Sections
1 and 2 above on a medium customarily used for software interchange; or,
b) Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your
cost of physically performing source distribution, a complete
machine-readable copy of the corresponding source code, to be
distributed under the terms of Sections 1 and 2 above on a medium
customarily used for software interchange; or,
c) Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.
If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.
5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.
6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.
7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all. For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.
10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission. For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
-674
View File
File diff suppressed because it is too large. Load diff
+140 -28
View File
@@ -1,37 +1,149 @@
ZeroTier One - Network Virtualization Everywhere
Copyright (C) 2011-2019 ZeroTier, Inc. https://www.zerotier.com/
-----------------------------------------------------------------------------
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Business Source License 1.1
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved.
"Business Source License" is a trademark of MariaDB Corporation Ab.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-----------------------------------------------------------------------------
See LICENSE.GPL-3 for the full GNU GPL v3 license.
Parameters
--
Licensor: ZeroTier, Inc.
Licensed Work: ZeroTier Network Virtualization Engine 1.4.4
The Licensed Work is (c)2019 ZeroTier, Inc.
Additional Use Grant: You may make use of the Licensed Work, provided you
do not use it in any of the following ways:
You can be released from the requirements of the license by purchasing
a commercial license. Buying such a license is mandatory as soon as you
develop commercial closed-source software that incorporates or links
directly against ZeroTier software without disclosing the source code
of your own application.
* Sell hosted ZeroTier services as a "SaaS" Product
--
(1) Operate or sell access to ZeroTier root servers,
network controllers, or authorization key or certificate
generation components of the Licensed Work as a
for-profit service, regardless of whether the use of
these components is sold alone or is bundled with other
services. Note that this does not apply to the use of
ZeroTier behind the scenes to operate a service not
related to ZeroTier network administration.
The above license does not apply to third party code included with or
linked against by ZeroTier software. See the third party code section
of the AUTHORS.md for an index of third party software included in
this software repository.
* Create Non-Open-Source Commercial Derviative Works
Licenses for third party code are all relatively permissive: MIT,
BSD, and public domain. The only exception is the tap-windows driver
which is under the GPLv2, but this is only needed to produce the
binary tap device driver used by the ZeroTier service on Windows.
(2) Link or directly include the Licensed Work in a
commercial or for-profit application or other product
not distributed under an Open Source Initiative (OSI)
compliant license. See: https://opensource.org/licenses
(3) Remove the name, logo, copyright, or other branding
material from the Licensed Work to create a "rebranded"
or "white labeled" version to distribute as part of
any commercial or for-profit product or service.
* Certain Government Uses
(4) Use or deploy the Licensed Work in a government
setting in support of any active government function
or operation with the exception of the following:
physical or mental health care, family and social
services, social welfare, senior care, child care, and
the care of persons with disabilities.
Change Date: 2023-01-01
Change License: Apache License version 2.0 as published by the Apache
Software Foundation
https://www.apache.org/licenses/
Alternative Licensing
If you would like to use the Licensed Work in any way that conflicts with
the stipulations of the Additional Use Grant, contact ZeroTier, Inc. to
obtain an alternative commercial license.
Visit us on the web at: https://www.zerotier.com/
Notice
The Business Source License (this document, or the "License") is not an Open
Source license. However, the Licensed Work will eventually be made available
under an Open Source License, as stated in this License.
For more information on the use of the Business Source License for ZeroTier
products, please visit our pricing page which contains license details and
and license FAQ: https://zerotier.com/pricing
For more information on the use of the Business Source License generally,
please visit the Adopting and Developing Business Source License FAQ at
https://mariadb.com/bsl-faq-adopting.
-----------------------------------------------------------------------------
Business Source License 1.1
Terms
The Licensor hereby grants you the right to copy, modify, create derivative
works, redistribute, and make non-production use of the Licensed Work. The
Licensor may make an Additional Use Grant, above, permitting limited
production use.
Effective on the Change Date, or the fourth anniversary of the first publicly
available distribution of a specific version of the Licensed Work under this
License, whichever comes first, the Licensor hereby grants you rights under
the terms of the Change License, and the rights granted in the paragraph
above terminate.
If your use of the Licensed Work does not comply with the requirements
currently in effect as described in this License, you must purchase a
commercial license from the Licensor, its affiliated entities, or authorized
resellers, or you must refrain from using the Licensed Work.
All copies of the original and modified Licensed Work, and derivative works
of the Licensed Work, are subject to this License. This License applies
separately for each version of the Licensed Work and the Change Date may vary
for each version of the Licensed Work released by Licensor.
You must conspicuously display this License on each original or modified copy
of the Licensed Work. If you receive the Licensed Work in original or
modified form from a third party, the terms and conditions set forth in this
License apply to your use of that work.
Any use of the Licensed Work in violation of this License will automatically
terminate your rights under this License for the current and all other
versions of the Licensed Work.
This License does not grant you any right in any trademark or logo of
Licensor or its affiliates (provided that you may use a trademark or logo of
Licensor as expressly required by this License).
TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
TITLE.
-----------------------------------------------------------------------------
MariaDB hereby grants you permission to use this License’s text to license
your works, and to refer to it using the trademark "Business Source License",
as long as you comply with the Covenants of Licensor below.
Covenants of Licensor
In consideration of the right to use this License’s text and the "Business
Source License" name and trademark, Licensor covenants to MariaDB, and to all
other recipients of the licensed work to be provided by Licensor:
1. To specify as the Change License the GPL Version 2.0 or any later version,
or a license that is compatible with GPL Version 2.0 or a later version,
where "compatible" means that software provided under the Change License can
be included in a program with software provided under GPL Version 2.0 or a
later version. Licensor may specify additional Change Licenses without
limitation.
2. To either: (a) specify an additional grant of rights to use that does not
impose any additional restriction on the right granted in this License, as
the Additional Use Grant; or (b) insert the text "None".
3. To specify a Change Date.
4. Not to modify this License in any other way.
+14 -22
View File
@@ -1,28 +1,20 @@
# Common makefile -- loads make rules for each platform
OSTYPE=$(shell uname -s)
BUILDDIR := build
ifeq ($(OSTYPE),Darwin)
include make-mac.mk
endif
.PHONY: all
ifeq ($(OSTYPE),Linux)
include make-linux.mk
endif
all: setup
cd ${BUILDDIR} && $(MAKE) -j$(shell getconf _NPROCESSORS_ONLN)
ifeq ($(OSTYPE),FreeBSD)
CC=clang
CXX=clang++
ZT_BUILD_PLATFORM=7
include make-bsd.mk
endif
ifeq ($(OSTYPE),OpenBSD)
CC=egcc
CXX=eg++
ZT_BUILD_PLATFORM=9
include make-bsd.mk
endif
setup:
mkdir -p ${BUILDDIR} && cd ${BUILDDIR} && cmake .. -DCMAKE_BUILD_TYPE=Release
ifeq ($(OSTYPE),NetBSD)
include make-netbsd.mk
endif
debug:
mkdir -p ${BUILDDIR} && cd ${BUILDDIR} && cmake .. -DCMAKE_BUILD_TYPE=Debug && $(MAKE)
clean:
rm -rf ${BUILDDIR}
distclean:
rm -rf ${BUILDDIR}
Loaded 20 of 586 files, more files were not shown because too many files have changed in this diff. Show more