summaryrefslogtreecommitdiff
path: root/node
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2014-01-27 23:16:15 -0800
committerAdam Ierymenko <adam.ierymenko@gmail.com>2014-01-27 23:16:15 -0800
commitffffc0179f57a2b2de0a4bf09a354f2fa5498be5 (patch)
tree23819bb1cea06bfda29edbbe10f58fd5e24c5995 /node
parentf80ec871f6f4c63a28b9b8192477114b7aac696d (diff)
downloadinfinitytier-ffffc0179f57a2b2de0a4bf09a354f2fa5498be5.tar.gz
infinitytier-ffffc0179f57a2b2de0a4bf09a354f2fa5498be5.zip
Fix a couple compile items.
Diffstat (limited to 'node')
-rw-r--r--node/Network.cpp2
-rw-r--r--node/Network.hpp2
2 files changed, 4 insertions, 0 deletions
diff --git a/node/Network.cpp b/node/Network.cpp
index 8ba597ba..db252f73 100644
--- a/node/Network.cpp
+++ b/node/Network.cpp
@@ -51,6 +51,7 @@ const char *Network::statusString(const Status s)
case NETWORK_OK: return "OK";
case NETWORK_ACCESS_DENIED: return "ACCESS_DENIED";
case NETWORK_NOT_FOUND: return "NOT_FOUND";
+ case NETWORK_INITIALIZATION_FAILED: return "INITIALIZATION_FAILED";
}
return "(invalid)";
}
@@ -266,6 +267,7 @@ void Network::_pushMembershipCertificate(const Address &peer,bool force,uint64_t
}
void Network::threadMain()
+ throw()
{
try {
// Setup thread -- this exits when tap is constructed. It's here
diff --git a/node/Network.hpp b/node/Network.hpp
index af51e368..82ae6c40 100644
--- a/node/Network.hpp
+++ b/node/Network.hpp
@@ -268,6 +268,8 @@ public:
if (_lastConfigUpdate > 0)
return NETWORK_OK;
else return NETWORK_WAITING_FOR_FIRST_AUTOCONF;
+ case NETCONF_FAILURE_INIT_FAILED:
+ return NETWORK_INITIALIZATION_FAILED;
}
} else if (_netconfFailure == NETCONF_FAILURE_INIT_FAILED)
return NETWORK_INITIALIZATION_FAILED;