diff options
Diffstat (limited to 'node')
| -rw-r--r-- | node/node.cpp | 2 | ||||
| -rw-r--r-- | node/node_client.cpp | 4 | ||||
| -rw-r--r-- | node/node_node.cpp | 30 |
3 files changed, 22 insertions, 14 deletions
diff --git a/node/node.cpp b/node/node.cpp index 2407138..cb25431 100644 --- a/node/node.cpp +++ b/node/node.cpp @@ -51,7 +51,7 @@ void Node::run() { io_service.run(); } -void Node::accept_handler(std::unique_ptr<boost::asio::ssl::stream<boost::asio::ip::tcp::socket>>&& socket, std::shared_ptr<boost::asio::ssl::context> ctx) +void Node::accept_handler(std::unique_ptr<boost::asio::ssl::stream<boost::asio::ip::tcp::socket>>&& socket, std::shared_ptr<boost::asio::ssl::context>) { Purgatory::iterator it = purgatory.emplace(purgatory.end(), std::move(socket)); purgatory.back().on_done( diff --git a/node/node_client.cpp b/node/node_client.cpp index baf4251..dde0c56 100644 --- a/node/node_client.cpp +++ b/node/node_client.cpp @@ -53,7 +53,7 @@ void Node::handle_client_message(ClientConnections::key_type handle, cmix_proto: BOOST_LOG_TRIVIAL(error) << "handle_client_message: CMixMessage contains unknown contents."; } } - clients.at(handle).async_receive([this, handle](cmix_proto::CMixMessage message){ - handle_client_message(handle, message); + 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 db1be1f..05ca490 100644 --- a/node/node_node.cpp +++ b/node/node_node.cpp @@ -177,7 +177,7 @@ void fill_realtime_post_message(CMixContext& ctx, cmix_proto::RealPost& realpost size_t len = get_group_element_array_size(&ctx); std::vector<char*> mv(ctx.nr_participants, nullptr); - for(int i = 0; i < ctx.nr_participants; ++i) { + for(size_t i = 0; i < ctx.nr_participants; ++i) { std::string* m = realpost.add_m_epirs(); m->resize(len); mv[i] = &(*m)[0]; @@ -192,8 +192,8 @@ void fill_realtime_post_message(CMixContext& ctx, cmix_proto::RealPost& realpost m->resize(get_commitment_length(&ctx)); std::vector<const char*> mvs(ctx.nr_participants, nullptr); - for(int i = 0; i < ctx.nr_participants; ++i) { - mvs[i] = realmix.m(i).data(); + for(size_t i = 0; i < ctx.nr_participants; ++i) { + mvs[i] = realmix.m(int(i)).data(); } get_pimrs_commitment( @@ -432,12 +432,12 @@ void Node::handle_node_realpost(cmix_proto::RealPost const& realpost) { fill_realtime_post_message(cmix_ctx, n_realpost, realpost); size_t len = get_group_element_array_size(&cmix_ctx); - std::vector<std::string> messages(cmix_ctx.nr_participants); + std::vector<std::string> message_strings(cmix_ctx.nr_participants); std::vector<const char*> pirs(cmix_ctx.nr_participants, nullptr); std::vector<char*> msgs(cmix_ctx.nr_participants, nullptr); for(size_t i = 0; i < cmix_ctx.nr_participants; ++i) { - messages[i].resize(len); - msgs[i] = &messages[i][0]; + message_strings[i].resize(len); + msgs[i] = &message_strings[i][0]; pirs[i] = n_realpost.m_epirs(i).data(); } @@ -448,23 +448,30 @@ void Node::handle_node_realpost(cmix_proto::RealPost const& realpost) { pirs.data() ); + //for (auto&& mes : msgs) { + // std::cout << std::string(mes+32, 32) << std::endl; + //} + for(auto i = 0u; i < cmix_ctx.nr_participants; i++) { { std::stringstream ss; - for(auto&& c : messages[i]) { - ss << "\\" << std::setw(3) << std::setfill('0') << std::oct << (unsigned int) c; + for(int j = 32; j < 64; j++) { + ss << "\\" << std::setw(3) << std::setfill('0') << std::oct << (((unsigned int) msgs[i][j]) & 0xFF); } BOOST_LOG_TRIVIAL(trace) << ss.str(); } + char* message; + element_to_message(&cmix_ctx, (unsigned char**) &message, msgs[i]); + char* dest; size_t dest_len; char* payload; size_t payload_len; - split_message(&cmix_ctx, &dest, &dest_len, &payload, &payload_len, messages[i].data()); + split_message(&cmix_ctx, &dest, &dest_len, &payload, &payload_len, message); std::string dest_s = std::string(dest, dest_len); @@ -474,6 +481,7 @@ void Node::handle_node_realpost(cmix_proto::RealPost const& realpost) { free(dest); free(payload); + free(message); } if(performance) { @@ -556,7 +564,7 @@ void Node::handle_node_message(cmix_proto::CMixMessage message) BOOST_LOG_TRIVIAL(error) << "handle_node_message: CMixMessage contains unknown contents."; } } - prev_node.async_receive([this](cmix_proto::CMixMessage message) { - handle_node_message(message); + prev_node.async_receive([this](cmix_proto::CMixMessage message2) { + handle_node_message(message2); }); }
\ No newline at end of file |