From 8a52fcaa55bc547321ef779c6e9bb1672dd83585 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Wed, 27 Oct 2010 12:38:51 +0000 Subject: [PATCH] --- src/core/gnunet-service-core.c | 2 +- src/datacache/plugin_datacache_postgres.c | 2 +- src/datastore/plugin_datastore_postgres.c | 6 +++--- src/include/gnunet_time_lib.h | 2 +- src/transport/Makefile.am | 4 ++-- src/transport/gnunet-service-transport.c | 2 +- src/util/time.c | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c index 4ab371a39..4f650b909 100644 --- 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 ca794ddd4..75d644da9 100644 --- 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 248fe7a96..44a01fcb8 100644 --- 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 1a23f1ac2..4f0b3b74c 100644 --- 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 0fbad27ce..3fae21572 100644 --- 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 573f8ef9a..c1bb7bec6 100644 --- 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 0ab947b93..e1440f260 100644 --- 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; } -- 2.25.1