fixes

diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c
index 65417647b08b5a674dc94862385fdc88a3a118d2..0029e8a628f6a049dfe3b8031c5cdde7ee2585df 100644 (file)
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -39,7 +39,7 @@
 /**
  * Timeout for stopping ARM.  Extra-long since ARM needs to stop everyone else.
  */
-#define STOP_TIMEOUT_ARM GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
+#define STOP_TIMEOUT_ARM GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 3)
 
 /**
  * Timeout for starting services, very short because of the strange way start works

diff --git a/src/nse/gnunet-service-nse.c b/src/nse/gnunet-service-nse.c
index f11c6e5f46eb4ca3aa942d7850318966352891a5..cb0216dc6ff9a56b4b4ee1dff0eadcb4da6c46fe 100644 (file)
--- a/src/nse/gnunet-service-nse.c
+++ b/src/nse/gnunet-service-nse.c
@@ -870,6 +870,7 @@ handle_p2p_size_estimate(void *cls,
              if (peer_entry->transmit_task != GNUNET_SCHEDULER_NO_TASK)
                {
                  GNUNET_SCHEDULER_cancel (peer_entry->transmit_task);
+                 peer_entry->transmit_task = GNUNET_SCHEDULER_NO_TASK;
                  peer_entry->previous_round = GNUNET_NO;
                }
              if (peer_entry->th != NULL)
@@ -1019,7 +1020,7 @@ shutdown_task(void *cls,
  * @param identity the public identity of this peer
  * @param publicKey the public key of this peer
  */
-void
+static void
 core_init (void *cls, struct GNUNET_CORE_Handle *server,
           const struct GNUNET_PeerIdentity *identity,
           const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
@@ -1046,7 +1047,7 @@ core_init (void *cls, struct GNUNET_CORE_Handle *server,
   
   for (i=0;i<HISTORY_SIZE;i++)
     {
-      prev_time.abs_value = next_timestamp.abs_value - (HISTORY_SIZE - i - 1) * GNUNET_NSE_INTERVAL.rel_value;
+      prev_time.abs_value = current_timestamp.abs_value - (HISTORY_SIZE - i - 1) * GNUNET_NSE_INTERVAL.rel_value;
       setup_flood_message (i, prev_time);
     }
   estimate_index = HISTORY_SIZE - 1;

diff --git a/src/nse/test_nse_multipeer.c b/src/nse/test_nse_multipeer.c
index 2f538b62c7932de4ad36146042e9406806f31873..bfd7741b1469ae6cf794ce0cfe3b640ece400525 100644 (file)
--- a/src/nse/test_nse_multipeer.c
+++ b/src/nse/test_nse_multipeer.c
@@ -66,13 +66,15 @@ static struct GNUNET_TESTING_PeerGroup *pg;
 /**
  * Check whether peers successfully shut down.
  */
-void
+static void
 shutdown_callback (void *cls, const char *emsg)
 {
   if (emsg != NULL)
     {
 #if VERBOSE
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown of peers failed!\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Shutdown of peers failed: %s!\n",
+                 emsg);
 #endif
       if (ok == 0)
         ok = 666;
@@ -119,9 +121,17 @@ static void
 handle_estimate (void *cls, double estimate, double std_dev)
 {
   struct NSEPeer *peer = cls;
-  fprintf(stderr, "Received network size estimate from peer %s. Size: %f std.dev. %f\n", GNUNET_i2s(&peer->daemon->id), estimate, std_dev);
+
+  fprintf (stderr,
+          "Received network size estimate from peer %s. logSize: %f std.dev. %f (%f/%u)\n", 
+          GNUNET_i2s(&peer->daemon->id), 
+          estimate, 
+          std_dev,
+          GNUNET_NSE_log_estimate_to_n (estimate),
+          num_peers);
 }
 
+
 static void
 connect_nse_service (void *cls,
                      const struct GNUNET_SCHEDULER_TaskContext *tc)
@@ -135,13 +145,15 @@ connect_nse_service (void *cls,
     {
       current_peer = GNUNET_malloc(sizeof(struct NSEPeer));
       current_peer->daemon = GNUNET_TESTING_daemon_get(pg, i);
-      current_peer->nse_handle = GNUNET_NSE_connect (current_peer->daemon->cfg, &handle_estimate, current_peer);
+      current_peer->nse_handle = GNUNET_NSE_connect (current_peer->daemon->cfg,
+                                                    &handle_estimate, 
+                                                    current_peer);
       GNUNET_assert(current_peer->nse_handle != NULL);
-
       GNUNET_CONTAINER_DLL_insert (peer_head, peer_tail, current_peer);
     }
 }
 
+
 static void
 my_cb (void *cls,
        const char *emsg)
@@ -159,13 +171,15 @@ my_cb (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Peer Group started successfully, connecting to NSE service for each peer!\n");
 #endif
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Have %u connections\n", total_connections);
+  GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 
+             "Have %u connections\n", total_connections);
 
   GNUNET_SCHEDULER_add_now(&connect_nse_service, NULL);
 }
 
+
 /**
- * Prototype of a function that will be called whenever
+ * Function that will be called whenever
  * two daemons are connected by the testing library.
  *
  * @param cls closure
@@ -178,15 +192,16 @@ my_cb (void *cls,
  * @param second_daemon handle for the second daemon
  * @param emsg error message (NULL on success)
  */
-void connect_cb (void *cls,
-                 const struct GNUNET_PeerIdentity *first,
-                 const struct GNUNET_PeerIdentity *second,
-                 uint32_t distance,
-                 const struct GNUNET_CONFIGURATION_Handle *first_cfg,
-                 const struct GNUNET_CONFIGURATION_Handle *second_cfg,
-                 struct GNUNET_TESTING_Daemon *first_daemon,
-                 struct GNUNET_TESTING_Daemon *second_daemon,
-                 const char *emsg)
+static void 
+connect_cb (void *cls,
+           const struct GNUNET_PeerIdentity *first,
+           const struct GNUNET_PeerIdentity *second,
+           uint32_t distance,
+           const struct GNUNET_CONFIGURATION_Handle *first_cfg,
+           const struct GNUNET_CONFIGURATION_Handle *second_cfg,
+           struct GNUNET_TESTING_Daemon *first_daemon,
+           struct GNUNET_TESTING_Daemon *second_daemon,
+           const char *emsg)
 {
   char *second_id;
 
@@ -207,16 +222,22 @@ run (void *cls,
 {
   struct GNUNET_CONFIGURATION_Handle *testing_cfg;
   unsigned long long total_peers;
+
   ok = 1;
   testing_cfg = GNUNET_CONFIGURATION_create();
   GNUNET_assert(GNUNET_OK == GNUNET_CONFIGURATION_load(testing_cfg, cfgfile));
+
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemons.\n");
-  GNUNET_CONFIGURATION_set_value_string (testing_cfg, "testing",
-                                           "use_progressbars",
-                                           "YES");
+  GNUNET_CONFIGURATION_set_value_string (testing_cfg,
+                                        "testing",
+                                        "use_progressbars",
+                                        "YES");
 #endif
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing", "num_peers", &total_peers))
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (testing_cfg, 
+                                                         "testing",
+                                                         "num_peers",
+                                                         &total_peers))
     total_peers = NUM_PEERS;
 
   peers_left = total_peers;
@@ -231,6 +252,7 @@ run (void *cls,
   GNUNET_SCHEDULER_add_delayed (TIMEOUT, &shutdown_task, NULL);
 }
 
+
 static int
 check ()
 {