do not use NBO internally

9 files changed, 187 insertions, 177 deletions

diff --git a/src/ats/gnunet-ats-solver-eval.c b/src/ats/gnunet-ats-solver-eval.c
index dd1bb9275..d21529f22 100644
--- a/src/ats/gnunet-ats-solver-eval.c
+++ b/src/ats/gnunet-ats-solver-eval.c
@@ -232,8 +232,8 @@ GNUNET_ATS_solver_logging_now (struct LoggingHandle *l)
             log_a->prop_abs[c], log_a->prop_norm[c]);
       }
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\t Active = %i\n", log_a->active);
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\t BW in = %llu\n", ntohl(log_a->assigned_bw_in.value__));
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO, "\t BW out = %llu\n", ntohl(log_a->assigned_bw_out.value__));
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\t BW in = %llu\n", log_a->assigned_bw_in);
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO, "\t BW out = %llu\n", log_a->assigned_bw_out);
 
       GNUNET_CONTAINER_DLL_insert_tail (log_p->addr_head, log_p->addr_tail, log_a);
     }
@@ -430,15 +430,12 @@ GNUNET_ATS_solver_logging_write_to_disk (struct LoggingHandle *l, int add_time_s
           propstring = GNUNET_strdup(propstring_tmp);
           GNUNET_free (propstring_tmp);
         }
-        GNUNET_asprintf(&datastring,"%llu;%llu;%u;%u;%i;%u;%u;%s;%s\n",
-            GNUNET_TIME_absolute_get_difference(l->head->timestamp, lts->timestamp).rel_value_us / 1000,
-            lts->delta,
-            log_p->is_requested,
-            log_a->network,
-            log_a->active,
-            ntohl (log_a->assigned_bw_in.value__),
-            ntohl (log_a->assigned_bw_out.value__),
-            propstring, prefstring);
+        GNUNET_asprintf (&datastring, "%llu;%llu;%u;%u;%i;%u;%u;%s;%s\n",
+            GNUNET_TIME_absolute_get_difference (l->head->timestamp,
+                lts->timestamp).rel_value_us / 1000, lts->delta,
+            log_p->is_requested, log_a->network, log_a->active,
+            log_a->assigned_bw_in, log_a->assigned_bw_out, propstring,
+            prefstring);
 
         GNUNET_DISK_file_write (cur->f_hd, datastring, strlen(datastring));
         GNUNET_free (datastring);
@@ -489,8 +486,8 @@ GNUNET_ATS_solver_logging_eval (struct LoggingHandle *l)
       {
         fprintf (stderr, "\tPeer pid %llu address %llu: %u %u %u\n",
             log_p->id, log_a->aid, log_a->active,
-            ntohl(log_a->assigned_bw_in.value__),
-            ntohl(log_a->assigned_bw_out.value__));
+            log_a->assigned_bw_in,
+            log_a->assigned_bw_out);
 
         for (c = 1; c < GNUNET_ATS_PropertyCount; c++)
         {
@@ -1139,8 +1136,8 @@ GNUNET_ATS_solver_generate_preferences_start (unsigned int peer,
     struct TestAddress * addr = find_active_address(p);
     const double *properties = get_property_cb (NULL, addr->ats_addr);
 
-    pg->last_assigned_bw_in = ntohl(p->assigned_bw_in.value__);
-    pg->last_assigned_bw_out = ntohl(p->assigned_bw_out.value__);
+    pg->last_assigned_bw_in = p->assigned_bw_in;
+    pg->last_assigned_bw_out = p->assigned_bw_out;
     pg->feedback_bw_in_acc = 0;
     pg->feedback_bw_out_acc = 0;
 
@@ -2178,8 +2175,8 @@ create_ats_address (const struct GNUNET_PeerIdentity *peer,
   aa->active = GNUNET_NO;
   aa->used = GNUNET_NO;
   aa->solver_information = NULL;
-  aa->assigned_bw_in = GNUNET_BANDWIDTH_value_init(0);
-  aa->assigned_bw_out = GNUNET_BANDWIDTH_value_init(0);
+  aa->assigned_bw_in = 0;
+  aa->assigned_bw_out = 0;
 
   return aa;
 }
@@ -2197,8 +2194,8 @@ enforce_add_address (struct GNUNET_ATS_TEST_Operation *op)
   {
     p = GNUNET_new (struct TestPeer);
     p->id = op->peer_id;
-    p->assigned_bw_in = GNUNET_BANDWIDTH_value_init(0);
-    p->assigned_bw_out = GNUNET_BANDWIDTH_value_init(0);
+    p->assigned_bw_in = 0;
+    p->assigned_bw_out = 0;
     memset (&p->peer_id, op->peer_id, sizeof (p->peer_id));
     for (c = 0; c < GNUNET_ATS_PreferenceCount; c++)
     {
@@ -2421,8 +2418,8 @@ enforce_start_request (struct GNUNET_ATS_TEST_Operation *op)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Suggested address for peer %u: %llu %llu\n",
         op->peer_id,
-        ntohl(res->assigned_bw_in.value__),
-        ntohl(res->assigned_bw_out.value__));
+        res->assigned_bw_in,
+        res->assigned_bw_out);
     if (NULL != l)
       GNUNET_ATS_solver_logging_now (l);
   }
@@ -2446,8 +2443,8 @@ enforce_stop_request (struct GNUNET_ATS_TEST_Operation *op)
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stop requesting address for peer %u\n",
       op->peer_id);
   p->is_requested = GNUNET_NO;
