summaryrefslogtreecommitdiff
path: root/node/IncomingPacket.cpp
diff options
context:
space:
mode:
authorJoseph Henry <josephjah@gmail.com>2016-08-17 17:43:44 -0700
committerJoseph Henry <josephjah@gmail.com>2016-08-17 17:43:44 -0700
commit5d37eabb59f189723199b213172305b5208d48a5 (patch)
tree5fe1613dd035f21e5ca1aee523e46414c922c04c /node/IncomingPacket.cpp
parent169664ffc2c281500a396588df2d5724a79b5723 (diff)
parent4c0a7c0fb2645f172083aaa604c1a02c9a08c9f4 (diff)
downloadinfinitytier-5d37eabb59f189723199b213172305b5208d48a5.tar.gz
infinitytier-5d37eabb59f189723199b213172305b5208d48a5.zip
Merge branch 'edge' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne into edge
Diffstat (limited to 'node/IncomingPacket.cpp')
-rw-r--r--node/IncomingPacket.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/node/IncomingPacket.cpp b/node/IncomingPacket.cpp
index 5c9e80f8..e4f09106 100644
--- a/node/IncomingPacket.cpp
+++ b/node/IncomingPacket.cpp
@@ -804,8 +804,12 @@ bool IncomingPacket::_doNETWORK_CONFIG_REQUEST(const RuntimeEnvironment *RR,cons
outp.armor(peer->key(),true);
RR->node->putPacket(_localAddress,_remoteAddress,outp.data(),outp.size());
}
+ } catch (std::exception &exc) {
+ fprintf(stderr,"WARNING: network config request failed with exception: %s" ZT_EOL_S,exc.what());
+ TRACE("dropped NETWORK_CONFIG_REQUEST from %s(%s): %s",source().toString().c_str(),_remoteAddress.toString().c_str(),exc.what());
} catch ( ... ) {
- TRACE("dropped NETWORK_CONFIG_REQUEST from %s(%s): unexpected exception",source().toString().c_str(),_remoteAddress.toString().c_str());
+ fprintf(stderr,"WARNING: network config request failed with exception: unknown exception" ZT_EOL_S);
+ TRACE("dropped NETWORK_CONFIG_REQUEST from %s(%s): unknown exception",source().toString().c_str(),_remoteAddress.toString().c_str());
}
return true;
}