Made changes so we can have a 1 Node cmix network.

1 files changed, 46 insertions, 6 deletions

diff --git a/node/node.cpp b/node/node.cpp
index 4b4bc2b..b33f8a5 100644
--- a/node/node.cpp
+++ b/node/node.cpp
@@ -1,17 +1,31 @@
 #include "node.hpp"
-#include "connect.hpp"
+
+#include "logging.hpp"
+
+using namespace boost::asio::ip;
 
 Node::Node(ListenSettings const& listen_settings, NodeNetworkSettings network_settings)
 : io_service()
 , server(io_service, listen_settings, [this](boost::asio::ip::tcp::socket&& socket){accept_handler(std::move(socket));})
 , clients()
-, next_node(connect(network_settings.next_host, network_settings.next_port, io_service))
+, network_settings(network_settings)
+, next_node(tcp::socket(io_service))
 , api(get_curve25519_implementation())
 , keypair(api.create_key_pair())
+, network_pub_key()
 {
-	if(network_settings.is_first) {
-		start_initialisation();
-	}
+	auto on_connect = [this, network_settings](){
+		BOOST_LOG_TRIVIAL(trace) << "is first: " << std::boolalpha << network_settings.is_first;
+		if(network_settings.is_first) {
+			start_initialisation();
+		}
+	};
+	
+	next_node.connect(network_settings.next_host, network_settings.next_port, on_connect);
+}
+
+Node::~Node() {
+	api.free_key_pair(keypair);
 }
 
 void Node::accept_handler(boost::asio::ip::tcp::socket&& socket)
@@ -24,6 +38,32 @@ void Node::accept_handler(boost::asio::ip::tcp::socket&& socket)
 			clients.erase(it);
 		}
 	);
+}
+
+void Node::start_initialisation() {
+	initialization init;
+	init.set_public_share(keypair.pub, keypair.pub_len);
+	
+	BOOST_LOG_TRIVIAL(trace) << "length of keypair.pub: " << keypair.pub_len;
+	
+	std::string message;
+	init.SerializeToString(&message);
+	BOOST_LOG_TRIVIAL(trace) << init.DebugString();
+	next_node.send(message);
+	
+	auto f = [this](std::vector<uint8_t> bytes) {
+		network_pub_key = bytes;
+		
+		if(network_settings.is_first) {
+			start_precomputation();
+		}
+	};
+	
+	BOOST_LOG_TRIVIAL(trace) << "number of clients: " << clients.size();
+	for(auto&& client : clients) {
+		client.receive(f);
+	}
+}
 
-	clients.back().receive();
+void Node::start_precomputation() {
 }