diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-07-21 19:07:50 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-07-21 19:07:50 -0700 |
| commit | faf864b8a27d94e5db62b37eb98757ad621e1711 (patch) | |
| tree | d3ae465ef645310145d63a4841847cf091c5d8a8 /node/IncomingPacket.cpp | |
| parent | 10564d8e14caad915886ede59a54bcfc0c620f0b (diff) | |
| parent | 8a23d764de82b7902d42f05ca1130847bbfe04af (diff) | |
| download | infinitytier-faf864b8a27d94e5db62b37eb98757ad621e1711.tar.gz infinitytier-faf864b8a27d94e5db62b37eb98757ad621e1711.zip | |
Merge branch 'master' into dev
Diffstat (limited to 'node/IncomingPacket.cpp')
| -rw-r--r-- | node/IncomingPacket.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/node/IncomingPacket.cpp b/node/IncomingPacket.cpp index 231f0d06..37af8425 100644 --- a/node/IncomingPacket.cpp +++ b/node/IncomingPacket.cpp @@ -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; |