-revert of address_bw addition

[oweals/gnunet.git] / src / ats / gnunet-service-ats_normalization.c

diff --git a/src/ats/gnunet-service-ats_normalization.c b/src/ats/gnunet-service-ats_normalization.c
index 70558a5a6adf736affe7dc5b239ddecc8a266567..d75ebf42d15e310b278a4f2859b592d21f90b7a2 100644 (file)
--- a/src/ats/gnunet-service-ats_normalization.c
+++ b/src/ats/gnunet-service-ats_normalization.c
@@ -445,7 +445,7 @@ GAS_normalization_normalize_preference (void *src,
   /* Not found: create new preference client */
   if (NULL == c_cur)
   {
-    c_cur = GNUNET_malloc (sizeof (struct PreferenceClient));
+    c_cur = GNUNET_new (struct PreferenceClient);
     c_cur->client = src;
     GNUNET_CONTAINER_DLL_insert(pc_head, pc_tail, c_cur);
     GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Adding new client %p \n", c_cur);
@@ -459,7 +459,7 @@ GAS_normalization_normalize_preference (void *src,
   /* Not found: create new peer entry */
   if (NULL == p_cur)
   {
-    p_cur = GNUNET_malloc (sizeof (struct PreferencePeer));
+    p_cur = GNUNET_new (struct PreferencePeer);
     p_cur->client = c_cur;
     p_cur->id = (*peer);
     for (i = 0; i < GNUNET_ATS_PreferenceCount; i++)
@@ -476,12 +476,13 @@ GAS_normalization_normalize_preference (void *src,
 
   if (NULL == GNUNET_CONTAINER_multipeermap_get (preference_peers, peer))
   {
-    r_cur = GNUNET_malloc (sizeof (struct PeerRelative));
+    r_cur = GNUNET_new (struct PeerRelative);
     r_cur->id = (*peer);
     for (i = 0; i < GNUNET_ATS_PreferenceCount; i++)
       r_cur->f_rel[i] = DEFAULT_REL_PREFERENCE;
-    GNUNET_CONTAINER_multipeermap_put (preference_peers, &r_cur->id, r_cur,
-        GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+    GNUNET_assert (GNUNET_OK ==
+                   GNUNET_CONTAINER_multipeermap_put (preference_peers, &r_cur->id, r_cur,
+                                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
   }
 
   if (GNUNET_SCHEDULER_NO_TASK == aging_task)