-  p->assigned_bw_in.value__ = htonl(0);
-  p->assigned_bw_out.value__ = htonl(0);
+  p->assigned_bw_in = 0;
+  p->assigned_bw_out = 0;
   sh->env.sf.s_get_stop (sh->solver, &p->peer_id);
 
   if (NULL != l)
@@ -2952,8 +2949,7 @@ solver_bandwidth_changed_cb (void *cls, struct ATS_Address *address)
   struct TestPeer *p;
   static struct PreferenceGenerator *pg;
   uint32_t delta;
-  if ( (0 == ntohl (address->assigned_bw_out.value__)) &&
-       (0 == ntohl (address->assigned_bw_in.value__)) )
+  if ( (0 == address->assigned_bw_out) && (0 == address->assigned_bw_in) )
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Solver notified to disconnect peer `%s'\n",
@@ -2976,18 +2972,19 @@ solver_bandwidth_changed_cb (void *cls, struct ATS_Address *address)
       delta = duration.rel_value_us * pg->last_assigned_bw_in;
       pg->feedback_bw_in_acc += delta;
 
-      pg->last_assigned_bw_in = ntohl (address->assigned_bw_in.value__);
-      pg->last_assigned_bw_out = ntohl (address->assigned_bw_out.value__);
+      pg->last_assigned_bw_in = address->assigned_bw_in;
+      pg->last_assigned_bw_out = address->assigned_bw_out;
       pg->feedback_last_bw_update = GNUNET_TIME_absolute_get();
     }
   }
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Bandwidth changed addresses %s %p to %u Bps out / %u Bps in\n",
-              GNUNET_i2s (&address->peer),
-              address,
-              (unsigned int) ntohl  (address->assigned_bw_out.value__),
-              (unsigned int) ntohl (address->assigned_bw_in.value__));
+      "Bandwidth changed addresses %s %p to %u Bps out / %u Bps in\n",
+      GNUNET_i2s (&address->peer),
+      address,
+      address->assigned_bw_out,
+          address->assigned_bw_in);
+
   if (NULL != l)
     GNUNET_ATS_solver_logging_now (l);
 
diff --git a/src/ats/gnunet-ats-solver-eval.h b/src/ats/gnunet-ats-solver-eval.h
index 27b9e4f9d..9893dc9f1 100644
--- a/src/ats/gnunet-ats-solver-eval.h
+++ b/src/ats/gnunet-ats-solver-eval.h
@@ -137,8 +137,8 @@ struct LoggingAddress
   int active;
   int used;
   uint32_t network;
-  struct GNUNET_BANDWIDTH_Value32NBO assigned_bw_in;
-  struct GNUNET_BANDWIDTH_Value32NBO assigned_bw_out;
+  uint32_t assigned_bw_in;
+  uint32_t assigned_bw_out;
 
   double prop_abs[GNUNET_ATS_PropertyCount];
   double prop_norm[GNUNET_ATS_PropertyCount];
@@ -158,8 +158,8 @@ struct TestPeer
   double pref_abs[GNUNET_ATS_PreferenceCount];
   double pref_norm[GNUNET_ATS_PreferenceCount];
 
-  struct GNUNET_BANDWIDTH_Value32NBO assigned_bw_in;
-  struct GNUNET_BANDWIDTH_Value32NBO assigned_bw_out;
+  uint32_t assigned_bw_in;
+  uint32_t assigned_bw_out;
 
   struct TestAddress *addr_head;
   struct TestAddress *addr_tail;
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index 718925e68..357358c7c 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -505,6 +505,10 @@ create_address (const struct GNUNET_PeerIdentity *peer,
   aa->plugin = GNUNET_strdup (plugin_name);
   aa->session_id = session_id;
   aa->local_address_info = local_address_info;
+  aa->assigned_bw_out = 0;
+  aa->assigned_bw_in = 0;
+  aa->last_notified_bw_out = 0;
+  aa->last_notified_bw_in = 0;
 
   for (c1 = 0; c1 < GNUNET_ATS_QualityPropertiesCount; c1++)
   {
@@ -830,15 +834,11 @@ GAS_addresses_add (struct GAS_Addresses_Handle *handle,
     handle->env.sf.s_bulk_stop (handle->solver);
 
     /* Notify performance clients about new address */
-    GAS_performance_notify_all_clients (&new_address->peer,
-                                        new_address->plugin,
-                                        new_address->addr,
-                                        new_address->addr_len,
-                                        new_address->active,
-                                        new_address->atsi,
-                                        new_address->atsi_count,
-                                        new_address->assigned_bw_out,
-                                        new_address->assigned_bw_in);
+    GAS_performance_notify_all_clients (&new_address->peer, new_address->plugin,
+        new_address->addr, new_address->addr_len, new_address->active,
+        new_address->atsi, new_address->atsi_count,
+        GNUNET_BANDWIDTH_value_init (new_address->assigned_bw_out),
+        GNUNET_BANDWIDTH_value_init (new_address->assigned_bw_in));
     return;
   }
 
@@ -874,14 +874,11 @@ GAS_addresses_add (struct GAS_Addresses_Handle *handle,
   {
     /* Notify performance clients about properties */
     GAS_performance_notify_all_clients (&existing_address->peer,
-                                        existing_address->plugin,
-                                        existing_address->addr,
-                                        existing_address->addr_len,
-                                        existing_address->active,
-                                        existing_address->atsi,
-                                        existing_address->atsi_count,
-                                        existing_address->assigned_bw_out,
-                                        existing_address->assigned_bw_in);
+        existing_address->plugin, existing_address->addr,
+        existing_address->addr_len, existing_address->active,
+        existing_address->atsi, existing_address->atsi_count,
+        GNUNET_BANDWIDTH_value_init (existing_address->assigned_bw_out),
+        GNUNET_BANDWIDTH_value_init (existing_address->assigned_bw_in));
 
     for (c1 = 0; c1 < atsi_delta_count; c1++)
     {
@@ -1010,15 +1007,11 @@ GAS_addresses_update (struct GAS_Addresses_Handle *handle,
     }
 
     /* Notify performance clients about updated address */
-    GAS_performance_notify_all_clients (&aa->peer,
-                                        aa->plugin,
-                                        aa->addr,
-                                        aa->addr_len,
-                                        aa->active,
-                                        aa->atsi,
-                                        aa->atsi_count,
-                                        aa->assigned_bw_out,
-                                        aa->assigned_bw_in);
+    GAS_performance_notify_all_clients (&aa->peer, aa->plugin, aa->addr,
+        aa->addr_len, aa->active, aa->atsi, aa->atsi_count,
+        GNUNET_BANDWIDTH_value_init (aa->assigned_bw_out),
+        GNUNET_BANDWIDTH_value_init (aa->assigned_bw_in));
+
     handle->env.sf.s_bulk_start (handle->solver);
     GAS_normalization_normalize_property (handle->addresses,
                                           aa,
@@ -1405,9 +1398,9 @@ GAS_addresses_request_address (struct GAS_Addresses_Handle *handle,
       aa, GNUNET_i2s (peer));
 
   GAS_scheduling_transmit_address_suggestion (peer, aa->plugin, aa->addr,
-      aa->addr_len, aa->local_address_info, aa->session_id,
-      aa->atsi, aa->atsi_count,
-      aa->assigned_bw_out, aa->assigned_bw_in);
+      aa->addr_len, aa->local_address_info, aa->session_id, aa->atsi,
+      aa->atsi_count, GNUNET_BANDWIDTH_value_init (aa->assigned_bw_out),
+      GNUNET_BANDWIDTH_value_init (aa->assigned_bw_in));
 
   aa->block_interval = GNUNET_TIME_relative_add (aa->block_interval,
       ATS_BLOCKING_DELTA);
@@ -1865,8 +1858,7 @@ load_quotas (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param address the address with changes
  */
 static void
-bandwidth_changed_cb (void *cls,
-                      struct ATS_Address *address)
+bandwidth_changed_cb (void *cls, struct ATS_Address *address)
 {
   struct GAS_Addresses_Handle *handle = cls;
   struct GAS_Addresses_Suggestion_Requests *cur;
@@ -1878,15 +1870,12 @@ bandwidth_changed_cb (void *cls,
               GNUNET_i2s (&address->peer));
 
   /* Notify performance clients about changes to address */
-  GAS_performance_notify_all_clients (&address->peer,
-                                      address->plugin,
-                                      address->addr,
-                                      address->addr_len,
-                                      address->active,
-                                      address->atsi,
-                                      address->atsi_count,
-                                      address->assigned_bw_out,
-                                      address->assigned_bw_in);
+  GAS_performance_notify_all_clients (&address->peer, address->plugin,
+      address->addr, address->addr_len, address->active, address->atsi,
+      address->atsi_count,
+      GNUNET_BANDWIDTH_value_init (address->assigned_bw_out),
+      GNUNET_BANDWIDTH_value_init (address->assigned_bw_in));
+
   cur = handle->pending_requests_head;
   while (NULL != cur)
   {
@@ -1902,27 +1891,42 @@ bandwidth_changed_cb (void *cls,
     return;
   }
 
-  if ((0 == ntohl (address->assigned_bw_in.value__))
-      && (0 == ntohl (address->assigned_bw_out.value__)))
+  if ((0 == address->assigned_bw_in) && (0 == address->assigned_bw_out))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                "Telling transport to disconnect peer `%s'\n",
                 GNUNET_i2s (&address->peer));
