Merge branch 'master' of ssh://gnunet.org/gnunet

Conflicts:
	src/multicast/test_multicast_2peers.c

3 files changed, 86 insertions, 42 deletions

diff --git a/src/multicast/Makefile.am b/src/multicast/Makefile.am
index 2a00a7a02..8a754d3db 100644
--- a/src/multicast/Makefile.am
+++ b/src/multicast/Makefile.am
@@ -51,9 +51,9 @@ gnunet_service_multicast_LDADD = \
   $(GN_LIBINTL)
 
 check_PROGRAMS = \
-  test_multicast \
-  test_multicast_2peers
-# test_multicast_multipeer
+  test_multicast_multipeer
+#  test_multicast 
+#  test_multicast_2peers
 
 if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@}; export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; unset XDG_DATA_HOME; unset XDG_CONFIG_HOME;
diff --git a/src/multicast/test_multicast_2peers.c b/src/multicast/test_multicast_2peers.c
index 9d1f42063..8ce4d585f 100644
--- a/src/multicast/test_multicast_2peers.c
+++ b/src/multicast/test_multicast_2peers.c
@@ -20,7 +20,7 @@
 
 /**
  * @file multicast/test_multicast_2peers.c
- * @brief Tests for the Multicast API with two peers doing the ping 
+ * @brief Tests for the Multicast API with two peers doing the ping
  *        pong test.
  * @author xrs
  */
@@ -118,16 +118,17 @@ member_join_request (void *cls,
 }
 
 
-int notify (void *cls,
-            size_t *data_size,
-            void *data)
+static int
+notify (void *cls,
+        size_t *data_size,
+        void *data)
 {
 
   char text[] = "ping";
   *data_size = strlen(text)+1;
   GNUNET_memcpy(data, text, *data_size);
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Member sents message to origin: %s\n", text);
 
   return GNUNET_YES;
@@ -142,26 +143,30 @@ member_join_decision (void *cls,
                       const struct GNUNET_PeerIdentity *relays,
                       const struct GNUNET_MessageHeader *join_msg)
 {
-  struct GNUNET_MULTICAST_MemberTransmitHandle *req;
-  
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
-              "Member received a decision from origin: %s\n", (GNUNET_YES == is_admitted)?"accepted":"rejected");
-  
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Member received a decision from origin: %s\n",
+              (GNUNET_YES == is_admitted)
+              ? "accepted"
+              : "rejected");
+
   if (GNUNET_YES == is_admitted)
   {
+    struct GNUNET_MULTICAST_MemberTransmitHandle *req;
+
+    // FIXME: move to MQ-style API!
     req = GNUNET_MULTICAST_member_to_origin (member,
                                              0,
-                                             notify,
+                                             &notify,
                                              NULL);
   }
 }
 
 
 static void
-member_message (void *cls, 
+member_message (void *cls,
                 const struct GNUNET_MULTICAST_MessageHeader *msg)
 {
-  if (0 != strncmp ("pong", (char *)&msg[1], 4)) 
+  if (0 != strncmp ("pong", (char *)&msg[1], 4))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "member did not receive pong\n");
     result = GNUNET_SYSERR;
@@ -187,19 +192,19 @@ origin_join_request (void *cls,
 
   uint8_t data_size = ntohs (join_msg->size);
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "origin got a join request...\n");
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "origin receives: '%s'\n", (char *)&join_msg[1]);
 
-  char data[] = "Come in!";
+  const char data[] = "Come in!";
   data_size = strlen (data) + 1;
   join_resp = GNUNET_malloc (sizeof (join_resp) + data_size);
   join_resp->size = htons (sizeof (join_resp) + data_size);
   join_resp->type = htons (123);
   GNUNET_memcpy (&join_resp[1], data, data_size);
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "origin sends: '%s'\n", data);
 
   GNUNET_MULTICAST_join_decision (jh,
@@ -207,23 +212,23 @@ origin_join_request (void *cls,
                                   0,
                                   NULL,
                                   join_resp);
-
+  GNUNET_free (join_resp);
   result = GNUNET_OK;
 }
 
 
 int
