additional test

3 files changed, 516 insertions, 4 deletions

diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index de49efc68..fe86040dc 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -40,6 +40,7 @@ gnunet_service_core_LDADD = \
 check_PROGRAMS = \
  test_core_api_start_only \
  test_core_api \
+ test_core_api_preferences \
  test_core_api_reliability \
  test_core_quota_compliance_symmetric \
  test_core_quota_compliance_asymmetric_send_limited \
@@ -64,6 +65,13 @@ test_core_api_reliability_LDADD = \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
+test_core_api_preferences_SOURCES = \
+ test_core_api_preferences.c
+test_core_api_preferences_LDADD = \
+ $(top_builddir)/src/core/libgnunetcore.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
 test_core_api_send_to_self_SOURCES = \
  test_core_api_send_to_self.c
 test_core_api_send_to_self_LDADD = \
@@ -76,7 +84,7 @@ test_core_api_start_only_SOURCES = \
 test_core_api_start_only_LDADD = \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
+
 test_core_quota_compliance_symmetric_SOURCES = \
  test_core_quota_compliance.c
 test_core_quota_compliance_symmetric_LDADD = \
diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index 3f3142689..fce515e0f 100644
--- a/src/core/gnunet-service-core.c
+++ b/src/core/gnunet-service-core.c
@@ -1642,12 +1642,13 @@ handle_client_request_info (void *cls,
           n->current_preference = ULLONG_MAX;
         }
       update_preference_sum (n->current_preference - old_preference);
-#if DEBUG_CORE_QUOTA
+#if DEBUG_CORE_QUOTA 
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Received reservation request for %d bytes for peer `%4s', reserved %d bytes\n",
+                  "Received reservation request for %d bytes for peer `%4s', reserved %d bytes, suggesting delay of %llu ms\n",
                   (int) want_reserv,
                   GNUNET_i2s (&rcm->peer),
-                  (int) got_reserv);
+                  (int) got_reserv,
+                  (unsigned long long) rdelay.rel_value);
 #endif
       cim.reserved_amount = htonl (got_reserv);
       cim.reserve_delay = GNUNET_TIME_relative_hton (rdelay);
