[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] branch master updated (6d9664370 -> 2d862b436)
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnunet] branch master updated (6d9664370 -> 2d862b436) |
|
Date: |
Thu, 13 Jul 2017 17:12:26 +0200 |
This is an automated email from the git hooks/post-receive script.
xrs pushed a change to branch master
in repository gnunet.
from 6d9664370 -very unimportant typo fixed
new f0bca33f0 multicast: fix bugs
new 94d4a6518 test_multicast_multipeer: fix bug
new d2308f5bd add comment
new 2d862b436 Merge branch 'master' of ssh://gnunet.org/gnunet
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/multicast/gnunet-service-multicast.c | 26 +++---
src/multicast/test_multicast.conf | 1 +
src/multicast/test_multicast_multipeer.c | 153 +++++++++++++++++--------------
3 files changed, 101 insertions(+), 79 deletions(-)
diff --git a/src/multicast/gnunet-service-multicast.c
b/src/multicast/gnunet-service-multicast.c
index 39623e7b1..896f75c56 100644
--- a/src/multicast/gnunet-service-multicast.c
+++ b/src/multicast/gnunet-service-multicast.c
@@ -767,10 +767,11 @@ cadet_send_join_decision_cb (void *cls,
{
chn->join_status = JOIN_REFUSED;
}
-
cadet_send_channel (chn, &hdcsn->header);
- return GNUNET_NO;
+ return GNUNET_YES;
}
+
+ // return GNUNET_YES to continue the multihashmap_get iteration
return GNUNET_YES;
}
@@ -845,13 +846,13 @@ cadet_notify_connect (void *cls,
struct GNUNET_CADET_Channel *channel,
const struct GNUNET_PeerIdentity *source)
{
- struct Channel *chn = GNUNET_malloc (sizeof *chn);
+ struct Channel *chn = GNUNET_malloc (sizeof (struct Channel));
chn->group = cls;
chn->channel = channel;
chn->direction = DIR_INCOMING;
chn->join_status = JOIN_NOT_ASKED;
-
- GNUNET_CONTAINER_multihashmap_put (channels_in, &chn->group_pub_hash, chn,
+
+ GNUNET_CONTAINER_multihashmap_put (channels_in, &chn->group->pub_key_hash,
chn,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
return chn;
}
@@ -1395,7 +1396,7 @@ handle_client_origin_start (void *cls,
orig->cadet_port = GNUNET_CADET_open_port (cadet,
&grp->cadet_port_hash,
cadet_notify_connect,
- NULL,
+ grp,
cadet_notify_window_change,
cadet_notify_disconnect,
cadet_handlers);
@@ -1458,7 +1459,7 @@ handle_client_member_join (void *cls,
GNUNET_CRYPTO_ecdsa_key_get_public (&msg->member_key, &mem_pub_key);
GNUNET_CRYPTO_hash (&mem_pub_key, sizeof (mem_pub_key), &mem_pub_key_hash);
GNUNET_CRYPTO_hash (&msg->group_pub_key, sizeof (msg->group_pub_key),
&pub_key_hash);
-
+
struct GNUNET_CONTAINER_MultiHashMap *
grp_mem = GNUNET_CONTAINER_multihashmap_get (group_members, &pub_key_hash);
struct Member *mem = NULL;
@@ -1468,6 +1469,7 @@ handle_client_member_join (void *cls,
{
mem = GNUNET_CONTAINER_multihashmap_get (grp_mem, &mem_pub_key_hash);
}
+
if (NULL == mem)
{
mem = GNUNET_new (struct Member);
@@ -1483,15 +1485,16 @@ handle_client_member_join (void *cls,
grp->pub_key = msg->group_pub_key;
grp->pub_key_hash = pub_key_hash;
group_set_cadet_port_hash (grp);
-
+
if (NULL == grp_mem)
{
grp_mem = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_YES);
- GNUNET_CONTAINER_multihashmap_put (group_members, &grp->pub_key_hash,
grp_mem,
+ ret = GNUNET_CONTAINER_multihashmap_put (group_members,
&grp->pub_key_hash, grp_mem,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
}
GNUNET_CONTAINER_multihashmap_put (grp_mem, &mem->pub_key_hash, mem,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
+
GNUNET_CONTAINER_multihashmap_put (members, &grp->pub_key_hash, mem,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
}
@@ -1508,7 +1511,7 @@ handle_client_member_join (void *cls,
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Client connected to group %s as member %s (%s).\n",
GNUNET_h2s (&grp->pub_key_hash),
- GNUNET_h2s (&mem->pub_key_hash),
+ GNUNET_h2s2 (&mem->pub_key_hash),
str);
GNUNET_free (str);
@@ -1636,7 +1639,8 @@ handle_client_join_decision (void *cls,
"%p ..and member %s: %p\n",
grp, GNUNET_h2s (&member_key_hash), mem);
}
- if (NULL != mem)
+
+ if (NULL != mem)
{ /* Found local member */
client_send_join_decision (mem, hdcsn);
}
diff --git a/src/multicast/test_multicast.conf
b/src/multicast/test_multicast.conf
index 8e80650db..45bf39618 100644
--- a/src/multicast/test_multicast.conf
+++ b/src/multicast/test_multicast.conf
@@ -6,6 +6,7 @@ OVERLAY_TOPOLOGY = STAR
GLOBAL_POSTFIX=-L ERROR
[hostlist]
+# Do not use a hostlist server
SERVERS =
[multicast]
diff --git a/src/multicast/test_multicast_multipeer.c
b/src/multicast/test_multicast_multipeer.c
index 5c3664f35..29ee1e48f 100644
--- a/src/multicast/test_multicast_multipeer.c
+++ b/src/multicast/test_multicast_multipeer.c
@@ -33,7 +33,7 @@
#include "gnunet_testbed_service.h"
#include "gnunet_multicast_service.h"
-#define NUM_PEERS 2
+#define NUM_PEERS 10
struct multicast_peer
{
@@ -44,6 +44,18 @@ struct multicast_peer
int test_ok;
};
+enum pingpong
+{
+ PING = 1,
+ PONG = 2
+};
+
+struct pingpong_msg
+{
+ int peer;
+ enum pingpong msg;
+};
+
static void service_connect (void *cls,
struct GNUNET_TESTBED_Operation *op,
void *ca_result,
@@ -61,8 +73,9 @@ static struct GNUNET_MULTICAST_Member *member[NUM_PEERS]; /*
first element alway
static struct GNUNET_SCHEDULER_Task *timeout_tid;
-static struct GNUNET_CRYPTO_EddsaPrivateKey *group_key;
-static struct GNUNET_CRYPTO_EddsaPublicKey *group_pub_key;
+static struct GNUNET_CRYPTO_EddsaPrivateKey group_key;
+static struct GNUNET_CRYPTO_EddsaPublicKey group_pub_key;
+static struct GNUNET_HashCode group_pub_key_hash;
static struct GNUNET_CRYPTO_EcdsaPrivateKey *member_key[NUM_PEERS];
static struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key[NUM_PEERS];
@@ -143,12 +156,15 @@ notify (void *cls,
{
struct multicast_peer *mc_peer = (struct multicast_peer*)cls;
- char text[] = "ping";
- *data_size = strlen(text)+1;
- GNUNET_memcpy(data, text, *data_size);
+ struct pingpong_msg *pp_msg = GNUNET_new (struct pingpong_msg);
+ pp_msg->peer = mc_peer->peer;
+ pp_msg->msg = PING;
+
+ *data_size = sizeof (struct pingpong_msg);
+ GNUNET_memcpy(data, pp_msg, *data_size);
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Peer #%u sents message to origin: %s\n", mc_peer->peer, text);
+ "Peer #%u sents ping to origin\n", mc_peer->peer);
return GNUNET_YES;
}
@@ -203,28 +219,19 @@ member_message (void *cls,
const struct GNUNET_MULTICAST_MessageHeader *msg)
{
struct multicast_peer *mc_peer = (struct multicast_peer*)cls;
+ struct pingpong_msg *pp_msg = (struct pingpong_msg*) &(msg[1]);
- if (0 != strncmp ("pong", (char *)&msg[1], 4))
+ if (PONG == pp_msg->msg && mc_peer->peer == pp_msg->peer)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "peer #%i (%s) did not receive pong\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "peer #%i (%s) receives a pong\n",
mc_peer->peer,
GNUNET_i2s (mc_peers[mc_peer->peer]->id));
- result = GNUNET_SYSERR;
- GNUNET_SCHEDULER_shutdown ();
+ mc_peer->test_ok = GNUNET_OK;
}
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "peer #%i (%s) receives: %s\n",
- mc_peer->peer,
- GNUNET_i2s (mc_peers[mc_peer->peer]->id),
- (char *)&msg[1]);
-
- mc_peer->test_ok = GNUNET_OK;
-
- // FIXME: ugly test function
- // (we start with 1 because 0 is origin)
+ // Test for completeness of received PONGs
for (int i=1; i<NUM_PEERS; i++)
if (GNUNET_NO == mc_peers[i]->test_ok)
return;
@@ -298,11 +305,15 @@ origin_notify (void *cls,
size_t *data_size,
void *data)
{
- char text[] = "pong";
- *data_size = strlen(text)+1;
- memcpy(data, text, *data_size);
+ struct pingpong_msg *rcv_pp_msg = (struct pingpong_msg*)cls;
+ struct pingpong_msg *pp_msg = GNUNET_new (struct pingpong_msg);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin sends (to all): %s\n", text);
+ pp_msg->peer = rcv_pp_msg->peer;
+ pp_msg->msg = PONG;
+ *data_size = sizeof (struct pingpong_msg);
+ memcpy(data, pp_msg, *data_size);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin sends pong (to all)\n");
return GNUNET_YES;
}
@@ -312,9 +323,12 @@ static void
origin_request (void *cls,
const struct GNUNET_MULTICAST_RequestHeader *req)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin receives: %s\n", (char
*)&req[1]);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin receives a msg\n");
+
+ req++;
+ struct pingpong_msg *pp_msg = (struct pingpong_msg *) req;
- if (0 != strncmp ("ping", (char *)&req[1], 4)) {
+ if (1 != pp_msg->msg) {
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "origin didn't reveice a correct
request");
}
@@ -322,7 +336,7 @@ origin_request (void *cls,
0,
0,
origin_notify,
- cls);
+ pp_msg);
}
@@ -366,15 +380,17 @@ multicast_ca (void *cls,
struct multicast_peer *mc_peer = (struct multicast_peer*)cls;
struct GNUNET_MessageHeader *join_msg;
char data[64];
-
+
if (0 == mc_peer->peer)
{
- group_pub_key = GNUNET_new (struct GNUNET_CRYPTO_EddsaPublicKey);
- group_key = GNUNET_CRYPTO_eddsa_key_create ();
- GNUNET_CRYPTO_eddsa_key_get_public (group_key, group_pub_key);
+ struct GNUNET_CRYPTO_EddsaPrivateKey *key = GNUNET_CRYPTO_eddsa_key_create
();
+ GNUNET_CRYPTO_eddsa_key_get_public (key, &group_pub_key);
+ GNUNET_CRYPTO_hash (&group_pub_key, sizeof (group_pub_key),
&group_pub_key_hash);
- return GNUNET_MULTICAST_origin_start (cfg,
- group_key,
+ group_key = *key;
+
+ origin = GNUNET_MULTICAST_origin_start (cfg,
+ &group_key,
0,
origin_join_request,
origin_replay_frag,
@@ -382,6 +398,20 @@ multicast_ca (void *cls,
origin_request,
origin_message,
cls);
+
+ if (NULL == origin) {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Peer #%u could not create a multicast group",
+ mc_peer->peer);
+ return NULL;
+ }
+
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Peer #%u connected as origin to group %s\n",
+ mc_peer->peer,
+ GNUNET_h2s (&group_pub_key_hash));
+
+ return origin;
}
else
{
@@ -401,23 +431,25 @@ multicast_ca (void *cls,
GNUNET_memcpy (&join_msg[1], data, data_size);
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Peer #%u (%s) tries to join multicast group\n",
+ "Peer #%u (%s) tries to join multicast group %s\n",
mc_peer->peer,
- GNUNET_i2s (mc_peers[mc_peer->peer]->id));
-
- return GNUNET_MULTICAST_member_join (cfg,
- group_pub_key,
- member_key[mc_peer->peer],
- mc_peers[0]->id,
- 0,
- NULL,
- join_msg, /* join message */
- member_join_request,
- member_join_decision,
- member_replay_frag,
- member_replay_msg,
- member_message,
- cls);
+ GNUNET_i2s (mc_peers[mc_peer->peer]->id),
+ GNUNET_h2s (&group_pub_key_hash));
+
+ member[mc_peer->peer] = GNUNET_MULTICAST_member_join (cfg,
+ &group_pub_key,
+
member_key[mc_peer->peer],
+ mc_peers[0]->id,
+ 0,
+ NULL,
+ join_msg, /* join
message */
+ member_join_request,
+ member_join_decision,
+ member_replay_frag,
+ member_replay_msg,
+ member_message,
+ cls);
+ return member[mc_peer->peer];
}
}
@@ -485,19 +517,9 @@ service_connect (void *cls,
GNUNET_SCHEDULER_shutdown();
}
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Connected to multicast service of peer #%u (%s)\n",
- mc_peer->peer,
- GNUNET_i2s (mc_peers[mc_peer->peer]->id));
-
if (0 == mc_peer->peer)
{
- origin = ca_result;
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Connected to multicast service of origin\n");
-
- // Get GNUnet identity of members
+ // Get GNUnet identity of members
for (int i = 0; i<NUM_PEERS; i++)
{
pi_op[i] = GNUNET_TESTBED_peer_get_information (peers[i],
@@ -506,10 +528,6 @@ service_connect (void *cls,
mc_peers[i]);
}
}
- else
- {
- member[mc_peer->peer] = ca_result;
- }
}
@@ -529,8 +547,7 @@ service_connect (void *cls,
* @param num_peers size of the 'peers' array
* @param links_succeeded number of links between peers that were created
* @param links_failed number of links testbed was unable to establish
- */
-static void
+ */ static void
testbed_master (void *cls,
struct GNUNET_TESTBED_RunHandle *h,
unsigned int num_peers,
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] branch master updated (6d9664370 -> 2d862b436),
gnunet <=