Squelches some warnings.

6 files changed, 84 insertions, 9 deletions

diff --git a/client/cmixclient.cpp b/client/cmixclient.cpp
index 17f6e76..3481ddb 100644
--- a/client/cmixclient.cpp
+++ b/client/cmixclient.cpp
@@ -119,8 +119,8 @@ void CMixClient::handle_key_exchange(size_t node_id, cmix_proto::KeyExchange con
 		
 		size_t last_node_id = network_details.node_details.size() - 1;
 		network_connections.at(last_node_id).async_receive(
-			[this, last_node_id](cmix_proto::CMixMessage const& message) {
-				handle_message(last_node_id, message);
+			[this, last_node_id](cmix_proto::CMixMessage const& inner_message) {
+				handle_message(last_node_id, inner_message);
 			}
 		);
 	}
@@ -153,8 +153,23 @@ void CMixClient::handle_message(size_t node_id, cmix_proto::CMixMessage message)
 			handle_payload(message.payload());
 			return;
  		}
-		default: {
+		case cmix_proto::CMixMessage::ContentsCase::CONTENTS_NOT_SET:
+		case cmix_proto::CMixMessage::ContentsCase::kInitialization:
+		case cmix_proto::CMixMessage::ContentsCase::kSecretkey:
+		case cmix_proto::CMixMessage::ContentsCase::kImaclient:
+		case cmix_proto::CMixMessage::ContentsCase::kImanode:
+		case cmix_proto::CMixMessage::ContentsCase::kUsermessage:
+		case cmix_proto::CMixMessage::ContentsCase::kPrepre:
+		case cmix_proto::CMixMessage::ContentsCase::kPremix:
+		case cmix_proto::CMixMessage::ContentsCase::kPrepost:
+		case cmix_proto::CMixMessage::ContentsCase::kRealpre:
+		case cmix_proto::CMixMessage::ContentsCase::kRealmix:
+		case cmix_proto::CMixMessage::ContentsCase::kRealpost:
+		case cmix_proto::CMixMessage::ContentsCase::kCommitments:
+		case cmix_proto::CMixMessage::ContentsCase::kPerformance:
+		{
 			BOOST_LOG_TRIVIAL(error) << "Received unknown message";
+			break;
 		}
 	}
 	
