[GNUnet-SVN] r13432 - in gnunet/src: core datacache datastore include transport util

[gnunet]

Author: wachs
Date: 2010-10-27 14:38:51 +0200 (Wed, 27 Oct 2010)
New Revision: 13432

Modified:
   gnunet/src/core/gnunet-service-core.c
   gnunet/src/datacache/plugin_datacache_postgres.c
   gnunet/src/datastore/plugin_datastore_postgres.c
   gnunet/src/include/gnunet_time_lib.h
   gnunet/src/transport/Makefile.am
   gnunet/src/transport/gnunet-service-transport.c
   gnunet/src/util/time.c
Log:


Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c       2010-10-27 11:41:46 UTC (rev 
13431)
+++ gnunet/src/core/gnunet-service-core.c       2010-10-27 12:38:51 UTC (rev 
13432)
@@ -2173,7 +2173,7 @@
 #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));

Modified: gnunet/src/datacache/plugin_datacache_postgres.c
===================================================================
--- gnunet/src/datacache/plugin_datacache_postgres.c    2010-10-27 11:41:46 UTC 
(rev 13431)
+++ gnunet/src/datacache/plugin_datacache_postgres.c    2010-10-27 12:38:51 UTC 
(rev 13432)
@@ -312,7 +312,7 @@
   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,

Modified: gnunet/src/datastore/plugin_datastore_postgres.c
===================================================================
--- gnunet/src/datastore/plugin_datastore_postgres.c    2010-10-27 11:41:46 UTC 
(rev 13431)
+++ gnunet/src/datastore/plugin_datastore_postgres.c    2010-10-27 12:38:51 UTC 
(rev 13432)
@@ -605,7 +605,7 @@
   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 @@
   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 @@
       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);
 }

Modified: gnunet/src/include/gnunet_time_lib.h
===================================================================
--- gnunet/src/include/gnunet_time_lib.h        2010-10-27 11:41:46 UTC (rev 
13431)
+++ gnunet/src/include/gnunet_time_lib.h        2010-10-27 12:38:51 UTC (rev 
13432)
@@ -82,7 +82,7 @@
   /**
    * The actual value (in network byte order).
    */
-  uint64_t value__ GNUNET_PACKED;
+  uint64_t abs_value__ GNUNET_PACKED;
 };
 
 

Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am    2010-10-27 11:41:46 UTC (rev 13431)
+++ gnunet/src/transport/Makefile.am    2010-10-27 12:38:51 UTC (rev 13432)
@@ -200,8 +200,8 @@
  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

Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c     2010-10-27 11:41:46 UTC 
(rev 13431)
+++ gnunet/src/transport/gnunet-service-transport.c     2010-10-27 12:38:51 UTC 
(rev 13432)
@@ -5074,7 +5074,7 @@
   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

Modified: gnunet/src/util/time.c
===================================================================
--- gnunet/src/util/time.c      2010-10-27 11:41:46 UTC (rev 13431)
+++ gnunet/src/util/time.c      2010-10-27 12:38:51 UTC (rev 13432)
@@ -455,7 +455,7 @@
 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 @@
 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;
 
 }