Merge branch 'master' of gnunet.org:gnunet

13 files changed, 177 insertions, 155 deletions

diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c
index ce2356216..b0016d2a8 100644
--- a/src/cadet/cadet_api.c
+++ b/src/cadet/cadet_api.c
@@ -507,7 +507,9 @@ cadet_mq_error_handler (void *cls,
   }
   else
   {
-    GNUNET_break (0);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "MQ error in communication with CADET: %d\n",
+                error);
     if (NULL != ch->disconnects)
       ch->disconnects (ch->ctx,
                        ch);
diff --git a/src/rps/Makefile.am b/src/rps/Makefile.am
index a356d3dbc..b391eb8ae 100644
--- a/src/rps/Makefile.am
+++ b/src/rps/Makefile.am
@@ -60,7 +60,6 @@ gnunet_service_rps_SOURCES = \
  gnunet-service-rps_sampler.h gnunet-service-rps_sampler.c \
  gnunet-service-rps_custommap.h gnunet-service-rps_custommap.c \
  gnunet-service-rps_view.h gnunet-service-rps_view.c \
- rps-test_util.h rps-test_util.c \
  gnunet-service-rps.c
 
 
diff --git a/src/rps/gnunet-rps-profiler.c b/src/rps/gnunet-rps-profiler.c
index 98fc8dccb..cdf555432 100644
--- a/src/rps/gnunet-rps-profiler.c
+++ b/src/rps/gnunet-rps-profiler.c
@@ -11,7 +11,7 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -2685,6 +2685,7 @@ post_profiler (struct RPSPeer *rps_peer)
                                post_test_shutdown_ready_cb,
                                stat_iterator,
                                (struct STATcls *) stat_cls);
+      GNUNET_assert (NULL != rps_peer->h_stat_get);
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "Requested statistics for %s (peer %" PRIu32 ")\n",
                   stat_type_strings [stat_type],
@@ -2830,7 +2831,8 @@ run (void *cls,
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "This is the profiler\n");
   cur_test_run.name = "test-rps-profiler";
-  if (0 == num_peers) num_peers = 10;
+  if (0 == num_peers)
+    num_peers = 10;
   mal_type = 3;
   cur_test_run.init_peer = profiler_init_peer;
   //cur_test_run.pre_test = mal_pre;
@@ -2956,25 +2958,21 @@ main (int argc, char *argv[])
                                "COUNT",
                                gettext_noop ("number of peers to start"),
                                &num_peers),
-
     GNUNET_GETOPT_option_relative_time ('d',
                                         "duration",
                                         "DURATION",
                                         gettext_noop ("duration of the profiling"),
                                         &duration),
-
     GNUNET_GETOPT_option_relative_time ('t',
                                         "timeout",
                                         "TIMEOUT",
                                         gettext_noop ("timeout for the profiling"),
                                         &timeout),
-
     GNUNET_GETOPT_option_uint ('r',
                                "num-requests",
                                "COUNT",
                                gettext_noop ("number of PeerIDs to request"),
                                &cur_test_run.num_requests),
-
     GNUNET_GETOPT_OPTION_END
   };
 
@@ -2994,22 +2992,24 @@ main (int argc, char *argv[])
   {
     ret_value = 1;
   }
-  if (GNUNET_OK != ret_value)
+  if (0 != ret_value)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 "Test did not run successfully!\n");
   }
-
-  ret_value = cur_test_run.eval_cb();
-  if (NO_COLLECT_VIEW == cur_test_run.have_collect_view)
+  else
   {
-    GNUNET_array_grow (rps_peers->cur_view,
-                       rps_peers->cur_view_count,
-                       0);
+    ret_value = cur_test_run.eval_cb();
+    if (NO_COLLECT_VIEW == cur_test_run.have_collect_view)
+    {
+      GNUNET_array_grow (rps_peers->cur_view,
+                         rps_peers->cur_view_count,
+                         0);
+    }
+    GNUNET_free (rps_peers);
+    GNUNET_free (rps_peer_ids);
+    GNUNET_CONTAINER_multipeermap_destroy (peer_map);
   }