+
+    /* *Notify scheduling clients about suggestion */
+    GAS_scheduling_transmit_address_suggestion (&address->peer, address->plugin,
+        address->addr, address->addr_len, address->local_address_info,
+        address->session_id, address->atsi, address->atsi_count,
+        GNUNET_BANDWIDTH_value_init (0),
+        GNUNET_BANDWIDTH_value_init (0));
+
+    return;
+
   }
-  else
-  {
-    GNUNET_log(GNUNET_ERROR_TYPE_INFO,
-               "Sending bandwidth update for peer `%s': %u %u\n",
-               GNUNET_i2s (&address->peer),
-               (unsigned int) ntohl (address->assigned_bw_out.value__),
-               (unsigned int) ntohl (address->assigned_bw_out.value__));
-  }
+
+  /* Do bandwidth stability check */
+  int diff = abs (address->assigned_bw_out - address->last_notified_bw_out);
+
+
+
+  GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+      "Sending bandwidth update for peer `%s': %u %u\n",
+      GNUNET_i2s (&address->peer), address->assigned_bw_out,
+      address->assigned_bw_out);
 
   /* *Notify scheduling clients about suggestion */
   GAS_scheduling_transmit_address_suggestion (&address->peer, address->plugin,
       address->addr, address->addr_len, address->local_address_info,
-      address->session_id, address->atsi,
-      address->atsi_count, address->assigned_bw_out, address->assigned_bw_in);
+      address->session_id, address->atsi, address->atsi_count,
+      GNUNET_BANDWIDTH_value_init (address->assigned_bw_out),
+      GNUNET_BANDWIDTH_value_init (address->assigned_bw_in));
+
+  address->last_notified_bw_out = address->assigned_bw_out;
+  address->last_notified_bw_in = address->assigned_bw_in;
 }
 
 
