Merge branch 'master' into dev
This commit is contained in:
commit
faf864b8a2
10 changed files with 91 additions and 97 deletions
|
@ -42,9 +42,9 @@ namespace ZeroTier {
|
|||
|
||||
bool IncomingPacket::tryDecode(const RuntimeEnvironment *RR,bool deferred)
|
||||
{
|
||||
try {
|
||||
const Address sourceAddress(source());
|
||||
const Address sourceAddress(source());
|
||||
|
||||
try {
|
||||
// Check for trusted paths or unencrypted HELLOs (HELLO is the only packet sent in the clear)
|
||||
const unsigned int c = cipher();
|
||||
bool trusted = false;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue