5216 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Grant Limberg	8e1a88c2fb	Merge branch 'edge' of http://git.int.zerotier.com/zerotier/ZeroTierOne into edge	2020-01-13 15:32:31 -08:00
Adam Ierymenko	ee5a988f14	Wiring back up PUSH_DIRECT_PATHS and friends.	2020-01-13 14:04:17 -08:00
Adam Ierymenko	f814a07ab3	Go build works now	2020-01-10 22:12:56 -08:00
Adam Ierymenko	a5aea2f3bb	Everything but the Go code builds now!	2020-01-10 21:09:13 -08:00
Adam Ierymenko	7291ac2093	A bunch more cleanup and build fixes, and remove old version of multipath code to prep for new version.	2020-01-10 20:40:14 -08:00
Adam Ierymenko	790fe50fac	Go code cleanup for new changes	2020-01-10 16:54:01 -08:00
Adam Ierymenko	83eacdfada	New Buffer implementation (not used yet) and cleanup	2020-01-10 15:28:27 -08:00
Adam Ierymenko	2fbeaaf148	Bunch more fixes, implement C API for Identity operations.	2020-01-09 13:50:51 -08:00
Adam Ierymenko	57710cbc38	.	2020-01-09 08:39:47 -08:00
Adam Ierymenko	8bae0acaf9	More cleanup and build fixes, almost builds again!	2020-01-08 21:48:01 -08:00
Adam Ierymenko	ef64e6a336	Build fixes, cleanup	2020-01-08 21:24:47 -08:00
Adam Ierymenko	9642ff5fb9	.	2020-01-08 18:08:41 -08:00
Adam Ierymenko	263798d1c3	cleanup	2020-01-07 14:04:08 -08:00
Adam Ierymenko	3fbfad5585	cleanup	2020-01-07 14:03:50 -08:00
Adam Ierymenko	627533cf48	.	2020-01-07 13:24:15 -08:00
Adam Ierymenko	19899de5a6	.	2020-01-06 18:14:35 -08:00
Adam Ierymenko	c1b2c7903c	.	2020-01-02 19:04:36 -05:00
Grant Limberg	28df0c2e38	Merge branch 'dev' of github.com:zerotier/ZeroTierOne into dev	2019-12-17 10:56:53 -08:00
Grant Limberg	7696d45093	Fix handling of invalid conf file ... Fixes GitHub issue #1068	2019-12-17 10:51:01 -08:00
Grant Limberg	2a7d4fcde5	update vs project settings	2019-12-17 10:49:21 -08:00
Adam Ierymenko	3b94ef99ae	Bunch of new-gen serialization work	2019-12-16 11:57:33 -08:00
Adam Ierymenko	6267c67888	A bunch of cleanup and refactoring toward 2.x	2019-12-12 16:15:49 -08:00
Adam Ierymenko	23d6a3aacd	Moar refactoring	2019-12-11 13:46:44 -08:00
Adam Ierymenko	72361fb1c8	Cleanup and refactor	2019-12-11 13:27:11 -08:00
Adam Ierymenko	b55f98b813	wip	2019-12-11 12:04:22 -08:00
Grant Limberg	995fa4a76c	Merge branch 'refs/heads/master' into dev	2019-11-22 15:00:39 -08:00
Grant Limberg	d8597884f6	jenkins windows	2019-11-22 11:25:31 -08:00
Grant Limberg	a993ddc54d	Merge branch 'refs/heads/master' into dev	2019-11-21 15:12:37 -08:00
Grant Limberg	54e25084fe	re-enable CI on master	2019-11-21 14:51:33 -08:00
Grant Limberg	e58a0b3efb	build central controller docker images on macOS	2019-11-21 14:49:24 -08:00
Grant Limberg	381f15382c	Convert central-controller docker build to use a builder subcontainer	2019-11-20 13:56:26 -08:00
Adam Ierymenko	5a4d681af8	Build fixes.	2019-11-19 16:45:53 -08:00
Adam Ierymenko	a16a0a8ce5	Warning removal.	2019-11-19 16:22:11 -08:00
Grant Limberg	91d679af15	Merge pull request #1087 from skunkwerks/dev ... drop -Werror from DEBUG builds	2019-11-19 08:47:38 -08:00
Dave Cottlehuber	8396f16dd2	drop -Werror from DEBUG builds ... Appease compilers. Thanks @glimberg for the diff. Closes #1086	2019-11-19 16:45:06 +00:00
Grant Limberg	203df51752	ignore workspace/ folder ... It's where I usually put temporary identity, etc. files for testing	2019-11-13 12:48:32 -08:00
Grant Limberg	dc19deb6c3	.	2019-11-13 12:46:52 -08:00
Grant Limberg	86abd31659	fix log line	2019-11-13 12:46:16 -08:00
Joseph Henry	b8e70d866a	Compile fix for unterminated conditional directive	2019-11-12 09:46:39 -08:00
Joseph Henry	e1e27eb19d	Bugfix for incorrect port binding of secondary and tertiary ports	2019-11-11 12:03:49 -08:00
Adam Ierymenko	47b4efd49b	Work in progress...	2019-11-04 14:24:37 -08:00
Grant Limberg	088dab4f04	Let's not print this to the logs	2019-10-31 15:13:20 -07:00
Grant Limberg	cc79ec6179	use std::string instead of const char* in rmq struct	2019-10-31 15:08:59 -07:00
Grant Limberg	74478b24b0	add librabbitmq binaries for macos for testing central controller	2019-10-31 14:04:25 -07:00
Adam Ierymenko	14fab11081	Merge dev, clean up old files	2019-10-16 06:05:29 -07:00
Adam Ierymenko	4c55f3eaa5	Work in progress	2019-10-16 06:03:32 -07:00
Travis LaDuke	bad95d7c67	Update cli help to say <network ID> instead of <network> ... Closes #1054	2019-10-15 13:15:45 -07:00
Adam Ierymenko	891bf99894	work in progress	2019-10-15 12:49:03 -07:00
Adam Ierymenko	22e95b3bcb	.	2019-10-09 10:00:30 -07:00
Adam Ierymenko	4da315fab2	Plumb through external interface stuff	2019-10-03 10:43:28 -07:00