@@ -2260,7 +2264,8 @@ peerinfo_it (void *cls,
   {
     pi_ctx->it (pi_ctx->it_cls, &addr->peer, addr->plugin, addr->addr,
         addr->addr_len, addr->active, addr->atsi, addr->atsi_count,
-        addr->assigned_bw_out, addr->assigned_bw_in);
+        GNUNET_BANDWIDTH_value_init (addr->assigned_bw_out),
+        GNUNET_BANDWIDTH_value_init (addr->assigned_bw_in));
   }
   return GNUNET_YES;
 }
diff --git a/src/ats/gnunet-service-ats_addresses.h b/src/ats/gnunet-service-ats_addresses.h
index d6e8b0e10..a1f9e69d5 100644
--- a/src/ats/gnunet-service-ats_addresses.h
+++ b/src/ats/gnunet-service-ats_addresses.h
@@ -309,24 +309,24 @@ struct ATS_Address
   struct GNUNET_PeerIdentity peer;
 
   /**
-   * Session ID, can be 0
+   * Address
    */
-  uint32_t session_id;
+  const void *addr;
 
   /**
-   * FIXME
+   * Address length
    */
-  uint32_t local_address_info;
+  size_t addr_len;
 
   /**
-   * Address
+   * Session ID, can be 0
    */
-  const void *addr;
+  uint32_t session_id;
 
   /**
-   * Address length
+   * Field to store local flags
    */
-  size_t addr_len;
+  uint32_t local_address_info;
 
   /**
    * Plugin name
@@ -349,14 +349,25 @@ struct ATS_Address
   uint32_t atsi_count;
 
   /**
+   * Inbound bandwidth assigned by solver
+   */
+  uint32_t assigned_bw_in;
+
+  /**
+   * Outbound bandwidth assigned by solver
+   */
+  uint32_t assigned_bw_out;
+
+  /**
    * Inbound bandwidth assigned by solver in NBO
    */
-  struct GNUNET_BANDWIDTH_Value32NBO assigned_bw_in;
+  uint32_t last_notified_bw_in;
 
   /**
    * Outbound bandwidth assigned by solver in NBO
    */