-  GNUNET_free (rps_peers);
-  GNUNET_free (rps_peer_ids);
-  GNUNET_CONTAINER_multipeermap_destroy (peer_map);
   return ret_value;
 }
 
diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c
index 05d5c91c3..098c71f93 100644
--- a/src/rps/gnunet-service-rps.c
+++ b/src/rps/gnunet-service-rps.c
@@ -283,6 +283,20 @@ struct AttackedPeer
 #endif /* ENABLE_MALICIOUS */
 
 /**
+ * @brief This number determines the number of slots for files that represent
+ * histograms
+ */
+#define HISTOGRAM_FILE_SLOTS 32
+
+/**
+ * @brief The size (in bytes) a file needs to store the histogram
+ *
+ * Per slot: 1 newline, up to 4 chars,
+ * Additionally: 1 null termination
+ */
+#define SIZE_DUMP_FILE (HISTOGRAM_FILE_SLOTS * 5) + 1
+
+/**
  * @brief One Sub.
  *
  * Essentially one instance of brahms that only connects to other instances
@@ -357,16 +371,6 @@ struct Sub
   uint32_t num_observed_peers;
 
   /**
-   * @brief File name to log number of pushes per round to
-   */
-  char *file_name_push_recv;
-
-  /**
-   * @brief File name to log number of pushes per round to
-   */
-  char *file_name_pull_delays;
-
-  /**
    * @brief Multipeermap (ab-) used to count unique peer_ids
    */
   struct GNUNET_CONTAINER_MultiPeerMap *observed_unique_peers;
@@ -418,7 +422,16 @@ struct Sub
    *
    * Number at index i represents the number of rounds with i observed pushes.
    */
-  uint32_t push_recv[256];
+  uint32_t push_recv[HISTOGRAM_FILE_SLOTS];
+
+  /**
+   * @brief Histogram of deltas between the expected and actual number of
+   * received pushes.
+   *
+   * As half of the entries are expected to be negative, this is shifted by
+   * #HISTOGRAM_FILE_SLOTS/2.
+   */
+  uint32_t push_delta[HISTOGRAM_FILE_SLOTS];
 
   /**
    * @brief Number of pull replies with this delay measured in rounds.
@@ -426,7 +439,7 @@ struct Sub
    * Number at index i represents the number of pull replies with a delay of i
    * rounds.
    */
-  uint32_t pull_delays[256];
+  uint32_t pull_delays[HISTOGRAM_FILE_SLOTS];
 };
 
 
