4032 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Adam Ierymenko	84748aab51	Merge branch 'dev' into edge	2017-07-06 10:26:04 -07:00
Adam Ierymenko	3fadc64ee0	Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev	2017-07-06 10:25:58 -07:00
Adam Ierymenko	47594f7c99	Merge branch 'edge' of http://10.6.6.2/zerotier/ZeroTierOne into edge	2017-07-06 10:25:44 -07:00
Adam Ierymenko	2f20258807	.	2017-07-06 10:25:36 -07:00
Grant Limberg	47122a3804	Merge branch 'dev' into edge	2017-07-03 13:29:54 -07:00
Grant Limberg	1730f8f5b7	also cluster.hpp	2017-07-03 13:04:11 -07:00
Grant Limberg	d258a75cd3	remove Cluster.cpp from build list as it's been removed	2017-07-03 13:03:43 -07:00
Adam Ierymenko	baa10c2995	.	2017-06-30 17:32:07 -07:00
Grant Limberg	207d6572e0	fix for changelist posting to mattermost	2017-06-30 14:24:40 -07:00
Grant Limberg	10264cec2f	slackSend -> mattermostSend	2017-06-30 13:43:39 -07:00
Adam Ierymenko	0ea1749c59	Merge pull request #540 from skunkwerks/master ... build: all BSDs expect gmake here	2017-06-30 09:55:43 -07:00
Dave Cottlehuber	dd83c680e5	build: all BSDs expect gmake here	2017-06-30 13:11:05 +00:00
Adam Ierymenko	1a40f35fd4	Merge branch 'dev' into edge	2017-06-27 11:32:14 -07:00
Adam Ierymenko	8a99113c88	Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev	2017-06-27 11:32:07 -07:00
Adam Ierymenko	ada2ea3a6b	Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into edge	2017-06-27 11:31:39 -07:00
Adam Ierymenko	355cce3938	Rename Utils::snprintf due to it being a #define on one platform.	2017-06-27 11:31:29 -07:00
Travis LaDuke	9b2e08dd09	Update README.md ... We've had multiple questions in the community chat regarding posting new network and getting the curl syntax correct.	2017-06-26 11:53:35 -07:00
Joseph Henry	04cee3b8d3	Merge branch 'dev' of https://github.com/zerotier/ZeroTierOne into dev	2017-06-26 02:13:40 -07:00
Joseph Henry	c61440efea	Detect platformDefaultHomePath on QNAP systems	2017-06-25 20:20:30 -07:00
Adam Ierymenko	02d18af57d	Remove Cluster.hpp	2017-06-23 16:10:26 -07:00
Adam Ierymenko	2225bb093a	Merge branch 'edge' into dev	2017-06-23 16:06:38 -07:00
Adam Ierymenko	75a6a7baca	Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev	2017-06-23 16:05:58 -07:00
Alex	6b130e8311	fix for windows compilation (related to SDK implementation)	2017-06-21 14:58:39 -07:00
Alex	1b18923824	except wondows/lib	2017-06-13 14:25:53 -07:00
Alex	fc2ce439e2	remove unneeded files	2017-06-13 14:23:11 -07:00
Alex	5b3d9f9184	added Windows SDK in form of dlls	2017-06-13 13:28:23 -07:00
Adam Ierymenko	dd68c207f4	Stuff old Cluster code in attic.	2017-06-08 08:51:49 -07:00
Adam Ierymenko	9a3c34b5b3	Build fix, use -Os on Linux too.	2017-06-07 17:19:33 -07:00
Adam Ierymenko	951d911531	Last bit of new cluster code, ready to test.	2017-06-06 16:11:19 -07:00
Adam Ierymenko	4f2179b0df	.	2017-06-05 13:42:43 -07:00
Adam Ierymenko	9b287392a4	.	2017-06-05 12:15:28 -07:00
Adam Ierymenko	aa06470cb6	More cleanup for cluster refactor.	2017-06-01 20:32:43 -07:00
Adam Ierymenko	d7b4f24a7a	.	2017-06-01 17:21:57 -07:00
Adam Ierymenko	e8d11eb5c5	.	2017-06-01 17:21:04 -07:00
Adam Ierymenko	7f4da08ff7	.	2017-06-01 12:57:44 -07:00
Adam Ierymenko	1f9414a30f	.	2017-06-01 12:38:04 -07:00
Adam Ierymenko	6015b529a0	More clustering work.	2017-06-01 12:33:05 -07:00
Adam Ierymenko	76452b4e28	Data structure fixup.	2017-06-01 07:39:31 -07:00
Adam Ierymenko	64b7d9ef82	New clustering work.	2017-06-01 07:15:46 -07:00
Joseph Henry	7bc9666aac	fix for SDK's route/tap association in getTap()	2017-05-31 13:07:03 -07:00
Adam Ierymenko	2a4a50b1da	Add some also-ZeroTier-written ext/ code for use in new clustering, delete some old code, and change Mac to use -Os which is just as fast as -Ofast and may be faster due to cache effects.	2017-05-31 08:36:09 -07:00
Adam Ierymenko	2ec88e8008	Remove old circuit test code. Rules engine will let us do this much better and more simply.	2017-05-30 10:19:45 -07:00
Joseph Henry	36049a940c	added campaign tags to README.md	2017-05-25 17:09:21 -07:00
Grant Limberg	952834f7f3	Let Android Studio determine debug/release build	2017-05-23 14:56:29 -07:00
Adam Ierymenko	f9a9c2d009	Config object was never even being initialized on leave. Never noticed since desktop and server clients did not use.	2017-05-23 14:45:16 -07:00
Adam Ierymenko	fb71a6e2b4	skipRootCheck should also prevent dropping of privs on Linux	2017-05-19 16:16:10 -07:00
Adam Ierymenko	5e6a2a17b0	Cluster build fix.	2017-05-19 15:32:52 -07:00
Adam Ierymenko	92289c1981	Move to canonical device naming on Linux.	2017-05-19 15:18:47 -07:00
Adam Ierymenko	99e2098a48	Add a way to specify a different interface prefix (for internal use mostly).	2017-05-19 14:00:08 -07:00
Adam Ierymenko	5fc1c1de28	.	2017-05-19 13:24:40 -07:00