-  struct GNUNET_BANDWIDTH_Value32NBO assigned_bw_out;
+  uint32_t last_notified_bw_out;
+
 
   /**
    * Blocking interval
diff --git a/src/ats/perf_ats_solver.c b/src/ats/perf_ats_solver.c
index 4e1e68c23..6fbf547ac 100644
--- a/src/ats/perf_ats_solver.c
+++ b/src/ats/perf_ats_solver.c
@@ -393,16 +393,15 @@ static void
 bandwidth_changed_cb (void *cls,
                       struct ATS_Address *address)
 {
-  if ( (0 == ntohl (address->assigned_bw_out.value__)) &&
-       (0 == ntohl (address->assigned_bw_in.value__)) )
+  if ( (0 == address->assigned_bw_out) && (0 == address->assigned_bw_in) )
     return;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Bandwidth changed addresses %s %p to %u Bps out / %u Bps in\n",
               GNUNET_i2s (&address->peer),
               address,
-              (unsigned int) ntohl (address->assigned_bw_out.value__),
-              (unsigned int) ntohl (address->assigned_bw_in.value__));
+              address->assigned_bw_out,
+              address->assigned_bw_in);
   if (GNUNET_YES == ph.bulk_running)
     GNUNET_break (0);
   return;
diff --git a/src/ats/plugin_ats_mlp.c b/src/ats/plugin_ats_mlp.c
index b911435df..4491de078 100644
--- a/src/ats/plugin_ats_mlp.c
+++ b/src/ats/plugin_ats_mlp.c
@@ -394,9 +394,11 @@ struct GAS_MLP_Handle
 struct MLP_information
 {
 
-  /* Bandwidth assigned */
-  struct GNUNET_BANDWIDTH_Value32NBO b_out;
-  struct GNUNET_BANDWIDTH_Value32NBO b_in;
+  /* Bandwidth assigned outbound */
+  uint32_t b_out;
+
+  /* Bandwidth assigned inbound */
+  uint32_t b_in;
 
   /* Address selected */
   int n;
