void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-07 21:13:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some CLI help updates, some code formatting, pre-reorg.

Browse source
This commit is contained in:
Adam Ierymenko 2020-06-05 12:49:35 -07:00
parent 45b90a0dfa
commit 03bcdf74a8
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
6 changed files with 58 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
.gitignore vendored Executable file → Normal file
View file

5
go/cmd/zerotier/cli/help.go
View file

@ -36,7 +36,9 @@ Commands:
version Print version version Print version
service Start as service service Start as service
status Show node status and configuration status Show node status and configuration
join <network> [fingerprint] Join a virtual network join <network> [option] Join a virtual network
auth <token> Join authorization token
fingerprint <fingerprint> Full controller identity fingerprint
leave <network> Leave a virtual network leave <network> Leave a virtual network
networks List VL2 virtual networks networks List VL2 virtual networks
network <network> [command] [option] - Network management commands network <network> [command] [option] - Network management commands
@ -57,6 +59,7 @@ Commands:
add <identity> [endpoint] Designate a peer as a root add <identity> [endpoint] Designate a peer as a root
remove <address> Un-designate a peer as a root remove <address> Un-designate a peer as a root
subscribe <url> Subscribe to a root set subscribe <url> Subscribe to a root set
unsubscribe <url> Unsubscribe from a root set
set [option] [value] - Get or set a core config option set [option] [value] - Get or set a core config option
port <port> Primary P2P port port <port> Primary P2P port
secondaryport <port/0> Secondary P2P port (0 to disable) secondaryport <port/0> Secondary P2P port (0 to disable)

1
include/ZeroTierCore.h
View file

@ -376,7 +376,6 @@ enum ZT_TracePacketDropReason
ZT_TRACE_PACKET_DROP_REASON_INVALID_COMPRESSED_DATA = 6, ZT_TRACE_PACKET_DROP_REASON_INVALID_COMPRESSED_DATA = 6,
ZT_TRACE_PACKET_DROP_REASON_UNRECOGNIZED_VERB = 7, ZT_TRACE_PACKET_DROP_REASON_UNRECOGNIZED_VERB = 7,
ZT_TRACE_PACKET_DROP_REASON_REPLY_NOT_EXPECTED = 8 ZT_TRACE_PACKET_DROP_REASON_REPLY_NOT_EXPECTED = 8
}; };
/** /**

2
node/AES.cpp
View file

@ -1116,7 +1116,7 @@ void AES::_encryptSW(const uint8_t in[16], uint8_t out[16]) const noexcept
void AES::_decryptSW(const uint8_t in[16], uint8_t out[16]) const noexcept void AES::_decryptSW(const uint8_t in[16], uint8_t out[16]) const noexcept
{ {
const uint32_t *const restrict rk = _k.sw.dk; const uint32_t *restrict rk = _k.sw.dk;
uint32_t s0, s1, s2, s3, t0, t1, t2, t3; uint32_t s0, s1, s2, s3, t0, t1, t2, t3;
const uint32_t m8 = 0xff; const uint32_t m8 = 0xff;
s0 = readuint32_t(in) ^ rk[0]; s0 = readuint32_t(in) ^ rk[0];

6
node/Constants.hpp
View file

@ -29,7 +29,11 @@
/** /**
* Version bit packed into four 16-bit fields in a 64-bit unsigned integer. * Version bit packed into four 16-bit fields in a 64-bit unsigned integer.
*/ */
#define ZT_VERSION_PACKED ( ((uint64_t)ZEROTIER_VERSION_MAJOR << 48U) | ((uint64_t)ZEROTIER_VERSION_MINOR << 32U) | ((uint64_t)ZEROTIER_VERSION_REVISION << 16U) | (uint64_t)ZEROTIER_VERSION_BUILD ) #define ZT_VERSION_PACKED ( \
((uint64_t)ZEROTIER_VERSION_MAJOR << 48U) | \
((uint64_t)ZEROTIER_VERSION_MINOR << 32U) | \
((uint64_t)ZEROTIER_VERSION_REVISION << 16U) | \
(uint64_t)ZEROTIER_VERSION_BUILD )
/** /**
* Length of a ZeroTier address in bytes * Length of a ZeroTier address in bytes