diff --git a/src/core/test_core_api_preferences.c b/src/core/test_core_api_preferences.c
new file mode 100644
index 000000000..f4a0713c2
--- /dev/null
+++ b/src/core/test_core_api_preferences.c
@@ -0,0 +1,503 @@
+/*
+     This file is part of GNUnet.
+     (C) 2009, 2010, 2011 Christian Grothoff (and other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+/**
+ * @file core/test_core_api_preferences.c
+ * @brief testcase for core_api.c's GNUNET_CORE_change_preference
+ */
+#include "platform.h"
+#include "gnunet_common.h"
+#include "gnunet_arm_service.h"
+#include "gnunet_core_service.h"
+#include "gnunet_getopt_lib.h"
+#include "gnunet_os_lib.h"
+#include "gnunet_program_lib.h"
+#include "gnunet_scheduler_lib.h"
+#include "gnunet_transport_service.h"
+
+#define VERBOSE GNUNET_NO
+
+#define START_ARM GNUNET_YES
+
+#define MTYPE 12345
+
+struct PeerContext
+{
+  struct GNUNET_CONFIGURATION_Handle *cfg;
+  struct GNUNET_CORE_Handle *ch;
+  struct GNUNET_PeerIdentity id;   
+  struct GNUNET_TRANSPORT_Handle *th;
+  struct GNUNET_MessageHeader *hello;
+  int connect_status;
+#if START_ARM
+  struct GNUNET_OS_Process *arm_proc;
+#endif
+};
+
+static struct PeerContext p1;
+
+static struct PeerContext p2;
+
+static GNUNET_SCHEDULER_TaskIdentifier err_task;
+
+static int ok;
+
+#if VERBOSE
+#define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
+#else
+#define OKPP do { ok++; } while (0)
+#endif
+
+static struct GNUNET_CORE_InformationRequestContext *irc;
+
+static GNUNET_SCHEDULER_TaskIdentifier irc_task;
+
+static GNUNET_SCHEDULER_TaskIdentifier ask_task;
+
+static unsigned int total_reserve = 5;
+
+
+
+static void
+terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+#if VERBOSE
+  fprintf(stderr, "Regular shutdown\n");
+#endif
+  GNUNET_assert (ok == 6);
+  GNUNET_assert (NULL == irc);
+  GNUNET_CORE_disconnect (p1.ch);
+  GNUNET_CORE_disconnect (p2.ch);
+  GNUNET_TRANSPORT_disconnect (p1.th);
+  GNUNET_TRANSPORT_disconnect (p2.th);
+  ok = 0;
+}
+
+
+static void
+terminate_task_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  err_task = GNUNET_SCHEDULER_NO_TASK;
+#if VERBOSE
+  fprintf(stderr, "ENDING ANGRILY %u\n", ok);
+#endif
+  GNUNET_break (0);
+  if (NULL != irc)
+    GNUNET_CORE_peer_change_preference_cancel (irc);
+  if (GNUNET_SCHEDULER_NO_TASK != irc_task)
+    GNUNET_SCHEDULER_cancel (irc_task);
+  if (GNUNET_SCHEDULER_NO_TASK != ask_task)
+    GNUNET_SCHEDULER_cancel (ask_task);
+  GNUNET_CORE_disconnect (p1.ch);
+  GNUNET_CORE_disconnect (p2.ch);
+  GNUNET_TRANSPORT_disconnect (p1.th);
+  GNUNET_TRANSPORT_disconnect (p2.th);
+  ok = 42;
+}
+
+
+static size_t
+transmit_ready (void *cls, size_t size, void *buf)
+{
+  struct PeerContext *p = cls;
+  struct GNUNET_MessageHeader *m;
+
+  GNUNET_assert (ok == 4);
+  OKPP;
+  GNUNET_assert (p == &p1);
+  GNUNET_assert (buf != NULL);
+  m = (struct GNUNET_MessageHeader *) buf;
+  m->type = htons (MTYPE);
+  m->size = htons (sizeof (struct GNUNET_MessageHeader));
+  err_task = 
+    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 120), 
+                                  &terminate_task_error, NULL);
+
+  return sizeof (struct GNUNET_MessageHeader);
+}
+
+static void
+preference_cb (void *cls,
+               const struct
+               GNUNET_PeerIdentity *peer,
+               struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
+               int32_t amount,
+               struct GNUNET_TIME_Relative res_delay,
+               uint64_t preference);
+
+static void
+do_reserve (void *cls,
+            const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  struct PeerContext *pc = cls;
+
+  irc_task = GNUNET_SCHEDULER_NO_TASK;
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Aborted during attempt to request reservation\n");
+      return;
+    }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Requesting reservatin of 32k from core in 1s!\n");
+  irc = GNUNET_CORE_peer_change_preference (p1.ch,
+                                            &p2.id,
+                                            GNUNET_TIME_UNIT_SECONDS,
+                                            GNUNET_BANDWIDTH_VALUE_MAX,
+                                            1000000 /* bandwidth for 1s */,
+                                            0,
+                                            &preference_cb,
+                                            pc);
+}
+
+static void
+preference_cb (void *cls,
+               const struct
+               GNUNET_PeerIdentity *peer,
+               struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
+               int32_t amount,
+               struct GNUNET_TIME_Relative res_delay,
+               uint64_t preference)
+{
+  struct PeerContext *pc = cls;
+
+  irc = NULL;
+  if (0 == amount)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Delaying reservation request by %llu ms!\n",
+                  (unsigned long long) res_delay.rel_value);
+      irc_task = GNUNET_SCHEDULER_add_delayed (res_delay,
+                                               &do_reserve, pc);
+      return;
+    }
+  total_reserve--;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Reservation done!\n");
+  if (total_reserve > 0)
+    {
+      irc_task = GNUNET_SCHEDULER_add_now (&do_reserve, pc);
+      return;
+    }
+  GNUNET_SCHEDULER_cancel (err_task);
+  err_task = GNUNET_SCHEDULER_NO_TASK;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Asking core (1) for transmission to peer `%4s'\n",
+              GNUNET_i2s (&p2.id));
+  if (NULL == GNUNET_CORE_notify_transmit_ready (p1.ch,
+                                                 GNUNET_YES,
+                                                 0,
+                                                 GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 45),
+                                                 &p2.id,
+                                                 sizeof (struct GNUNET_MessageHeader),
+                                                 &transmit_ready, &p1))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "RECEIVED NULL when asking core (1) for transmission to peer `%4s'\n",
+                  GNUNET_i2s (&p2.id));
+    }    
+}
+
+
+static void
+connect_notify (void *cls,
+                const struct GNUNET_PeerIdentity *peer,
+                const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+{
+  struct PeerContext *pc = cls;
+
+  if (0 == memcmp (&pc->id,
+                   peer,
+                   sizeof (struct GNUNET_PeerIdentity)))
+    return;
+  GNUNET_assert (pc->connect_status == 0);
+  pc->connect_status = 1;
+  if (pc == &p1)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Encrypted connection established to peer `%4s'\n",
+                  GNUNET_i2s (peer));
+      GNUNET_SCHEDULER_cancel (ask_task);
+      ask_task = GNUNET_SCHEDULER_NO_TASK;
+      GNUNET_SCHEDULER_cancel (err_task);
+      err_task = 
+        GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 120), 
+                                      &terminate_task_error, NULL);
+      irc_task = GNUNET_SCHEDULER_add_now (&do_reserve, pc);
+    }
+}
+
+
+static void
+disconnect_notify (void *cls,
+                   const struct GNUNET_PeerIdentity *peer)
+{
+  struct PeerContext *pc = cls;
+
+  if (0 == memcmp (&pc->id,
+                   peer,
+                   sizeof (struct GNUNET_PeerIdentity)))
+    return;
+  pc->connect_status = 0;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Encrypted connection to `%4s' cut\n", GNUNET_i2s (peer));
+}
+
+
+static int
+inbound_notify (void *cls,
+                const struct GNUNET_PeerIdentity *other,
+                const struct GNUNET_MessageHeader *message,
+                const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Core provides inbound data from `%4s'.\n", GNUNET_i2s (other));
+  return GNUNET_OK;
+}
+
+
+static int
+outbound_notify (void *cls,
+                 const struct GNUNET_PeerIdentity *other,
+                 const struct GNUNET_MessageHeader *message,
+                 const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Core notifies about outbound data for `%4s'.\n",
+              GNUNET_i2s (other));
+  return GNUNET_OK;
+}
+
+
+
+static int
+process_mtype (void *cls,
+               const struct GNUNET_PeerIdentity *peer,
+               const struct GNUNET_MessageHeader *message,
+               const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Receiving message from `%4s'.\n", GNUNET_i2s (peer));
+  GNUNET_assert (ok == 5);
+  OKPP;
+  GNUNET_SCHEDULER_cancel (err_task);
+  err_task = GNUNET_SCHEDULER_NO_TASK;
+  GNUNET_SCHEDULER_add_now (&terminate_task, NULL);
+  return GNUNET_OK;
+}
+
+
+static struct GNUNET_CORE_MessageHandler handlers[] = {
+  {&process_mtype, MTYPE, sizeof (struct GNUNET_MessageHeader)},
+  {NULL, 0, 0}
+};
+
+
+
+static void 
+ask_connect_task (void *cls,
+                  const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  ask_task =
+    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+                                  &ask_connect_task, NULL);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Asking core (1) AGAIN to connect to peer `%4s'\n",
+              GNUNET_i2s (&p2.id));
+  GNUNET_CORE_peer_request_connect (p1.ch,
+                                    GNUNET_TIME_UNIT_SECONDS,
+                                    &p2.id,
+                                    NULL, NULL);
+}
+
+
+static void
+init_notify (void *cls,
+             struct GNUNET_CORE_Handle *server,
+             const struct GNUNET_PeerIdentity *my_identity,
+             const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+{
+  struct PeerContext *p = cls;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Core connection to `%4s' established\n",
+              GNUNET_i2s (my_identity));
+  GNUNET_assert (server != NULL);
+  p->id = *my_identity;
+  p->ch = server;
+  if (cls == &p1)
+    {
+      GNUNET_assert (ok == 2);
+      OKPP;
+      /* connect p2 */
+      GNUNET_CORE_connect (p2.cfg, 1,
+                           &p2,
+                           &init_notify,                         
+                           &connect_notify,
+                           &disconnect_notify,
+                           NULL,
+                           &inbound_notify,
+                           GNUNET_YES,
+                           &outbound_notify, GNUNET_YES, handlers);
+    }
+  else
+    {
+      GNUNET_assert (ok == 3);
+      OKPP;
+      GNUNET_assert (cls == &p2);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Asking core (1) to connect to peer `%4s'\n",
+                  GNUNET_i2s (&p2.id));
+      err_task = 
+        GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 60), 
+                                      &terminate_task_error, NULL);
+      ask_task =
+        GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+                                      &ask_connect_task, NULL);
+      GNUNET_CORE_peer_request_connect (p1.ch,
+                                        GNUNET_TIME_UNIT_SECONDS,
+                                        &p2.id,
+                                        NULL, NULL);
+    }
+}
+
+
+static void
+process_hello (void *cls,
+               const struct GNUNET_MessageHeader *message)
+{
+  struct PeerContext *p = cls;
+
+  GNUNET_TRANSPORT_get_hello_cancel (p->th, &process_hello, p);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Received (my) `%s' from transport service\n",
+              "HELLO");
+  GNUNET_assert (message != NULL);
+  p->hello = GNUNET_malloc (ntohs (message->size));
+  memcpy (p->hello, message, ntohs (message->size));
+  if ((p == &p1) && (p2.th != NULL))
+    GNUNET_TRANSPORT_offer_hello (p2.th, message, NULL, NULL);
+  if ((p == &p2) && (p1.th != NULL))
+    GNUNET_TRANSPORT_offer_hello (p1.th, message, NULL, NULL);
+
+  if ((p == &p1) && (p2.hello != NULL))
+    GNUNET_TRANSPORT_offer_hello (p1.th, p2.hello, NULL, NULL);
+  if ((p == &p2) && (p1.hello != NULL))
+    GNUNET_TRANSPORT_offer_hello (p2.th, p1.hello, NULL, NULL);
+}
+
+
+
+static void
+setup_peer (struct PeerContext *p, const char *cfgname)
+{
+  p->cfg = GNUNET_CONFIGURATION_create ();
+#if START_ARM
+  p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
+                                        "gnunet-service-arm",
+#if VERBOSE
+                                        "-L", "DEBUG",
+#endif
+                                        "-c", cfgname, NULL);
+#endif
+  GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
+  p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, NULL, NULL);
+  GNUNET_assert (p->th != NULL);
+  GNUNET_TRANSPORT_get_hello (p->th, &process_hello, p);
+}
+
+
+static void
+run (void *cls,
+     char *const *args,
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  GNUNET_assert (ok == 1);
+  OKPP;
+  setup_peer (&p1, "test_core_quota_asymmetric_recv_limited_peer1.conf");
+  setup_peer (&p2, "test_core_quota_asymmetric_recv_limited_peer2.conf");
+  GNUNET_CORE_connect (p1.cfg, 1,
+                       &p1,
+                       &init_notify,
+                       &connect_notify,
+                       &disconnect_notify,
+                       NULL,
+                       &inbound_notify,
+                       GNUNET_YES, &outbound_notify, GNUNET_YES, handlers);
+}
+
+static void
+stop_arm (struct PeerContext *p)
+{
+#if START_ARM
+  if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+  if (GNUNET_OS_process_wait(p->arm_proc) != GNUNET_OK)
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc));
+  GNUNET_OS_process_close (p->arm_proc);
+  p->arm_proc = NULL;
+#endif
+  GNUNET_CONFIGURATION_destroy (p->cfg);
+}
+
+static int
+check ()
+{
+  char *const argv[] = { "test-core-api-preferences",
+    "-c",
+    "test_core_api_data.conf",
+#if VERBOSE
+    "-L", "DEBUG",
+#endif
+    NULL
+  };
+  struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };
+  ok = 1;
+  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
+                      argv, "test-core-api-preferences", "nohelp", options, &run, &ok);
+  stop_arm (&p1);
+  stop_arm (&p2);
+  return ok;
+}
+
+int
+main (int argc, char *argv[])
+{
+  int ret;
+
+  GNUNET_log_setup ("test-core-api",
+#if VERBOSE
+                    "DEBUG",
+#else
+                    "WARNING",
+#endif
+                    NULL);
+  ret = check ();
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-1"); 
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-2");
+
+  return ret;
+}
+
+/* end of test_core_api_preferences.c */