Commit Graph

4852 Commits

Author SHA1 Message Date
bbdb2aa672 Some work on IPv4 enabled ad-hoc networks. 2018-03-08 23:53:57 -08:00
574b24c082 docs 2018-03-08 22:41:42 -08:00
874a187c7f cleanup 2018-03-08 22:39:51 -08:00
e8fb443313 Forgot one other use in RethinkDb driver. 2018-03-08 22:34:51 -08:00
57b96af2c4 Fix for FileDB _networkChanged / _memberChanged problem. 2018-03-08 22:33:08 -08:00
e61d4ab67a Merge branch 'dev' into edge 2018-02-23 13:58:24 -08:00
2ee358dbfc TAP driver requires input and output buffers for calls passed into DeviceIoControl
Otherwise the driver returns STATUS_INVALID_PARAMETER and the call fails.  This should fix some Multicast issues on Windows
2018-02-23 13:42:02 -08:00
e3bb67d188 Added debug output convenience macros 2018-02-16 16:55:31 -08:00
2d289a3308 Just a little cleanup 2018-02-16 15:20:07 -08:00
bdb2cc7c85 Linux: link system libcurl when compiling with ZT_VAULT_SUPPORT=1
Requires libcurl and development headers to be installed
2018-02-16 15:08:04 -08:00
7793060723 Add HashiCorp Vault storage of ZeroTier's public & secret identity
Adds a "vault" section to local.conf.  Example local.conf:

{
  "config": {
    "vault": {
      "vaultURL": "https://some.vault.host:8200",
      "vaultToken": "my-super-secret-vault-token",
      "vaultPath": "secure/place/to/put/identity"
    }
}

Additionally, the following environment variables can be set.  Environment variables override local.conf:

VAULT_ADDR
VAULT_TOKEN
VAULT_PATH

Identities will be placed in the keys "public" and "secret" under the user specified path.  If no path is specified, they will be placed in the token specific cubbyhole.

If identity.public and identity.secret exist on disk and vault is configured, they will be automatically added to Vault and removed from disk.

TODO:
 *  Decide behavior for if Vault cannot be reached.
 *  Add libcurl as a dependency in Linux & Mac builds
 *  Add libcurl as a requirement for linux packages
2018-02-16 14:30:27 -08:00
84302ae9c7 Add CURL libs to VC project 2018-02-16 14:21:38 -08:00
cd801b96fa libcurl binaries for Windows 2018-02-16 10:31:37 -08:00
5ff0653f9e Hooks into StateGet and StatePut for grabbing identity.secret from Vault 2018-02-16 10:18:10 -08:00
9574d635c1 Add Vault configuration option parsing to local.conf
{
   "settings": {
       ...
      "valut": {
         "vaultURL": "...",
         "vaultKey": "...",
         "vaultPath": "..."
      }
   }
}
2018-02-16 10:18:10 -08:00
1bec8ddce4 Better error messages when the ZeroTier service can't be contacted
Fixes #681
2018-02-13 16:41:21 -08:00
f9b07c63db Merge branch 'dev' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne into dev 2018-02-12 09:30:12 -08:00
8828fc7520 some JNI error checking 2018-02-12 09:29:44 -08:00
978d8fcd4a Merge branch 'dev' of http://10.187.63.16/zerotier/ZeroTierOne into dev 2018-02-09 06:35:09 +00:00
51aadcf901 A few fixes dicatated by valgrind. 2018-02-09 06:35:01 +00:00
db952a050a Added platform checks for Windows in OneService 2018-02-08 14:15:32 -08:00
f049740ae5 silence LOGV and LOGD in release builds for android 2018-02-07 15:53:23 -08:00
73ca9b6373 check physical blacklist for interface binding as well 2018-02-03 14:53:46 -05:00
c6949aad2d Linux build fix on some versions. 2018-02-02 17:11:23 -08:00
e57d0fdccc Update README.md
this ip changes sometimes
2018-02-02 10:30:49 -08:00
82f383be43 A few other make changes. 2018-02-01 15:58:58 -08:00
26aaf253ac Allow us to build a semi-dynamic official binary that works back to CentOS 6, at least on x64, and is very fast since we can build it with newer clang or icc. 2018-02-01 15:52:41 -08:00
51715376bf Use Intel icc if available on Linux. 2018-02-01 13:05:17 -08:00
ff95b0278c Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev 2018-02-01 12:46:40 -08:00
fe1fa20c6c Fix build on Intel C/C++ Compiler for Linux. 2018-02-01 12:46:35 -08:00
a867fe404b Omit pragma comment for ZT_SDK builds on Windows 2018-01-31 17:08:42 -08:00
d6e8a5f3ca Fix Windows compile error. 2018-01-30 16:07:41 -08:00
4878d8ec15 Add CAP_NET_BIND_SERVICE to capabilities 2018-01-30 10:47:31 -08:00
f7019d9e80 Tie up the rest of hub and spoke designated replicator multicast mode. 2018-01-26 22:14:10 -05:00
6d8e1e8783 More cleanup of old stuff. 2018-01-26 21:34:56 -05:00
939ab43ceb Do not send to origin in second buffered multicast path. 2018-01-26 21:22:51 -05:00
d3d58ba8a7 Add support for designated multicast replicators to Multicaster::send(). 2018-01-26 21:19:51 -05:00
f03fd57997 Clean up some multicast code. 2018-01-26 20:38:44 -05:00
e74cd4b4ef A little more cleanup. 2018-01-26 20:06:11 -05:00
f3dfd63634 Clean up some old stuff. 2018-01-26 20:00:37 -05:00
5f5302e595 More useful to allow arrays of IPs to bind to. 2018-01-25 17:27:08 -05:00
125ec622ca Add bindToWildcard local.conf option. 2018-01-25 14:59:11 -05:00
384e5b66de More work on GitHub issue #666 2018-01-25 14:16:07 -05:00
7e7723e98f A small memory use reduction. 2018-01-25 09:57:02 -05:00
4419734a7d Implement continuous contacting of designated anchors and multicast replicators - GitHub issue #666 2018-01-25 07:11:59 -05:00
f821db29f3 . 2018-01-24 17:12:53 -05:00
6c64f1816d cleanup 2018-01-24 16:16:00 -05:00
34e2ad0dfc Stub out NetworkConfig for GitHub issue #666 2018-01-24 14:43:04 -05:00
055b99c3cb cleanup 2018-01-12 15:44:27 -08:00
531842dc6b Update miniupnpc to latest version (included library) 2018-01-12 15:30:40 -08:00