(no commit message)

diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index 4ab371a39fa6db688ccbd9459b422e21789a2af1..4f650b909ecfcf23c45499c610d84acc1ce0de2b 100644 (file)
--- a/src/core/gnunet-service-core.c
+++ b/src/core/gnunet-service-core.c
@@ -2173,7 +2173,7 @@ process_plaintext_neighbour_queue (struct Neighbour *n)
 #if DEBUG_CORE_QUOTA
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Sending %u b/s as new limit to peer `%4s'\n",
-             (unsigned int) ntohl (n->bw_in.rel_value__),
+             (unsigned int) ntohl (n->bw_in.value__),
              GNUNET_i2s (&n->peer));
 #endif
   ph->iv_seed = htonl (GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX));

diff --git a/src/datacache/plugin_datacache_postgres.c b/src/datacache/plugin_datacache_postgres.c
index ca794ddd4ea00f8369c62af5461b5fbc4a1b49e6..75d644da9ca83f9bbadbe647da2107919e380ea7 100644 (file)
--- a/src/datacache/plugin_datacache_postgres.c
+++ b/src/datacache/plugin_datacache_postgres.c
@@ -312,7 +312,7 @@ postgres_plugin_put (void *cls,
   struct Plugin *plugin = cls;
   PGresult *ret;
   uint32_t btype = htonl (type);
-  uint64_t bexpi = GNUNET_TIME_absolute_hton (discard_time).value__;
+  uint64_t bexpi = GNUNET_TIME_absolute_hton (discard_time).abs_value__;
   const char *paramValues[] = {
     (const char *) &btype,
     (const char *) &bexpi,

diff --git a/src/datastore/plugin_datastore_postgres.c b/src/datastore/plugin_datastore_postgres.c
index 248fe7a961b895721332ba14944d333439a73a02..44a01fcb8fb22960d53c07207a0e605e9dbce288 100644 (file)
--- a/src/datastore/plugin_datastore_postgres.c
+++ b/src/datastore/plugin_datastore_postgres.c
@@ -605,7 +605,7 @@ postgres_plugin_put (void *cls,
   uint32_t btype = htonl (type);
   uint32_t bprio = htonl (priority);
   uint32_t banon = htonl (anonymity);
-  uint64_t bexpi = GNUNET_TIME_absolute_hton (expiration).value__;
+  uint64_t bexpi = GNUNET_TIME_absolute_hton (expiration).abs_value__;
   const char *paramValues[] = {
     (const char *) &btype,
     (const char *) &bprio,
@@ -886,7 +886,7 @@ postgres_plugin_update (void *cls,
   PGresult *ret;
   int32_t bdelta = (int32_t) htonl ((uint32_t) delta);
   uint32_t boid = htonl ( (uint32_t) uid);
-  uint64_t bexpire = GNUNET_TIME_absolute_hton (expire).value__;
+  uint64_t bexpire = GNUNET_TIME_absolute_hton (expire).abs_value__;
   const char *paramValues[] = {
     (const char *) &bdelta,
     (const char *) &bexpire,
@@ -996,7 +996,7 @@ postgres_iterate (struct Plugin *plugin,
       GNUNET_free (nrc);
       return;
     }
-  nrc->bnow = GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ()).value__;
+  nrc->bnow = GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ()).abs_value__;
   postgres_plugin_next_request (nrc,
                                GNUNET_NO);
 }

diff --git a/src/include/gnunet_time_lib.h b/src/include/gnunet_time_lib.h
index 1a23f1ac2ae56d0c813cedfd86afdc76c76e1055..4f0b3b74c3a3a1254b5b77230d4dbd15fd203dd1 100644 (file)
--- a/src/include/gnunet_time_lib.h
+++ b/src/include/gnunet_time_lib.h
@@ -82,7 +82,7 @@ struct GNUNET_TIME_AbsoluteNBO
   /**
    * The actual value (in network byte order).
    */
-  uint64_t value__ GNUNET_PACKED;
+  uint64_t abs_value__ GNUNET_PACKED;
 };
 
 

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 0fbad27cef219f582fe2d2725d357e64737a1f3d..3fae21572d8afa705518de03e9fa7694e92d66fc 100644 (file)
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -200,8 +200,8 @@ check_PROGRAMS = \
  test_transport_api_reliability_tcp_nat \
  test_transport_api_reliability_udp \
  $(HTTP_REL_TEST) \
- $(HTTPS_REL_TEST)
-#  test_quota_compliance
+ $(HTTPS_REL_TEST) \
+ test_quota_compliance
 # TODO: add tests for nat, etc.
 
 if !DISABLE_TEST_RUN

diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index 573f8ef9a7a4b8921bb1267916800a157562edfd..c1bb7bec6f79833b3477329f702252d74a0cc9ad 100644 (file)
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -5074,7 +5074,7 @@ handle_set_quota (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received `%s' request (new quota %u, old quota %u) from client for peer `%4s'\n",
               "SET_QUOTA",
-             (unsigned int) ntohl (qsm->quota.rel_value__),
+             (unsigned int) ntohl (qsm->quota.value__),
              (unsigned int) n->in_tracker.available_bytes_per_s__,
              GNUNET_i2s (&qsm->peer));
 #endif

diff --git a/src/util/time.c b/src/util/time.c
index 0ab947b934454f4b91350e81151322d37ff03245..e1440f26056eb2fb171dc653127b0821dbece210 100644 (file)
--- a/src/util/time.c
+++ b/src/util/time.c
@@ -455,7 +455,7 @@ struct GNUNET_TIME_AbsoluteNBO
 GNUNET_TIME_absolute_hton (struct GNUNET_TIME_Absolute a)
 {
   struct GNUNET_TIME_AbsoluteNBO ret;
-  ret.value__ = GNUNET_htonll (a.abs_value);
+  ret.abs_value__ = GNUNET_htonll (a.abs_value);
   return ret;
 }
 
@@ -469,7 +469,7 @@ struct GNUNET_TIME_Absolute
 GNUNET_TIME_absolute_ntoh (struct GNUNET_TIME_AbsoluteNBO a)
 {
   struct GNUNET_TIME_Absolute ret;
-  ret.abs_value = GNUNET_ntohll (a.value__);
+  ret.abs_value = GNUNET_ntohll (a.abs_value__);
   return ret;
 
 }