-origin_notify (void *cls, 
-               size_t *data_size, 
+origin_notify (void *cls,
+               size_t *data_size,
                void *data)
 {
   char text[] = "pong";
   *data_size = strlen(text)+1;
-  memcpy(data, text, *data_size); 
+  memcpy(data, text, *data_size);
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin sends (to all): %s\n", text);
 
-  return GNUNET_YES; 
+  return GNUNET_YES;
 }
 
 
@@ -232,8 +237,8 @@ origin_request (void *cls,
                 const struct GNUNET_MULTICAST_RequestHeader *req)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin receives: %s\n", (char *)&req[1]);
-  
-  if (0 != strncmp ("ping", (char *)&req[1], 4)) 
+
+  if (0 != strncmp ("ping", (char *)&req[1], 4))
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "origin didn't reveice a correct request");
 
   GNUNET_MULTICAST_origin_to_all (origin,
@@ -246,7 +251,7 @@ origin_request (void *cls,
 
 static void
 origin_message (void *cls,
-                const struct GNUNET_MULTICAST_MessageHeader *msg) 
+                const struct GNUNET_MULTICAST_MessageHeader *msg)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin message msg\n");
 }
@@ -288,11 +293,12 @@ multicast_ca1 (void *cls,
                const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct GNUNET_MessageHeader *join_msg;
+  void *ret;
 
   // Get members keys
   member_key = GNUNET_CRYPTO_ecdsa_key_create ();
   GNUNET_CRYPTO_ecdsa_key_get_public (member_key, &member_pub_key);
-  
+
   char data[] = "Hi, can I enter?";
   uint8_t data_size = strlen (data) + 1;
   join_msg = GNUNET_malloc (sizeof (join_msg) + data_size);
@@ -303,7 +309,7 @@ multicast_ca1 (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Members tries to join multicast group\n");
 
-  return GNUNET_MULTICAST_member_join (cfg,
+  ret = GNUNET_MULTICAST_member_join (cfg,
                                        &group_pub_key,
                                        member_key,
                                        peer_id[0],
@@ -316,6 +322,8 @@ multicast_ca1 (void *cls,
                                        NULL, /* no test for member_replay_msg */
                                        member_message,
                                        NULL);
+  GNUNET_free (join_msg);
+  return ret;
 }
 
 
@@ -327,7 +335,7 @@ peer_information_cb (void *cls,
 {
   int i = (int) (long) cls;
 
-  if (NULL == pinfo) 
+  if (NULL == pinfo)
   {
     result = GNUNET_SYSERR;
     GNUNET_SCHEDULER_shutdown ();
@@ -341,7 +349,7 @@ peer_information_cb (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Create member peer\n");
 
-  if (0 == i) 
+  if (0 == i)
   {
     /* connect to multicast service of member */
     op1 = GNUNET_TESTBED_service_connect (NULL,                    /* Closure for operation */
diff --git a/src/multicast/test_multicast_multipeer.c b/src/multicast/test_multicast_multipeer.c
index 266c87a16..c2078abf9 100644
--- a/src/multicast/test_multicast_multipeer.c
+++ b/src/multicast/test_multicast_multipeer.c
@@ -38,8 +38,9 @@
 struct multicast_peer
 {
   int peer; /* peer number */
-  struct GNUNET_TESTBED_Operation *op;
-  struct GNUNET_TESTBED_Operation *pi_op;
+  struct GNUNET_TESTBED_Operation *op; /* not yet in use */
+  struct GNUNET_TESTBED_Operation *pi_op; /* not yet in use */
+  uint8_t test_ok;
 };
 
 static void service_connect (void *cls,
@@ -49,12 +50,14 @@ static void service_connect (void *cls,
 
 static struct multicast_peer **mc_peers;
 static struct GNUNET_TESTBED_Peer **peers;
+
+// FIXME: refactor
 static struct GNUNET_TESTBED_Operation *op[NUM_PEERS];
 static struct GNUNET_TESTBED_Operation *pi_op[NUM_PEERS];
 static const struct GNUNET_PeerIdentity *peer_id[NUM_PEERS];
 
 static struct GNUNET_MULTICAST_Origin *origin;
-static struct GNUNET_MULTICAST_Member *member[NUM_PEERS];
+static struct GNUNET_MULTICAST_Member *member[NUM_PEERS]; /* first element always empty */
 
 static struct GNUNET_SCHEDULER_Task *timeout_tid;
 
@@ -70,7 +73,6 @@ static struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key[NUM_PEERS];
  */
 static int result;
 
-
 /**
  * Function run on CTRL-C or shutdown (i.e. success/timeout/etc.).
  * Cleans up.
@@ -132,6 +134,7 @@ member_join_request (void *cls,
 
 }
 
+
 static int 
 notify (void *cls,
         size_t *data_size,
@@ -174,6 +177,7 @@ member_join_decision (void *cls,
   }
 }
 
+
 static void
 member_replay_frag ()
 {
@@ -181,6 +185,7 @@ member_replay_frag ()
               "member replay frag...\n");
 }
 
+
 static void
 member_replay_msg ()
 {
@@ -188,17 +193,42 @@ member_replay_msg ()
               "member replay msg...\n");
 }
 
+
 static void
-member_message ()
+member_message (void *cls, 
+                const struct GNUNET_MULTICAST_MessageHeader *msg)
 {
+  struct multicast_peer *mc_peer = (struct multicast_peer*)cls;
+
+  if (0 != strncmp ("pong", (char *)&msg[1], 4)) 
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+                "peer #%i did not receive pong\n", 
+                mc_peer->peer);
+
+    result = GNUNET_SYSERR;
+    GNUNET_SCHEDULER_shutdown ();
+  }
+
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "member message...\n");
+              "peer #%i receives: %s\n", 
+              mc_peer->peer,
+              (char *)&msg[1]);
+
+  mc_peer->test_ok = GNUNET_OK;
+
+  // FIXME: ugly test function
+  /*
+  for (int i=1; i<NUM_PEERS; i++)
+    if (!mc_peers[i]->test_ok)
+      return;
 
-  // FIXME: not finished here
   result = GNUNET_YES;
-  GNUNET_SCHEDULER_shutdown ();
+  GNUNET_SCHEDULER_shutdown();
+  */
 }
 
+
 static void
 origin_join_request (void *cls,
                  const struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key,
@@ -233,6 +263,7 @@ origin_join_request (void *cls,
   result = GNUNET_OK;
 }
 
+
 static void
 origin_replay_frag (void *cls,
                     const struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key,
@@ -243,6 +274,7 @@ origin_replay_frag (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin replay fraq msg\n");
 }
 
+
 static void
 origin_replay_msg (void *cls,
                    const struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key,
@@ -288,6 +320,7 @@ origin_request (void *cls,
                                   cls);
 }
 
+
 static void
 origin_message (void *cls,
                 const struct GNUNET_MULTICAST_MessageHeader *msg) 
@@ -295,6 +328,7 @@ origin_message (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin message msg\n");
 }
 
+
 static void
 multicast_da (void *cls,
               void *op_result)
@@ -375,6 +409,7 @@ multicast_ca (void *cls,
   }
 }
 
+
 static void
 peer_information_cb (void *cls,
                      struct GNUNET_TESTBED_Operation *operation,
@@ -452,7 +487,7 @@ service_connect (void *cls,
   }
   else 
   {
-    member[mc_peer->peer-1] = ca_result;
+    member[mc_peer->peer] = ca_result;
   }
 }
 
@@ -500,6 +535,7 @@ testbed_master (void *cls,
   {
     mc_peers[i] = GNUNET_new (struct multicast_peer);
     mc_peers[i]->peer = i;
+    mc_peers[i]->test_ok = GNUNET_NO;
   }
 
   op[0] = GNUNET_TESTBED_service_connect (NULL,                    /* Closure for operation */
@@ -517,7 +553,7 @@ testbed_master (void *cls,
   GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL); /* Schedule a new task on shutdown */
 
   /* Schedule the shutdown task with a delay of a few Seconds */
-  timeout_tid = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 60),
+  timeout_tid = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 80),
                                               &timeout_task, NULL);
 }