multicast tests

4 files changed, 551 insertions, 12 deletions

diff --git a/src/multicast/Makefile.am b/src/multicast/Makefile.am
index cbd4081a5..fd1df191d 100644
--- a/src/multicast/Makefile.am
+++ b/src/multicast/Makefile.am
@@ -64,5 +64,5 @@ test_multicast_SOURCES = \
 test_multicast_LDADD = \
   libgnunetmulticast.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
-  $(top_builddir)/src/util/libgnunetutil.la
-
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/core/libgnunetcore.la
diff --git a/src/multicast/gnunet-service-multicast.c b/src/multicast/gnunet-service-multicast.c
index fbf3c159c..dee573848 100644
--- a/src/multicast/gnunet-service-multicast.c
+++ b/src/multicast/gnunet-service-multicast.c
@@ -878,6 +878,7 @@ client_send_join_decision (struct Member *mem,
   }
   else
   { /* Refused entry, disconnect clients. */
+#if FIXME
     struct ClientList *cl = mem->grp.clients_head;
     while (NULL != cl)
     {
@@ -885,6 +886,7 @@ client_send_join_decision (struct Member *mem,
       cl = cl->next;
       GNUNET_SERVER_client_disconnect (client);
     }
+#endif
   }
 }
 
diff --git a/src/multicast/multicast_api.c b/src/multicast/multicast_api.c
index c8d82e892..ef4cc73e7 100644
--- a/src/multicast/multicast_api.c
+++ b/src/multicast/multicast_api.c
@@ -327,18 +327,29 @@ member_recv_join_decision (void *cls,
   uint16_t relay_count = ntohl (dcsn->relay_count);
   const struct GNUNET_PeerIdentity *relays = NULL;
   uint16_t relay_size = relay_count * sizeof (*relays);
-  if (0 < relay_count && dcsn_size < sizeof (*dcsn) + relay_size)
-    relays = (struct GNUNET_PeerIdentity *) &dcsn[1];
+  if (0 < relay_count)
+  {
+    if (dcsn_size < sizeof (*dcsn) + relay_size)
+    {
+      GNUNET_break_op (0);
+      is_admitted = GNUNET_SYSERR;
+    }
+    else
+    {
+      relays = (struct GNUNET_PeerIdentity *) &dcsn[1];
+    }
+  }
 
   if (sizeof (*dcsn) + relay_size + sizeof (*join_resp) <= dcsn_size)
   {
-    join_resp = (const struct GNUNET_MessageHeader *) &dcsn[1];
+    join_resp = (const struct GNUNET_MessageHeader *) ((char *) &dcsn[1] + relay_size);
     join_resp_size = ntohs (join_resp->size);
   }
   if (dcsn_size < sizeof (*dcsn) + relay_size + join_resp_size)
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Received invalid join decision message from multicast.\n");
+         "Received invalid join decision message from multicast: %u < %u + %u + %u\n",
+         dcsn_size , sizeof (*dcsn), relay_size, join_resp_size);
     GNUNET_break_op (0);
     is_admitted = GNUNET_SYSERR;
   }
diff --git a/src/multicast/test_multicast.c b/src/multicast/test_multicast.c
index 472d8bbf7..528033452 100644
--- a/src/multicast/test_multicast.c
+++ b/src/multicast/test_multicast.c
@@ -31,6 +31,7 @@
 #include "gnunet_common.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_testing_lib.h"
+#include "gnunet_core_service.h"
 #include "gnunet_multicast_service.h"
 
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
@@ -40,13 +41,64 @@
  */
 static int res;
 