diff --git a/libcmix-network/accept.cpp b/libcmix-network/accept.cpp
index 9806a67..e3c50b0 100644
--- a/libcmix-network/accept.cpp
+++ b/libcmix-network/accept.cpp
@@ -36,7 +36,7 @@ void accept_connection(tcp::acceptor& acceptor, std::shared_ptr<ssl::context> ct
 {
 	if(!bool(ec))
 	{
-		socket->async_handshake(boost::asio::ssl::stream_base::server, [&acceptor, ctx, socket, f](boost::system::error_code const& ec2) {
+		socket->async_handshake(boost::asio::ssl::stream_base::server, [ctx, socket, f](boost::system::error_code const& ec2) {
 			if(!bool(ec2)) {
 				f(std::unique_ptr<ssl::stream<tcp::socket>>(socket), ctx);
 			} else {
diff --git a/node/node.cpp b/node/node.cpp
index b9006e9..5c6025a 100644
--- a/node/node.cpp
+++ b/node/node.cpp
@@ -133,8 +133,25 @@ void Node::handle_message(Purgatory::iterator handle, cmix_proto::CMixMessage me
 			handle_imaclient(handle, message.imaclient());
 			return;
 		}
-		default: {
+		case cmix_proto::CMixMessage::ContentsCase::CONTENTS_NOT_SET:
+		case cmix_proto::CMixMessage::ContentsCase::kInitialization:
+		case cmix_proto::CMixMessage::ContentsCase::kSecretkey:
+		case cmix_proto::CMixMessage::ContentsCase::kKeyexchange:
+		case cmix_proto::CMixMessage::ContentsCase::kNodeready:
+		case cmix_proto::CMixMessage::ContentsCase::kUsermessage:
+		case cmix_proto::CMixMessage::ContentsCase::kPrepre:
+		case cmix_proto::CMixMessage::ContentsCase::kPremix:
+		case cmix_proto::CMixMessage::ContentsCase::kPrepost:
+		case cmix_proto::CMixMessage::ContentsCase::kRealpre:
+		case cmix_proto::CMixMessage::ContentsCase::kRealmix:
+		case cmix_proto::CMixMessage::ContentsCase::kRealpost:
+		case cmix_proto::CMixMessage::ContentsCase::kCommitments:
+		case cmix_proto::CMixMessage::ContentsCase::kPayload:
+		case cmix_proto::CMixMessage::ContentsCase::kBye:
+		case cmix_proto::CMixMessage::ContentsCase::kPerformance:
+		{
 			BOOST_LOG_TRIVIAL(error) << "handle_message: CMixMessage contains unknown contents.";
+			break;
 		}
 	}
 	
diff --git a/node/node_client.cpp b/node/node_client.cpp
index dde0c56..938dcae 100644
--- a/node/node_client.cpp
+++ b/node/node_client.cpp
@@ -49,11 +49,27 @@ void Node::handle_client_message(ClientConnections::key_type handle, cmix_proto:
 			handle_client_usermessage(handle, message.usermessage());
 			break;
 		}
-		default: {
+		case cmix_proto::CMixMessage::ContentsCase::CONTENTS_NOT_SET:
+		case cmix_proto::CMixMessage::ContentsCase::kInitialization:
+		case cmix_proto::CMixMessage::ContentsCase::kSecretkey:
+		case cmix_proto::CMixMessage::ContentsCase::kImaclient:
+		case cmix_proto::CMixMessage::ContentsCase::kImanode:
+		case cmix_proto::CMixMessage::ContentsCase::kNodeready:
+		case cmix_proto::CMixMessage::ContentsCase::kPrepre:
+		case cmix_proto::CMixMessage::ContentsCase::kPremix:
+		case cmix_proto::CMixMessage::ContentsCase::kPrepost:
+		case cmix_proto::CMixMessage::ContentsCase::kRealpre:
+		case cmix_proto::CMixMessage::ContentsCase::kRealmix:
+		case cmix_proto::CMixMessage::ContentsCase::kRealpost:
+		case cmix_proto::CMixMessage::ContentsCase::kCommitments:
+		case cmix_proto::CMixMessage::ContentsCase::kPayload:
+		case cmix_proto::CMixMessage::ContentsCase::kPerformance:
+		{
 			BOOST_LOG_TRIVIAL(error) << "handle_client_message: CMixMessage contains unknown contents.";
+			break;
 		}
 	}
 	clients.at(handle).async_receive([this, handle](cmix_proto::CMixMessage message2){
 		handle_client_message(handle, message2);
 	});
-}
\ No newline at end of file
+}
diff --git a/node/node_node.cpp b/node/node_node.cpp
index f44a895..3501c64 100644
--- a/node/node_node.cpp
+++ b/node/node_node.cpp
@@ -553,8 +553,18 @@ void Node::handle_node_message(cmix_proto::CMixMessage message)
 			handle_node_realpost(message.realpost());
 			break;
 		}
-		default: {
+
+		case cmix_proto::CMixMessage::ContentsCase::CONTENTS_NOT_SET:
+		case cmix_proto::CMixMessage::ContentsCase::kImaclient:
+		case cmix_proto::CMixMessage::ContentsCase::kImanode:
+		case cmix_proto::CMixMessage::ContentsCase::kKeyexchange:
+		case cmix_proto::CMixMessage::ContentsCase::kNodeready:
+		case cmix_proto::CMixMessage::ContentsCase::kUsermessage:
+		case cmix_proto::CMixMessage::ContentsCase::kPayload:
+		case cmix_proto::CMixMessage::ContentsCase::kPerformance:
+		{
 			BOOST_LOG_TRIVIAL(error) << "handle_node_message: CMixMessage contains unknown contents.";
+			break;
 		}
 	}
 	prev_node.async_receive([this](cmix_proto::CMixMessage message2) {
diff --git a/statsd/stats.cpp b/statsd/stats.cpp
index 2202f32..c5f7caf 100644
--- a/statsd/stats.cpp
+++ b/statsd/stats.cpp
@@ -34,9 +34,26 @@ void Stats::handle_message(std::list<Receiver>::iterator it, cmix_proto::CMixMes
 
 			break;
 		}
-		default: {
+		case cmix_proto::CMixMessage::ContentsCase::CONTENTS_NOT_SET:
+		case cmix_proto::CMixMessage::ContentsCase::kInitialization:
+		case cmix_proto::CMixMessage::ContentsCase::kSecretkey:
+		case cmix_proto::CMixMessage::ContentsCase::kImaclient:
+		case cmix_proto::CMixMessage::ContentsCase::kImanode:
+		case cmix_proto::CMixMessage::ContentsCase::kKeyexchange:
+		case cmix_proto::CMixMessage::ContentsCase::kNodeready:
+		case cmix_proto::CMixMessage::ContentsCase::kUsermessage:
+		case cmix_proto::CMixMessage::ContentsCase::kPrepre:
+		case cmix_proto::CMixMessage::ContentsCase::kPremix:
+		case cmix_proto::CMixMessage::ContentsCase::kPrepost:
+		case cmix_proto::CMixMessage::ContentsCase::kRealpre:
+		case cmix_proto::CMixMessage::ContentsCase::kRealmix:
+		case cmix_proto::CMixMessage::ContentsCase::kRealpost:
+		case cmix_proto::CMixMessage::ContentsCase::kCommitments:
+		case cmix_proto::CMixMessage::ContentsCase::kPayload:
+		{
 			BOOST_LOG_TRIVIAL(error) << "handle_message: CMixMessage contains unknown contents.";
 			connections.erase(it);
+			break;
 		}
 	}
 }