@@ -2376,6 +2389,12 @@ hist_update (const struct GNUNET_PeerIdentity *ids,
   for (i = 0; i < num_peers; i++)
   {
     int inserted;
+    if (GNUNET_YES != check_peer_known (sub->peer_map, &ids[i]))
+    {
+      LOG (GNUNET_ERROR_TYPE_WARNING,
+           "Peer in history update not known!\n");
+      continue;
+    }
     inserted = insert_in_view (sub, &ids[i]);
     if (GNUNET_OK == inserted)
     {
@@ -2890,10 +2909,6 @@ new_sub (const struct GNUNET_HashCode *hash,
 #ifdef TO_FILE
   sub->file_name_observed_log = store_prefix_file_name (&own_identity,
                                                        "observed");
-  sub->file_name_push_recv = store_prefix_file_name (&own_identity,
-                                                     "push_recv");
-  sub->file_name_pull_delays = store_prefix_file_name (&own_identity,
-                                                       "pull_delays");
   sub->num_observed_peers = 0;
   sub->observed_unique_peers = GNUNET_CONTAINER_multipeermap_create (1,
                                                                     GNUNET_NO);
@@ -2919,6 +2934,50 @@ new_sub (const struct GNUNET_HashCode *hash,
 }
 
 
+#ifdef TO_FILE
+/**
+ * @brief Write all numbers in the given array into the given file
+ *
+ * Single numbers devided by a newline
+ *
+ * @param hist_array[] the array to dump
+ * @param file_name file to dump into
+ */
+static void
+write_histogram_to_file (const uint32_t hist_array[],
+                         const char *file_name)
+{
+  char collect_str[SIZE_DUMP_FILE + 1] = "";
+  char *recv_str_iter;
+  char *file_name_full;
+
+  recv_str_iter = collect_str;
+  file_name_full = store_prefix_file_name (&own_identity,
+                                           file_name);
+  for (uint32_t i = 0; i < HISTOGRAM_FILE_SLOTS; i++)
+  {
+    char collect_str_tmp[8];
+
+    GNUNET_snprintf (collect_str_tmp,
+                     sizeof (collect_str_tmp),
+                     "%" PRIu32 "\n",
+                     hist_array[i]);
+    recv_str_iter = stpncpy (recv_str_iter,
+                             collect_str_tmp,
+                             6);
+  }
+  (void) stpcpy (recv_str_iter,
+                 "\n");
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Writing push stats to disk\n");
+  to_file_w_len (file_name_full,
+                 SIZE_DUMP_FILE,
+                 collect_str);
+  GNUNET_free (file_name_full);
+}
+#endif /* TO_FILE */
+
+
 /**
  * @brief Destroy Sub.
  *
@@ -2927,12 +2986,6 @@ new_sub (const struct GNUNET_HashCode *hash,
 static void
 destroy_sub (struct Sub *sub)
 {
-#ifdef TO_FILE
-#define SIZE_DUMP_FILE 1536 /* 256 * 6 (1 whitespace, 1 comma, up to 4 chars) */
-  char push_recv_str[SIZE_DUMP_FILE + 1] = "";
-  char pull_delays_str[SIZE_DUMP_FILE + 1] = "";
-  char *recv_str_iter;
-#endif /* TO_FILE */
   GNUNET_assert (NULL != sub);
   GNUNET_assert (NULL != sub->do_round_task);
   GNUNET_SCHEDULER_cancel (sub->do_round_task);
@@ -2960,51 +3013,16 @@ destroy_sub (struct Sub *sub)
   sub->file_name_observed_log = NULL;
 
   /* Write push frequencies to disk */
-  recv_str_iter = push_recv_str;
-  for (uint32_t i = 0; i < 256; i++)
-  {
-    char push_recv_str_tmp[8];
+  write_histogram_to_file (sub->push_recv,
+                           "push_recv");
 
-    GNUNET_snprintf (push_recv_str_tmp,
-                     sizeof (push_recv_str_tmp),
-                     "%" PRIu32 "\n",
-                     sub->push_recv[i]);
-    recv_str_iter = stpncpy (recv_str_iter,
-                             push_recv_str_tmp,
-                             6);
-  }
-  (void) stpcpy (recv_str_iter,
-                 "\n");
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Writing push stats to disk\n");
-  to_file_w_len (sub->file_name_push_recv,
-                 SIZE_DUMP_FILE,
-                 push_recv_str);
-  GNUNET_free (sub->file_name_push_recv);
-  sub->file_name_push_recv = NULL;
+  /* Write push deltas to disk */
+  write_histogram_to_file (sub->push_delta,
+                           "push_delta");
 
   /* Write pull delays to disk */
-  recv_str_iter = pull_delays_str;
-  for (uint32_t i = 0; i < 256; i++)
-  {
-    char pull_delays_str_tmp[8];
-
-    GNUNET_snprintf (pull_delays_str_tmp,
-                     sizeof (pull_delays_str_tmp),
-                     "%" PRIu32 "\n",
-                     sub->pull_delays[i]);
-    recv_str_iter = stpncpy (recv_str_iter,
-                             pull_delays_str_tmp,
-                             6);
-  }
-  (void) stpcpy (recv_str_iter,
-                 "\n");
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Writing pull delays to disk\n");
-  to_file_w_len (sub->file_name_pull_delays,
-                 SIZE_DUMP_FILE,
-                 pull_delays_str);
-  GNUNET_free (sub->file_name_pull_delays);
-  sub->file_name_pull_delays = NULL;
+  write_histogram_to_file (sub->pull_delays,
+                           "pull_delays");
 
   GNUNET_CONTAINER_multipeermap_destroy (sub->observed_unique_peers);
   sub->observed_unique_peers = NULL;
@@ -4338,10 +4356,10 @@ do_round (void *cls)
     if (sub == msub)
     {
       GNUNET_STATISTICS_update(stats, "# rounds blocked", 1, GNUNET_NO);
-      if (CustomPeerMap_size (sub->push_map) > alpha * View_size (sub->view) &&
+      if (CustomPeerMap_size (sub->push_map) > alpha * sub->view_size_est_need &&
           !(0 >= CustomPeerMap_size (sub->pull_map)))
         GNUNET_STATISTICS_update(stats, "# rounds blocked - too many pushes", 1, GNUNET_NO);
-      if (CustomPeerMap_size (sub->push_map) > alpha * View_size (sub->view) &&
+      if (CustomPeerMap_size (sub->push_map) > alpha * sub->view_size_est_need &&
           (0 >= CustomPeerMap_size (sub->pull_map)))
         GNUNET_STATISTICS_update(stats, "# rounds blocked - too many pushes, no pull replies", 1, GNUNET_NO);
       if (0 >= CustomPeerMap_size (sub->push_map) &&
@@ -4351,13 +4369,27 @@ do_round (void *cls)
           (0 >= CustomPeerMap_size (sub->pull_map)))
         GNUNET_STATISTICS_update(stats, "# rounds blocked - no pushes, no pull replies", 1, GNUNET_NO);
       if (0 >= CustomPeerMap_size (sub->pull_map) &&
-          CustomPeerMap_size (sub->push_map) > alpha * View_size (sub->view) &&
+          CustomPeerMap_size (sub->push_map) > alpha * sub->view_size_est_need &&
           0 >= CustomPeerMap_size (sub->push_map))
         GNUNET_STATISTICS_update(stats, "# rounds blocked - no pull replies", 1, GNUNET_NO);
     }
   }
   // TODO independent of that also get some peers from CADET_get_peers()?
-  sub->push_recv[CustomPeerMap_size (sub->push_map)]++;
+  if (CustomPeerMap_size (sub->push_map) < HISTOGRAM_FILE_SLOTS)
+  {
+    sub->push_recv[CustomPeerMap_size (sub->push_map)]++;
+  }
+  else
+  {
+    LOG (GNUNET_ERROR_TYPE_WARNING,
+         "Push map size too big for histogram (%u, %u)\n",
+         CustomPeerMap_size (sub->push_map),
+         HISTOGRAM_FILE_SLOTS);
+  }
+  // FIXME check bounds of histogram
+  sub->push_delta[(CustomPeerMap_size (sub->push_map) -
+                   sub->view_size_est_need) +
+                          (HISTOGRAM_FILE_SLOTS/2)]++;
   if (sub == msub)
   {
     GNUNET_STATISTICS_set (stats,
diff --git a/src/rps/gnunet-service-rps_sampler.h b/src/rps/gnunet-service-rps_sampler.h
index 9f60aa7c9..921570f7d 100644
--- a/src/rps/gnunet-service-rps_sampler.h
+++ b/src/rps/gnunet-service-rps_sampler.h
@@ -90,6 +90,12 @@ RPS_sampler_update (struct RPS_Sampler *sampler,
  *
  * Used to get rid of a PeerID.
  *
+ * FIXME: This should also consider currently pending requests
+ *        (Pending requests already collect peerids. As long as not all
+ *        requested IDs have been collected, they are kept.
+ *        Ideally, the @p id should be removed from all pending requests. This
+ *        seems quite complicated.)
+ *
  * @param sampler the sampler to reinitialise a sampler in.
  * @param id the id of the samplers to update.
  */
diff --git a/src/rps/rps-sampler_common.c b/src/rps/rps-sampler_common.c
index e34cdd67b..2b0569c61 100644
--- a/src/rps/rps-sampler_common.c
+++ b/src/rps/rps-sampler_common.c
@@ -215,6 +215,12 @@ RPS_sampler_update (struct RPS_Sampler *sampler,
  *
  * Used to get rid of a PeerID.
  *
+ * FIXME: This should also consider currently pending requests
+ *        (Pending requests already collect peerids. As long as not all
+ *        requested IDs have been collected, they are kept.
+ *        Ideally, the @p id should be removed from all pending requests. This
+ *        seems quite complicated.)
+ *
  * @param sampler the sampler to reinitialise a sampler element in.
  * @param id the id of the sampler elements to update.
  */
diff --git a/src/rps/rps-test_util.c b/src/rps/rps-test_util.c
index 85829f247..077750329 100644
--- a/src/rps/rps-test_util.c
+++ b/src/rps/rps-test_util.c
@@ -11,7 +11,7 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -414,44 +414,6 @@ auth_key_to_string (struct GNUNET_CRYPTO_AuthKey auth_key)
   return name_buf;
 }
 
-
-
-char *
-create_file (const char *name)
-{
-  int size;
-  size_t name_buf_size;
-  char *name_buf;
-  char *prefix;
-  char *file_name;
-
-  prefix = "/tmp/rps/";
-  name_buf_size = (strlen (prefix) + strlen (name) + 2) * sizeof (char);
-  name_buf = GNUNET_malloc (name_buf_size);
-
-  size = GNUNET_snprintf (name_buf, name_buf_size, "%s%s", prefix, name);
-  if (0 > size)
-    LOG (GNUNET_ERROR_TYPE_WARNING, "Failed to create name_buf\n");
-
-  if (GNUNET_YES != GNUNET_DISK_directory_create (prefix))
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         "Could not create directory %s.\n",
-         prefix);
-  }
-
-  if (NULL == strstr (name, "sampler_el"))
-  {/* only append random string to sampler */
-    if (NULL == (file_name = GNUNET_DISK_mktemp (name_buf)))
-      LOG (GNUNET_ERROR_TYPE_WARNING, "Could not create file\n");
-
-    GNUNET_free (name_buf);
-    return file_name;
-  }
-
-  return name_buf;
-}
-
 #endif /* TO_FILE */
 
 
@@ -479,23 +441,23 @@ string_to_auth_key (const char *str)
  * @return #GNUNET_YES on success
  *         #GNUNET_SYSERR on failure
  */
-static int ensure_folder_exist (void)
+static int
+ensure_folder_exist (void)
 {
-  if (GNUNET_NO == GNUNET_DISK_directory_test ("/tmp/rps/", GNUNET_NO))
-  {
-    GNUNET_DISK_directory_create ("/tmp/rps");
-  }
-  if (GNUNET_YES != GNUNET_DISK_directory_test ("/tmp/rps/", GNUNET_NO))
+  if (GNUNET_OK !=
+      GNUNET_DISK_directory_create ("/tmp/rps"))
   {
-    LOG (GNUNET_ERROR_TYPE_ERROR, "Could not create directory `/tmp/rps'\n");
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         "Could not create directory `/tmp/rps'\n");
     return GNUNET_SYSERR;
   }
   return GNUNET_YES;
 }
 
+
 char *
 store_prefix_file_name (const struct GNUNET_PeerIdentity *peer,
-    const char *prefix)
+                        const char *prefix)
 {
   int len_file_name;
   int out_size;
diff --git a/src/rps/rps-test_util.h b/src/rps/rps-test_util.h
index 484d0f7da..ace833034 100644
--- a/src/rps/rps-test_util.h
+++ b/src/rps/rps-test_util.h
@@ -37,8 +37,6 @@ auth_key_to_string (struct GNUNET_CRYPTO_AuthKey auth_key);
 struct GNUNET_CRYPTO_AuthKey
 string_to_auth_key (const char *str);
 
-char *
-create_file (const char *name);
 
 /**
  * @brief Get file handle
@@ -64,9 +62,10 @@ close_all_files ();
  * This function is used to facilitate writing important information to disk
  */
 #ifdef TO_FILE
-#define to_file(file_name, ...) do {GNUNET_assert (NULL != file_name);\
+#define to_file(file_name, ...) do { \
     char tmp_buf[512] = "";\
     int size;\
+    if (NULL == file_name) return; \
     size = GNUNET_snprintf(tmp_buf,sizeof(tmp_buf),__VA_ARGS__);\
     if (0 > size)\
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,\
diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c
index c71eb6edc..71f74594f 100644
--- a/src/set/gnunet-service-set.c
+++ b/src/set/gnunet-service-set.c
@@ -1221,8 +1221,11 @@ _GSS_operation_destroy2 (struct Operation *op)
     GNUNET_CADET_channel_destroy (channel);
   }
   if (NULL != op->listener)
+  {
     incoming_destroy (op);
-  else if (NULL != op->set)
+    return;
+  }
+  if (NULL != op->set)
     op->set->vt->channel_death (op);
   else
     _GSS_operation_destroy (op,
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index d3d2a86a3..c621ea686 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -1341,7 +1341,6 @@ void
 GST_clients_broadcast (const struct GNUNET_MessageHeader *msg,
                        int may_drop)
 {
-  struct TransportClient *tc;
   int done;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -1349,7 +1348,9 @@ GST_clients_broadcast (const struct GNUNET_MessageHeader *msg,
               (unsigned int) ntohs (msg->type),
               (unsigned int) ntohs (msg->size));
   done = GNUNET_NO;
-  for (tc = clients_head; NULL != tc; tc = tc->next)
+  for (struct TransportClient *tc = clients_head;
+       NULL != tc;
+       tc = tc->next)
   {
     if ( (GNUNET_YES == may_drop) &&
          (CT_CORE != tc->type) )
@@ -1382,13 +1383,14 @@ GST_clients_broadcast_peer_notification (const struct GNUNET_PeerIdentity *peer,
 {
   struct GNUNET_MQ_Envelope *env;
   struct PeerIterateResponseMessage *msg;
-  struct TransportClient *tc;
-
+  
   msg = compose_address_iterate_response_message (peer,
                                                   address);
   msg->state = htonl (state);
   msg->state_timeout = GNUNET_TIME_absolute_hton (state_timeout);
-  for (tc = clients_head; NULL != tc; tc = tc->next)
+  for (struct TransportClient *tc = clients_head;
+       NULL != tc;
+       tc = tc->next)
   {
     if (CT_MONITOR != tc->type)
       continue;
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index 72c425591..3472e8ee0 100644
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -713,7 +713,7 @@ set_state_and_timeout (struct NeighbourMapEntry *n,
                        struct GNUNET_TIME_Absolute timeout)
 {
   if (GNUNET_TRANSPORT_is_connected (s) &&
-      ! GNUNET_TRANSPORT_is_connected (n->state) )
+      (! GNUNET_TRANSPORT_is_connected (n->state)) )
   {
     neighbours_connect_notification (n);
     GNUNET_STATISTICS_set (GST_stats,
@@ -721,8 +721,8 @@ set_state_and_timeout (struct NeighbourMapEntry *n,
                            ++neighbours_connected,
                            GNUNET_NO);
   }
-  if (! GNUNET_TRANSPORT_is_connected (s) &&
-        GNUNET_TRANSPORT_is_connected (n->state) )
+  if ((! GNUNET_TRANSPORT_is_connected (s)) &&
+      GNUNET_TRANSPORT_is_connected (n->state) )
   {
     GNUNET_STATISTICS_set (GST_stats,
                            gettext_noop ("# peers connected"),
@@ -948,7 +948,8 @@ free_neighbour (struct NeighbourMapEntry *n)
   }
   GNUNET_assert (GNUNET_YES ==
                  GNUNET_CONTAINER_multipeermap_remove (neighbours,
-                                                       &n->id, n));
+                                                       &n->id,
+                                                       n));
 
   /* Cancel address requests for this peer */
   if (NULL != n->suggest_handle)
diff --git a/src/transport/transport_api_core.c b/src/transport/transport_api_core.c
index 75287b5e7..aa6da0098 100644
--- a/src/transport/transport_api_core.c
+++ b/src/transport/transport_api_core.c
@@ -747,18 +747,18 @@ handle_set_quota (void *cls,
   struct GNUNET_TRANSPORT_CoreHandle *h = cls;
   struct Neighbour *n;
 
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Receiving SET_QUOTA message for `%s' with quota %u\n",
+       GNUNET_i2s (&qm->peer),
+       ntohl (qm->quota.value__));
   n = neighbour_find (h,
                       &qm->peer);
   if (NULL == n)
   {
-    GNUNET_break (0);
+    GNUNET_break (0); /* FIXME: julius reports this assertion fails sometimes? */
     disconnect_and_schedule_reconnect (h);
     return;
   }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Receiving SET_QUOTA message for `%s' with quota %u\n",
-       GNUNET_i2s (&qm->peer),
-       ntohl (qm->quota.value__));
   GNUNET_BANDWIDTH_tracker_update_quota (&n->out_tracker,
                                          qm->quota);
 }
diff --git a/src/util/disk.c b/src/util/disk.c
index de37cba0a..4f78c7747 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -11,7 +11,7 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -625,7 +625,8 @@ GNUNET_DISK_mktemp (const char *t)
  *           does not exist or stat'ed
  */
 int
-GNUNET_DISK_directory_test (const char *fil, int is_readable)
+GNUNET_DISK_directory_test (const char *fil,
+                            int is_readable)
 {
   struct stat filestat;
   int ret;
@@ -639,7 +640,7 @@ GNUNET_DISK_directory_test (const char *fil, int is_readable)
   }
   if (!S_ISDIR (filestat.st_mode))
   {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
+    LOG (GNUNET_ERROR_TYPE_INFO,
          "A file already exits with the same name %s\n", fil);
     return GNUNET_NO;
   }
@@ -720,7 +721,10 @@ GNUNET_DISK_directory_create (const char *dir)
 
   rdir = GNUNET_STRINGS_filename_expand (dir);
   if (rdir == NULL)
+  {
+    GNUNET_break (0);
     return GNUNET_SYSERR;
+  }
 
   len = strlen (rdir);
 #ifndef MINGW
@@ -756,6 +760,9 @@ GNUNET_DISK_directory_create (const char *dir)
       ret = GNUNET_DISK_directory_test (rdir, GNUNET_NO);
       if (GNUNET_NO == ret)
       {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    "Creating directory `%s' failed",
+                    rdir);
         GNUNET_free (rdir);
         return GNUNET_SYSERR;
       }
@@ -780,6 +787,9 @@ GNUNET_DISK_directory_create (const char *dir)
       ret = GNUNET_DISK_directory_test (rdir, GNUNET_NO);
       if (GNUNET_NO == ret)
       {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    "Creating directory `%s' failed",
+                    rdir);
         GNUNET_free (rdir);
         return GNUNET_SYSERR;
       }
@@ -2684,7 +2694,7 @@ purge_cfg_dir (void *cls,
 {
   const char *option = cls;
   char *tmpname;
-  
+
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_filename (cfg,
                                                "PATHS",