-static const struct GNUNET_CONFIGURATION_Handle *cfg;
-
 /**
  * Handle for task for timeout termination.
  */
 static struct GNUNET_SCHEDULER_Task * end_badly_task;
 
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+struct GNUNET_CORE_Handle *core;
+struct GNUNET_PeerIdentity this_peer;
+
+struct GNUNET_MULTICAST_Origin *origin;
+struct GNUNET_MULTICAST_Member *member;
+
+struct GNUNET_CRYPTO_EddsaPrivateKey *group_key;
+struct GNUNET_CRYPTO_EddsaPublicKey group_pub_key;
+
+struct GNUNET_CRYPTO_EcdsaPrivateKey *member_key;
+struct GNUNET_CRYPTO_EcdsaPublicKey member_pub_key;
+
+struct TransmitClosure {
+  struct GNUNET_MULTICAST_OriginTransmitHandle *orig_tmit;
+  struct GNUNET_MULTICAST_MemberTransmitHandle *mem_tmit;
+  char * data[16];
+  uint8_t data_delay[16];
+  uint8_t data_count;
+  uint8_t paused;
+  uint8_t n;
+} tmit_cls;
+
+struct OriginClosure {
+  uint8_t msgs_expected;
+  uint8_t n;
+} origin_cls;
+
+struct MemberClosure {
+  uint8_t msgs_expected;
+  size_t n;
+} member_cls;
+
+struct GNUNET_MessageHeader *join_req, *join_resp;
+
+enum
+{
+  TEST_NONE               = 0,
+  TEST_ORIGIN_START       = 1,
+  TEST_MEMBER_JOIN_REFUSE = 2,
+  TEST_MEMBER_JOIN_ADMIT  = 3,
+  TEST_ORIGIN_TO_ALL      = 4,
+  TEST_ORIGIN_TO_ALL_RECV = 5,
+  TEST_MEMBER_TO_ORIGIN   = 6,
+  TEST_MEMBER_PART        = 7,
+  TEST_ORIGIN_STOP        = 8,
+} test;
+
+
+static void
+member_join (int t);
+
 
 /**
  * Clean up all resources used.
@@ -54,7 +106,21 @@ static struct GNUNET_SCHEDULER_Task * end_badly_task;
 static void
 cleanup ()
 {
-
+  if (NULL != core)
+  {
+    GNUNET_CORE_disconnect (core);
+    core = NULL;
+  }
+  if (NULL != member)
+  {
+    GNUNET_MULTICAST_member_part (member, NULL, NULL);
+    member = NULL;
+  }
+  if (NULL != origin)
+  {
+    GNUNET_MULTICAST_origin_stop (origin, NULL, NULL);
+    origin = NULL;
+  }
 }
 
 
@@ -106,6 +172,467 @@ end ()
 }
 
 
+void
+tmit_resume (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmission resumed.\n");
+  struct TransmitClosure *tmit = cls;
+  if (NULL != tmit->orig_tmit)
+    GNUNET_MULTICAST_origin_to_all_resume (tmit->orig_tmit);
+  else
+    GNUNET_MULTICAST_member_to_origin_resume (tmit->mem_tmit);
+}
+
+
+static int
+tmit_notify (void *cls, size_t *data_size, void *data)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Test #%u: origin_tmit_notify()\n", test);
+  struct TransmitClosure *tmit = cls;
+
+  if (0 == tmit->data_count)
+  {
+    *data_size = 0;
+    return GNUNET_YES;
+  }
+
+  uint16_t size = strlen (tmit->data[tmit->n]);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Transmit notify data: %u bytes available, "
+              "processing fragment %u/%u (size %u).\n",
+              *data_size, tmit->n + 1, tmit->data_count, size);
+  if (*data_size < size)
+  {
+    *data_size = 0;
+    GNUNET_assert (0);
+    return GNUNET_SYSERR;
+  }
+
+  if (GNUNET_YES != tmit->paused && 0 < tmit->data_delay[tmit->n])
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmission paused.\n");
+    tmit->paused = GNUNET_YES;
+    GNUNET_SCHEDULER_add_delayed (
+      GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
+                                     tmit->data_delay[tmit->n]),
+      tmit_resume, tmit);
+    *data_size = 0;
+    return GNUNET_NO;
+  }
+  tmit->paused = GNUNET_NO;
+
+  *data_size = size;
+  memcpy (data, tmit->data[tmit->n], size);
+
+  return ++tmit->n < tmit->data_count ? GNUNET_NO : GNUNET_YES;
+}
+
+
+static void
+origin_recv_replay_msg (void *cls,
+                        const struct GNUNET_CRYPTO_EcdsaPublicKey *member_key,
+                        uint64_t message_id,
+                        uint64_t fragment_offset,
+                        uint64_t flags,
+                        struct GNUNET_MULTICAST_ReplayHandle *rh)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Test #%u: origin_recv_replay_msg()\n", test);
+}
+
+
+static void
+member_recv_replay_msg (void *cls,
+                        const struct GNUNET_CRYPTO_EcdsaPublicKey *member_key,
+                        uint64_t message_id,
+                        uint64_t fragment_offset,
+                        uint64_t flags,
+                        struct GNUNET_MULTICAST_ReplayHandle *rh)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Test #%u: member_recv_replay_msg()\n", test);
+}
+
+
+static void
+origin_recv_replay_frag (void *cls,
+                         const struct GNUNET_CRYPTO_EcdsaPublicKey *member_key,
+                         uint64_t fragment_id,
+                         uint64_t flags,
+                         struct GNUNET_MULTICAST_ReplayHandle *rh)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Test #%u: origin_recv_replay_frag()\n", test);
+}
+
+
+static void
+member_recv_replay_frag (void *cls,
+                         const struct GNUNET_CRYPTO_EcdsaPublicKey *member_key,
+                         uint64_t fragment_id,
+                         uint64_t flags,
+                         struct GNUNET_MULTICAST_ReplayHandle *rh)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Test #%u: member_recv_replay_frag()\n", test);
+}
+
+
+static void
+origin_recv_membership_test (void *cls,
+                             const struct GNUNET_CRYPTO_EcdsaPublicKey *member_key,
+                             uint64_t message_id,
+                             uint64_t group_generation,
+                             struct GNUNET_MULTICAST_MembershipTestHandle *mth)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Test #%u: origin_recv_membership_test()\n", test);
+}
+
+
+static void
+member_recv_membership_test (void *cls,
+                             const struct GNUNET_CRYPTO_EcdsaPublicKey *member_key,
+                             uint64_t message_id,
+                             uint64_t group_generation,
+                             struct GNUNET_MULTICAST_MembershipTestHandle *mth)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Test #%u: member_recv_membership_test()\n", test);
+}
+
+
+static void
+member_recv_join_request (void *cls,
+                          const struct GNUNET_CRYPTO_EcdsaPublicKey *member_key,
+                          const struct GNUNET_MessageHeader *join_msg,
+                          struct GNUNET_MULTICAST_JoinHandle *jh)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Test #%u: member_recv_join_request()\n", test);
+}
+
+
+static void
+origin_stopped (void *cls)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Test #%u: origin_stopped()\n", test);
+  end ();
+}
+
+
+static void
+schedule_origin_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  test = TEST_ORIGIN_STOP;
+  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+              "Test #%u: origin_stop()\n", test);
+  GNUNET_MULTICAST_origin_stop (origin, origin_stopped, NULL);
+  origin = NULL;
+}
+
+
+static void
+member_parted (void *cls)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Test #%u: member_parted()\n", test);
+
+  switch (test)
+  {
+  case TEST_MEMBER_JOIN_REFUSE:
+    member_join (TEST_MEMBER_JOIN_ADMIT);
+    break;
+
+  case TEST_MEMBER_PART:
+    GNUNET_SCHEDULER_add_now (schedule_origin_stop, NULL);
+    break;
+
+  default:
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Invalid test #%d in member_recv_join_decision()\n", test);
+    GNUNET_assert (0);
+  }
+}
+
+
+static void
+member_part ()
+{
+  test = TEST_MEMBER_PART;
+  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+              "Test #%u: member_part()\n", test);
+  GNUNET_MULTICAST_member_part (member, member_parted, NULL);
+  member = NULL;
+}
+
+
+static void
+schedule_member_part (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  GNUNET_MULTICAST_member_part (member, member_parted, NULL);
+}
+
+
+static void
+origin_recv_request (void *cls,
+                     const struct GNUNET_MULTICAST_RequestHeader *req)
+{
+  struct OriginClosure *ocls = cls;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Test #%u: origin_recv_request()\n", test);
+  if (++ocls->n != ocls->msgs_expected)
+    return;
+  
+  GNUNET_assert (0 == memcmp (&req->member_key,
+                              &member_pub_key, sizeof (member_pub_key)));
+
+
+  // FIXME: check message content
+
+  member_part ();
+}
+
+
+static void
+member_to_origin ()
+{
+  test = TEST_MEMBER_TO_ORIGIN;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Test #%u: member_to_origin()\n", test);
+
+  struct TransmitClosure *tmit = &tmit_cls;
+  *tmit = (struct TransmitClosure) {};
+  tmit->data[0] = "abc def";
+  tmit->data[1] = "ghi jkl mno";
+  tmit->data_delay[1] = 1;
+  tmit->data[2] = "pqr stuw xyz";
+  tmit->data_count = 3;
+
+  origin_cls.n = 0;
+  origin_cls.msgs_expected = 1;
+
+  GNUNET_MULTICAST_member_to_origin (member, 1, tmit_notify, tmit);
+}
+
+
+static void
+member_recv_message (void *cls,
+                     const struct GNUNET_MULTICAST_MessageHeader *msg)
+{
+  struct MemberClosure *mcls = cls;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Test #%u: member_recv_message() %u/%u\n",
+              test, mcls->n + 1, mcls->msgs_expected);
+  if (++mcls->n != mcls->msgs_expected)
+    return;
+
+  // FIXME: check message content
+
+  switch (test)
+  {
+  case TEST_ORIGIN_TO_ALL_RECV:
+    member_to_origin ();
+    break;
+
+  default:
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Invalid test #%d in origin_recv_message()\n", test);
+    GNUNET_assert (0);
+  }
+}
+
+
+static void
+origin_recv_message (void *cls,
+                     const struct GNUNET_MULTICAST_MessageHeader *msg)
+{
+  struct OriginClosure *ocls = cls;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Test #%u: origin_recv_message() %u/%u\n",
+              test, ocls->n + 1, ocls->msgs_expected);
+  if (++ocls->n != ocls->msgs_expected)
+    return;
+
+  // FIXME: check message content
+
+  switch (test)
+  {
+  case TEST_ORIGIN_TO_ALL:
+    test = TEST_ORIGIN_TO_ALL_RECV;
+    break;
+
+  default:
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Invalid test #%d in origin_recv_message()\n", test);
+    GNUNET_assert (0);
+  }
+}
+
+
+static void
+origin_to_all ()
+{
+  test = TEST_ORIGIN_TO_ALL;
+  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+              "Test #%u: origin_to_all()\n", test);
+
+  struct TransmitClosure *tmit = &tmit_cls;
+  *tmit = (struct TransmitClosure) {};
+  tmit->data[0] = "ABC DEF";
+  tmit->data[1] = "GHI JKL MNO";
+  tmit->data_delay[1] = 1;
+  tmit->data[2] = "PQR STUW XYZ";
+  tmit->data_count = 3;
+
+  origin_cls.n = member_cls.n = 0;
+  origin_cls.msgs_expected = member_cls.msgs_expected = 1;
+
+  GNUNET_MULTICAST_origin_to_all (origin, 1, 1, tmit_notify, tmit);
+}
+
+
+static void
+member_recv_join_decision (void *cls,
+                           int is_admitted,
+                           const struct GNUNET_PeerIdentity *peer,
+                           uint16_t relay_count,
+                           const struct GNUNET_PeerIdentity *relays,
+                           const struct GNUNET_MessageHeader *join_msg)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Test #%u: member_recv_join_decision() - is_admitted: %d\n",
+              test, is_admitted);
+
+  GNUNET_assert (join_msg->size == join_resp->size);
+  GNUNET_assert (join_msg->type == join_resp->type);
+  GNUNET_assert (0 == memcmp (join_msg, join_resp, ntohs (join_resp->size)));
+
+  switch (test)
+  {
+  case TEST_MEMBER_JOIN_REFUSE:
+    GNUNET_assert (0 == relay_count);
+    GNUNET_SCHEDULER_add_now (schedule_member_part, NULL);
+    break;
+    
+  case TEST_MEMBER_JOIN_ADMIT:
+    GNUNET_assert (1 == relay_count);
+    GNUNET_assert (0 == memcmp (relays, &this_peer, sizeof (this_peer)));
+    origin_to_all ();
+    break;
+
+  default:
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Invalid test #%d in member_recv_join_decision()\n", test);
+    GNUNET_assert (0);
+  }
+}
+
+
+static void
+origin_recv_join_request (void *cls,
+                          const struct GNUNET_CRYPTO_EcdsaPublicKey *mem_key,
+                          const struct GNUNET_MessageHeader *join_msg,
+                          struct GNUNET_MULTICAST_JoinHandle *jh)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Test #%u: origin_recv_join_request()\n", test);
+
+  GNUNET_assert (0 == memcmp (mem_key, &member_pub_key, sizeof (member_pub_key)));
+  GNUNET_assert (join_msg->size == join_req->size);
+  GNUNET_assert (join_msg->type == join_req->type);
+  GNUNET_assert (0 == memcmp (join_msg, join_req, ntohs (join_req->size)));
+
+  char data[] = "here's the decision";
+  uint8_t 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 (456);
+  memcpy (&join_resp[1], data, data_size);
+  
+  switch (test)
+  {
+  case TEST_MEMBER_JOIN_REFUSE:
+    GNUNET_MULTICAST_join_decision (jh, GNUNET_NO, 0, NULL, join_resp);
+    break;
+    
+  case TEST_MEMBER_JOIN_ADMIT:
+    GNUNET_MULTICAST_join_decision (jh, GNUNET_YES, 1, &this_peer, join_resp);
+    break;
+
+  default:
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Invalid test #%d in origin_recv_join_request()\n", test);
+    GNUNET_assert (0);
+    break;
+  }
+}
+
+
+static void
+member_join (int t)
+{
+  test = t;
+  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+              "Test #%u: member_join()\n", test);
+
+  member_key = GNUNET_CRYPTO_ecdsa_key_create ();
+  GNUNET_CRYPTO_ecdsa_key_get_public (member_key, &member_pub_key);
+
+  if (NULL != join_req)
+    GNUNET_free (join_req);
+
+  char data[] = "let me in!";
+  uint8_t data_size = strlen (data) + 1;
+  join_req = GNUNET_malloc (sizeof (join_req) + data_size);
+  join_req->size = htons (sizeof (join_req) + data_size);
+  join_req->type = htons (123);
+  memcpy (&join_req[1], data, data_size);
+
+  member = GNUNET_MULTICAST_member_join (cfg, &group_pub_key, member_key,
+                                         &this_peer, 1, &this_peer, join_req,
+                                         member_recv_join_request,
+                                         member_recv_join_decision,
+                                         member_recv_membership_test,
+                                         member_recv_replay_frag,
+                                         member_recv_replay_msg,
+                                         member_recv_message,
+                                         &member_cls);
+}
+
+
+static void
+origin_start ()
+{
+  test = TEST_ORIGIN_START;
+  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+              "Test #%u: origin_start()\n", test);
+
+  group_key = GNUNET_CRYPTO_eddsa_key_create ();
+  GNUNET_CRYPTO_eddsa_key_get_public (group_key, &group_pub_key);
+
+  origin = GNUNET_MULTICAST_origin_start (cfg, group_key, 0,
+                                          origin_recv_join_request,
+                                          origin_recv_membership_test,
+                                          origin_recv_replay_frag,
+                                          origin_recv_replay_msg,
+                                          origin_recv_request,
+                                          origin_recv_message,
+                                          &origin_cls);
+  member_join (TEST_MEMBER_JOIN_REFUSE);
+}
+
+
+static void
+core_connected (void *cls, const struct GNUNET_PeerIdentity *my_identity)
+{
+  this_peer = *my_identity;
+  origin_start ();
+}
+
+
 /**
  * Main function of the test, run from scheduler.
  *
@@ -126,9 +653,8 @@ run (void *cls,
   cfg = c;
   end_badly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
 
-  /* FIXME: add tests */
-
-  end ();
+  core = GNUNET_CORE_connect (cfg, NULL, &core_connected, NULL, NULL,
+                              NULL, GNUNET_NO, NULL, GNUNET_NO, NULL);
 }