summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--make-linux.mk4
-rw-r--r--node/IncomingPacket.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/make-linux.mk b/make-linux.mk
index 13b15476..acc22a63 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -98,8 +98,8 @@ endif
ifeq ($(ZT_DEBUG),1)
DEFS+=-DZT_TRACE
- override CFLAGS+=-Wall -g -pthread $(INCLUDES) $(DEFS)
- override CXXFLAGS+=-Wall -g -pthread $(INCLUDES) $(DEFS)
+ override CFLAGS+=-Wall -g -O -pthread $(INCLUDES) $(DEFS)
+ override CXXFLAGS+=-Wall -g -O -pthread $(INCLUDES) $(DEFS)
LDFLAGS=
STRIP?=echo
# The following line enables optimization for the crypto code, since
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;