summaryrefslogtreecommitdiff
path: root/node/NodeConfig.cpp
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2013-10-18 14:16:53 -0400
committerAdam Ierymenko <adam.ierymenko@gmail.com>2013-10-18 14:16:53 -0400
commitca93b4a1ac9d07ea150572801fd47f9a0818abff (patch)
tree8ec8916b82baab567a3d9cc66471b866f8ef1809 /node/NodeConfig.cpp
parent03b909603ae6010d7bf059de688c0cfe0f96a0a3 (diff)
downloadinfinitytier-ca93b4a1ac9d07ea150572801fd47f9a0818abff.tar.gz
infinitytier-ca93b4a1ac9d07ea150572801fd47f9a0818abff.zip
Clean up some stuff, including a few spots where exceptions were not being handled correctly.
Diffstat (limited to 'node/NodeConfig.cpp')
-rw-r--r--node/NodeConfig.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/node/NodeConfig.cpp b/node/NodeConfig.cpp
index afdf75d9..0dda8da7 100644
--- a/node/NodeConfig.cpp
+++ b/node/NodeConfig.cpp
@@ -58,8 +58,7 @@
namespace ZeroTier {
-NodeConfig::NodeConfig(const RuntimeEnvironment *renv,const char *authToken,unsigned int controlPort)
- throw(std::runtime_error) :
+NodeConfig::NodeConfig(const RuntimeEnvironment *renv,const char *authToken,unsigned int controlPort) :
_r(renv),
_controlSocket(true,controlPort,false,&_CBcontrolPacketHandler,this)
{
@@ -266,7 +265,6 @@ std::vector<std::string> NodeConfig::execute(const char *command)
}
std::vector< Buffer<ZT_NODECONFIG_MAX_PACKET_SIZE> > NodeConfig::encodeControlMessage(const void *key,unsigned long conversationId,const std::vector<std::string> &payload)
- throw(std::out_of_range)
{
char poly1305tag[ZT_POLY1305_MAC_LEN];
char iv[8];