@@ -1465,10 +1467,10 @@ mlp_propagate_results (void *cls,
       LOG (GNUNET_ERROR_TYPE_DEBUG, "%s %.2f : enabling address\n",
           (1 == mlp_use) ? "[x]": "[ ]", mlp_bw_out);
       address->active = GNUNET_YES;
-      address->assigned_bw_in.value__ = htonl (mlp_bw_in);
-      mlpi->b_in.value__ = htonl(mlp_bw_in);
-      address->assigned_bw_out.value__ = htonl (mlp_bw_out);
-      mlpi->b_out.value__ = htonl(mlp_bw_out);
+      address->assigned_bw_in = mlp_bw_in;
+      mlpi->b_in = mlp_bw_in;
+      address->assigned_bw_out = mlp_bw_out;
+      mlpi->b_out = mlp_bw_out;
       if ((NULL == mlp->exclude_peer) || (0 != memcmp (&address->peer, mlp->exclude_peer, sizeof (address->peer))))
         mlp->bw_changed_cb (mlp->bw_changed_cb_cls, address);
       return GNUNET_OK;
@@ -1476,15 +1478,15 @@ mlp_propagate_results (void *cls,
     else if (GNUNET_YES == address->active)
     {
       /* Address was used before, check for bandwidth change */
-      if ((mlp_bw_out != ntohl(address->assigned_bw_out.value__)) ||
-              (mlp_bw_in != ntohl(address->assigned_bw_in.value__)))
+      if ((mlp_bw_out != address->assigned_bw_out) ||
+              (mlp_bw_in != address->assigned_bw_in))
       {
           LOG (GNUNET_ERROR_TYPE_DEBUG, "%s %.2f : bandwidth changed\n",
               (1 == mlp_use) ? "[x]": "[ ]", mlp_bw_out);
-          address->assigned_bw_in.value__ = htonl (mlp_bw_in);
-          mlpi->b_in.value__ = htonl(mlp_bw_in);
-          address->assigned_bw_out.value__ = htonl (mlp_bw_out);
-          mlpi->b_out.value__ = htonl(mlp_bw_out);
+          address->assigned_bw_in = mlp_bw_in;
+          mlpi->b_in = mlp_bw_in;
+          address->assigned_bw_out = mlp_bw_out;
+          mlpi->b_out = mlp_bw_out;
           if ((NULL == mlp->exclude_peer) || (0 != memcmp (&address->peer, mlp->exclude_peer, sizeof (address->peer))))
             mlp->bw_changed_cb (mlp->bw_changed_cb_cls, address);
           return GNUNET_OK;
@@ -1511,11 +1513,10 @@ mlp_propagate_results (void *cls,
         (1 == mlp_use) ? "[x]": "[ ]", mlp_bw_out);
       address->active = GNUNET_NO;
       /* Set bandwidth to 0 */
-      address->assigned_bw_in = BANDWIDTH_ZERO;
-      mlpi->b_in.value__ = htonl(mlp_bw_in);
-      address->assigned_bw_out = BANDWIDTH_ZERO;
-      mlpi->b_out.value__ = htonl(mlp_bw_out);
-      //mlp->bw_changed_cb (mlp->bw_changed_cb_cls, address);
+      address->assigned_bw_in = 0;
+      mlpi->b_in = 0;
+      address->assigned_bw_out = 0;
+      mlpi->b_out = 0;
       return GNUNET_OK;
     }
     else
@@ -2338,8 +2339,8 @@ GAS_mlp_address_delete (void *solver,
   }
   was_active = address->active;
   address->active = GNUNET_NO;
-  address->assigned_bw_in = BANDWIDTH_ZERO;
-  address->assigned_bw_out = BANDWIDTH_ZERO;
+  address->assigned_bw_in = 0;
+  address->assigned_bw_out = 0;
 
   /* Is this peer included in the problem? */
   if (NULL == (p = GNUNET_CONTAINER_multipeermap_get (mlp->requested_peers,
@@ -2950,8 +2951,8 @@ libgnunet_plugin_ats_mlp_init (void *cls)
 
       if (GNUNET_NO == found)
       {
-        mlp->pv.quota_in[c] = ntohl(GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT.value__);
-        mlp->pv.quota_out[c] = ntohl(GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT.value__);
+        mlp->pv.quota_in[c] = ntohl (GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT.value__);
+        mlp->pv.quota_out[c] = ntohl (GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT.value__);
         LOG (GNUNET_ERROR_TYPE_INFO, _("Using default quota configuration for network `%s' (in/out) %llu/%llu\n"),
             GNUNET_ATS_print_network_type(mlp->pv.quota_index[c]),
             mlp->pv.quota_in[c],
diff --git a/src/ats/plugin_ats_proportional.c b/src/ats/plugin_ats_proportional.c
index 139214118..5fc065cba 100644
--- a/src/ats/plugin_ats_proportional.c
+++ b/src/ats/plugin_ats_proportional.c
@@ -367,19 +367,22 @@ struct Network
  */
 struct AddressSolverInformation
 {
+  /**
+   * Network scope this address is in
+   */
   struct Network *network;
 
   /**
    * Inbound quota
    *
    */
-  unsigned long long calculated_quota_in_NBO;
+  uint32_t calculated_quota_in;
 
   /**
    * Outbound quota
    *
    */
-  unsigned long long calculated_quota_out_NBO;
+  uint32_t calculated_quota_out;
 
   /**
    * When was this address activated
@@ -529,8 +532,8 @@ distribute_bandwidth (struct GAS_PROPORTIONAL_Handle *s,
   double total_weight;
   const double *peer_relative_prefs = NULL; /* Important: has to be double not float due to precision */
 
-  unsigned long long assigned_quota_in = 0;
-  unsigned long long assigned_quota_out = 0;
+  uint32_t assigned_quota_in = 0;
+  uint32_t assigned_quota_out = 0;
 
 
   LOG(GNUNET_ERROR_TYPE_INFO,
@@ -639,8 +642,8 @@ distribute_bandwidth (struct GAS_PROPORTIONAL_Handle *s,
 
     /* Compare to current bandwidth assigned */
     asi = cur_address->addr->solver_information;
-    asi->calculated_quota_in_NBO = htonl (assigned_quota_in);
-    asi->calculated_quota_out_NBO = htonl (assigned_quota_out);
+    asi->calculated_quota_in = assigned_quota_in;
+    asi->calculated_quota_out = assigned_quota_out;
   }
   LOG(GNUNET_ERROR_TYPE_DEBUG,
       "Total bandwidth assigned is (in/out): %llu /%llu\n", quota_in_used,
@@ -1087,23 +1090,22 @@ propagate_bandwidth (struct GAS_PROPORTIONAL_Handle *s,
   for (cur = net->head; NULL != cur; cur = cur->next)
   {
       asi = cur->addr->solver_information;
-      if ( (cur->addr->assigned_bw_in.value__ != asi->calculated_quota_in_NBO) ||
-           (cur->addr->assigned_bw_out.value__ != asi->calculated_quota_out_NBO) )
+      if ( (cur->addr->assigned_bw_in != asi->calculated_quota_in) ||
+           (cur->addr->assigned_bw_out != asi->calculated_quota_out) )
       {
-        cur->addr->assigned_bw_in.value__ = asi->calculated_quota_in_NBO;
-        cur->addr->assigned_bw_out.value__ = asi->calculated_quota_out_NBO;
+        cur->addr->assigned_bw_in = asi->calculated_quota_in;
+        cur->addr->assigned_bw_out = asi->calculated_quota_out;
 
         /* Reset for next iteration */
-        asi->calculated_quota_in_NBO = htonl (0);
-        asi->calculated_quota_out_NBO = htonl (0);
-
+        asi->calculated_quota_in = 0;
+        asi->calculated_quota_out = 0;
         LOG (GNUNET_ERROR_TYPE_DEBUG,
             "Bandwidth for %s address %p for peer `%s' changed to %u/%u\n",
             (GNUNET_NO == cur->addr->active) ? "inactive" : "active",
             cur->addr,
             GNUNET_i2s (&cur->addr->peer),
-            ntohl (cur->addr->assigned_bw_in.value__),
-            ntohl (cur->addr->assigned_bw_out.value__ ));
+            cur->addr->assigned_bw_in,
+            cur->addr->assigned_bw_out);
 
         /* Notify on change */
         if ((GNUNET_YES == cur->addr->active))
@@ -1215,17 +1217,12 @@ update_active_address (struct GAS_PROPORTIONAL_Handle *s,
   /* Find active address */
   current_address = get_active_address (s, s->addresses, peer);
 
-  LOG (GNUNET_ERROR_TYPE_INFO,
-       "Peer `%s' has active address %p\n",
-       GNUNET_i2s (peer),
-       current_address);
-
+  LOG (GNUNET_ERROR_TYPE_INFO, "Peer `%s' has active address %p\n",
+       GNUNET_i2s (peer), current_address);
 
   /* Find best address */
   best_address = get_best_address (s,s->addresses, peer);
-
-  LOG (GNUNET_ERROR_TYPE_INFO,
-       "Peer `%s' has best address %p\n",
+  LOG (GNUNET_ERROR_TYPE_INFO, "Peer `%s' has best address %p\n",
        GNUNET_i2s (peer), best_address);
 
   if (NULL != current_address)
@@ -1246,8 +1243,8 @@ update_active_address (struct GAS_PROPORTIONAL_Handle *s,
       net = asi->network;
       asi->activated = GNUNET_TIME_UNIT_ZERO_ABS;
       current_address->active = GNUNET_NO; /* No active any longer */
-      current_address->assigned_bw_in = BANDWIDTH_ZERO; /* no bandwidth assigned */
-      current_address->assigned_bw_out = BANDWIDTH_ZERO; /* no bandwidth assigned */
+      current_address->assigned_bw_in = 0; /* no bandwidth assigned */
+      current_address->assigned_bw_out = 0; /* no bandwidth assigned */
 
       if (GNUNET_SYSERR == addresse_decrement (s, net, GNUNET_NO, GNUNET_YES))
         GNUNET_break(0);
@@ -1442,8 +1439,8 @@ GAS_proportional_stop_get_preferred_address (void *solver,
     cur_net = asi->network ;
     asi->activated = GNUNET_TIME_UNIT_ZERO_ABS;
     cur->active = GNUNET_NO; /* No active any longer */
-    cur->assigned_bw_in = BANDWIDTH_ZERO; /* no bandwidth assigned */
-    cur->assigned_bw_out = BANDWIDTH_ZERO; /* no bandwidth assigned */
+    cur->assigned_bw_in = 0; /* no bandwidth assigned */
+    cur->assigned_bw_out = 0; /* no bandwidth assigned */
 
     if (GNUNET_SYSERR == addresse_decrement (s, cur_net, GNUNET_NO, GNUNET_YES))
       GNUNET_break(0);
@@ -1525,10 +1522,10 @@ GAS_proportional_address_delete (void *solver,
     /* Address was active, remove from network and update quotas*/
     address->active = GNUNET_NO;
 
-    address->assigned_bw_in = BANDWIDTH_ZERO;
-    address->assigned_bw_out = BANDWIDTH_ZERO;
-    asi->calculated_quota_in_NBO = htonl (0);
-    asi->calculated_quota_out_NBO = htonl (0);
+    address->assigned_bw_in = 0;
+    address->assigned_bw_out = 0;
+    asi->calculated_quota_in = 0;
+    asi->calculated_quota_out = 0;
 
     if (GNUNET_SYSERR == addresse_decrement (s, net, GNUNET_NO, GNUNET_YES))
       GNUNET_break(0);
@@ -1837,8 +1834,8 @@ GAS_proportional_address_change_network (void *solver,
 
   /* Disable and assign no bandwidth */
   address->active = GNUNET_NO;
-  address->assigned_bw_in = BANDWIDTH_ZERO; /* no bandwidth assigned */
-  address->assigned_bw_out = BANDWIDTH_ZERO; /* no bandwidth assigned */
+  address->assigned_bw_in = 0; /* no bandwidth assigned */
+  address->assigned_bw_out = 0; /* no bandwidth assigned */
 
   /* Remove from old network */
   GAS_proportional_address_delete (solver, address, GNUNET_NO);
@@ -1910,8 +1907,8 @@ GAS_proportional_address_add (void *solver,
 
   asi = GNUNET_new (struct AddressSolverInformation);
   asi->network = net;
-  asi->calculated_quota_in_NBO = htonl (0);
-  asi->calculated_quota_out_NBO = htonl (0);
+  asi->calculated_quota_in = 0;
+  asi->calculated_quota_out = 0;
   aw->addr->solver_information = asi;
 
   LOG(GNUNET_ERROR_TYPE_INFO,
diff --git a/src/ats/plugin_ats_ril.c b/src/ats/plugin_ats_ril.c
index 10650a5c4..4feb0fd9a 100644
--- a/src/ats/plugin_ats_ril.c
+++ b/src/ats/plugin_ats_ril.c
@@ -308,12 +308,12 @@ struct RIL_Peer_Agent
   /**
    * Inbound bandwidth assigned by the agent
    */
-  unsigned long long bw_in;
+  uint32_t bw_in;
 
   /**
    * Outbound bandwidth assigned by the agent
    */
-  unsigned long long bw_out;
+  uint32_t bw_out;
 
   /**
    * Flag whether a suggestion has to be issued
@@ -346,22 +346,22 @@ struct RIL_Scope
   /**
    * Total available inbound bandwidth
    */
-  unsigned long long bw_in_available;
+  uint32_t bw_in_available;
 
   /**
    * Bandwidth inbound assigned in network after last step
    */
-  unsigned long long bw_in_assigned;
+  uint32_t bw_in_assigned;
 
   /**
    * Bandwidth inbound actually utilized in the network
    */
-  unsigned long long bw_in_utilized;
+  uint32_t bw_in_utilized;
 
   /**
    * Total available outbound bandwidth
    */
-  unsigned long long bw_out_available;
+  uint32_t bw_out_available;
 
   /**
    * Bandwidth outbound assigned in network after last step
@@ -830,15 +830,15 @@ envi_set_active_suggestion (struct GAS_RIL_Handle *solver,
     if (NULL != agent->address_inuse)
     {
       agent->address_inuse->active = GNUNET_NO;
-      agent->address_inuse->assigned_bw_in.value__ = htonl (0);
-      agent->address_inuse->assigned_bw_out.value__ = htonl (0);
+      agent->address_inuse->assigned_bw_in = 0;
+      agent->address_inuse->assigned_bw_out = 0;
     }
     if (NULL != new_address)
     {
       LOG(GNUNET_ERROR_TYPE_DEBUG, "    set address active: %s\n", agent->is_active ? "yes" : "no");
       new_address->active = agent->is_active;
-      new_address->assigned_bw_in.value__ = htonl (agent->bw_in);
-      new_address->assigned_bw_out.value__ = htonl (agent->bw_out);
+      new_address->assigned_bw_in = agent->bw_in;
+      new_address->assigned_bw_out = agent->bw_out;
     }
     notify |= GNUNET_YES;
   }
@@ -856,13 +856,13 @@ envi_set_active_suggestion (struct GAS_RIL_Handle *solver,
     if (agent->bw_in != new_bw_in)
     {
       agent->bw_in = new_bw_in;
-      new_address->assigned_bw_in.value__ = htonl (new_bw_in);
+      new_address->assigned_bw_in = new_bw_in;
       notify |= GNUNET_YES;
     }
     if (agent->bw_out != new_bw_out)
     {
       agent->bw_out = new_bw_out;
-      new_address->assigned_bw_out.value__ = htonl (new_bw_out);
+      new_address->assigned_bw_out = new_bw_out;
       notify |= GNUNET_YES;
     }
   }
@@ -877,9 +877,9 @@ envi_set_active_suggestion (struct GAS_RIL_Handle *solver,
     }
     else if (agent->address_inuse)
     {
-      //disconnect case, no new address
-      GNUNET_assert(0 == ntohl (agent->address_inuse->assigned_bw_in.value__));
-      GNUNET_assert(0 == ntohl (agent->address_inuse->assigned_bw_out.value__));
+      /* disconnect case, no new address */
+      GNUNET_assert(0 ==  agent->address_inuse->assigned_bw_in);
+      GNUNET_assert(0 == agent->address_inuse->assigned_bw_out);
       agent->bw_in = 0;
       agent->bw_out = 0;
 
diff --git a/src/ats/test_ats_api_common.c b/src/ats/test_ats_api_common.c
index 934877024..b603d6e6d 100644
--- a/src/ats/test_ats_api_common.c
+++ b/src/ats/test_ats_api_common.c
@@ -266,8 +266,8 @@ create_address (const struct GNUNET_PeerIdentity *peer,
   aa->active = GNUNET_NO;
   aa->used = GNUNET_NO;
   aa->solver_information = NULL;
-  aa->assigned_bw_in = GNUNET_BANDWIDTH_value_init(0);
-  aa->assigned_bw_out = GNUNET_BANDWIDTH_value_init(0);
+  aa->assigned_bw_in = 0;
+  aa->assigned_bw_out = 0;
   return aa;
 }