aboutsummaryrefslogtreecommitdiff
path: root/node
diff options
context:
space:
mode:
authorDennis Brentjes <d.brentjes@gmail.com>2017-12-23 17:49:59 +0100
committerDennis Brentjes <d.brentjes@gmail.com>2017-12-23 17:49:59 +0100
commit126021b3766e6fb33333b7939d78dadd1c632eb4 (patch)
tree56ed7de471d2ad9cd85403cffc309379f922dc3f /node
parente1e1e9ac34ab70c3a1f2344361c7e04e5f15c3bd (diff)
downloadcmix-126021b3766e6fb33333b7939d78dadd1c632eb4.tar.gz
cmix-126021b3766e6fb33333b7939d78dadd1c632eb4.tar.bz2
cmix-126021b3766e6fb33333b7939d78dadd1c632eb4.zip
Preparing multiple mixes
Diffstat (limited to 'node')
-rw-r--r--node/node.cpp2
-rw-r--r--node/node_node.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/node/node.cpp b/node/node.cpp
index dd6061a..0249b77 100644
--- a/node/node.cpp
+++ b/node/node.cpp
@@ -31,6 +31,8 @@ Node::Node(ListenSettings const& listen_settings, NodeNetworkSettings network_se
}
initialize_keypair(&cmix_ctx);
+
+ cmix_ctx.nr_mixes = 1;
GOOGLE_PROTOBUF_VERIFY_VERSION;
diff --git a/node/node_node.cpp b/node/node_node.cpp
index 37d878c..0086bf7 100644
--- a/node/node_node.cpp
+++ b/node/node_node.cpp
@@ -179,7 +179,7 @@ void fill_realtime_post_message(CMixContext& ctx, cmix_proto::RealPost& realpost
std::vector<char*> mv(ctx.nr_participants, nullptr);
for(size_t i = 0; i < ctx.nr_participants; ++i) {
std::string* m = realpost.add_m_epirs();
- m->resize(len);
+ m->resize(len * ctx.nr_mixes);
mv[i] = &(*m)[0];
}
@@ -455,7 +455,7 @@ void Node::handle_node_realpost(cmix_proto::RealPost const& realpost) {
for(auto i = 0u; i < cmix_ctx.nr_participants; i++) {
char* message;
- element_to_message(&cmix_ctx, (unsigned char**) &message, msgs[i]);
+ element_to_message(&cmix_ctx, reinterpret_cast<unsigned char**>(&message), msgs[i]);
char* dest;
size_t dest_len;