4850 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Grant Limberg	df640dc39b	Merge branch 'dev' of github.com:zerotier/ZeroTierOne into dev	2020-09-14 12:45:11 -07:00
Grant Limberg	d980bba49f	fix windows compilation	2020-09-14 12:42:51 -07:00
Joseph Henry	cf47618ffb	Change ZT_MULTIPATH_FLOW_EXPIRATION_INTERVAL from 30 seconds to 5 minutes	2020-09-11 16:09:46 -07:00
Joseph Henry	0e8b54f7a1	Add minor trace output formatting changes. Change ZT_MULTIPATH_BOND_STATUS_INTERVAL from 30000 to 60000	2020-09-11 14:47:18 -07:00
Grant Limberg	bbb307aff7	DNS is now toggleable via zerotier-cli set <nwid> allowDNS=[0|1] ... Flag is disabled by default as it should be opt-in on each endpoint	2020-09-10 15:59:18 -07:00
Grant Limberg	3db263284b	not sure how this got reverted	2020-09-10 13:18:25 -07:00
Grant Limberg	d8f041a484	Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev	2020-09-10 12:50:30 -07:00
Adam Ierymenko	120bcbc2c9	Merge branch 'dev' of github.com:zerotier/ZeroTierOne into dev	2020-09-10 15:44:47 -04:00
Grant Limberg	10ccaa2620	Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev	2020-09-10 12:43:58 -07:00
Adam Ierymenko	e6b5f8aabd	AES work... but disabled in this commit.	2020-09-10 15:43:40 -04:00
Michael Adams	4798689bf3	Merge branch 'dev' of https://github.com/zerotier/ZeroTierOne into dev	2020-09-10 12:43:24 -07:00
Michael Adams	0545e70bd5	Added error messages to use admin/sudo/root	2020-09-10 12:42:11 -07:00
Grant Limberg	5032a8eeac	Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev	2020-09-10 11:57:51 -07:00
Adam Ierymenko	1ad555a071	More selective push of AES modifications and refactoring stuff.	2020-09-10 14:48:48 -04:00
Grant Limberg	7d0f6933d6	Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev	2020-09-10 11:38:25 -07:00
Adam Ierymenko	4cd3d0bb76	Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev	2020-09-10 14:37:16 -04:00
Adam Ierymenko	8374553b6a	Linux build fix for AES flags.	2020-09-10 14:36:33 -04:00
Grant Limberg	eca4052884	Merge branch 'dev-redis' into dev	2020-09-10 11:10:10 -07:00
Grant Limberg	53d5c9890f	missed a rollback ... # Conflicts: # controller/PostgreSQL.cpp	2020-08-26 15:52:01 -07:00
Grant Limberg	43c108f077	missed a rollback	2020-08-26 15:50:36 -07:00
Grant Limberg	33cc59914a	Merge branch 'dev-redis' into dev	2020-08-26 14:52:54 -07:00
Grant Limberg	45b6d11126	Put upserts from controller into single transaction	2020-08-26 14:52:23 -07:00
Adam Ierymenko	b7b01da742	Wire up dearmor() path.	2020-08-25 14:13:20 -07:00
Adam Ierymenko	93d6b41898	Disable AES in commit so as not to break other builds.	2020-08-25 08:08:54 -07:00
Adam Ierymenko	47e9fb3ddb	Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev	2020-08-25 08:07:23 -07:00
Joseph Henry	b1ddba0438	Remove a few old comments	2020-08-24 18:56:49 -07:00
Grant Limberg	e7891bfcb0	Merge branch 'dev-redis' into dev	2020-08-21 16:29:13 -07:00
Grant Limberg	7f99c4a779	Sleep 10 seconds between writes to DB	2020-08-21 16:22:28 -07:00
Adam Ierymenko	2ac49d99dd	AES integrated on send side.	2020-08-21 14:23:31 -07:00
Adam Ierymenko	3fd8efe642	AES builds now	2020-08-21 09:56:53 -07:00
Adam Ierymenko	06730c7d1d	BSL date bump	2020-08-20 12:51:39 -07:00
Grant Limberg	81c9db7a15	fix libs for non-controller builds on macOS	2020-08-18 11:46:29 -07:00
Grant Limberg	8d0a3563e4	Merge branch 'dns' into dev	2020-08-12 13:56:21 -07:00
Grant Limberg	c0c215c83c	single dns config per network	2020-08-12 13:08:47 -07:00
Grant Limberg	058d888311	More debug logging cleanup	2020-08-12 10:00:09 -07:00
Grant Limberg	30b18d925f	clean up some debug logging	2020-08-12 09:16:18 -07:00
Grant Limberg	137d05e799	add setDNS stubs for linux/bsd	2020-08-12 09:14:10 -07:00
Grant Limberg	d9c4e644de	Windows DNS	2020-08-11 18:55:42 -07:00
Joseph Henry	edd960566a	Improve bond tracing, fix bond initialization bugs, remove vestigial debug code	2020-08-06 18:10:40 -07:00
Grant Limberg	6868e98904	Get stuff building on Windows ... Been a minute since any of this has been updated	2020-08-05 16:04:02 -07:00
Grant Limberg	85a5b0b948	Remove dns config on shutdown ... Also add calls to MacDNSHelper to the kext tap	2020-08-05 14:49:45 -07:00
Grant Limberg	b9a1719cb1	Let's make sure to clean up our memory	2020-08-05 14:42:19 -07:00
Grant Limberg	d6e3164ea1	remove initial attempt at dns config via scutil	2020-08-05 14:42:09 -07:00
Grant Limberg	302ac8fefe	DNS config support on macOS	2020-08-05 14:26:11 -07:00
Grant Limberg	d2708daa8e	debug output	2020-08-04 14:33:18 -07:00
Grant Limberg	88a3c685fb	latest	2020-08-04 13:52:57 -07:00
Grant Limberg	2e52a1eebf	forgot a couple queries in postgres. trying to pull dns of member not network in embedded network controller ... also some debug logging	2020-08-04 09:45:45 -07:00
Grant Limberg	d098a99d09	fix memory init issue ... and another place where dns data needs to be copied	2020-07-31 11:42:03 -07:00
Grant Limberg	6b197e067a	Merge branch 'dev' into dns	2020-07-30 13:15:43 -07:00
Joseph Henry	9f4985b11a	Add basic bond health status reporting (listbonds)	2020-07-27 23:01:12 -07:00