From 2608172e09bba77c60c72b6c26054769d828c38f Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Mon, 14 Jan 2013 10:01:43 +0000 Subject: [PATCH] fix for quota check --- .../gnunet-service-ats_addresses_simplistic.c | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/ats/gnunet-service-ats_addresses_simplistic.c b/src/ats/gnunet-service-ats_addresses_simplistic.c index c5e774f56..7a7c4febf 100644 --- a/src/ats/gnunet-service-ats_addresses_simplistic.c +++ b/src/ats/gnunet-service-ats_addresses_simplistic.c @@ -502,19 +502,25 @@ update_quota_per_network (struct GAS_SIMPLISTIC_Handle *s, } LOG (GNUNET_ERROR_TYPE_DEBUG, - "Total bandwidth assigned is: (in/out): %llu /%llu\n", + "Total bandwidth assigned is (in/out): %llu /%llu\n", quota_in_used, quota_out_used); - if (quota_out_used > quota_out) - LOG (GNUNET_ERROR_TYPE_WARNING, - "DEBUG! Total inbound bandwidth assigned is larget than allowed %llu /%llu\n", + if (quota_out_used > net->total_quota_out + 1) /* +1 is required due to rounding errors */ + { + GNUNET_break (0); + LOG (GNUNET_ERROR_TYPE_WARNING, + "Total inbound bandwidth assigned is larget than allowed %llu /%llu\n", quota_out_used, - quota_out); /* FIXME: Can happen atm, we have some rounding error */ - if (quota_in_used > quota_in) - LOG (GNUNET_ERROR_TYPE_WARNING, - "DEBUG! Total inbound bandwidth assigned is larget than allowed %llu /%llu\n", + quota_out); + } + if (quota_in_used > net->total_quota_in + 1) /* +1 is required due to rounding errors */ + { + GNUNET_break (0); + LOG (GNUNET_ERROR_TYPE_WARNING, + "Total inbound bandwidth assigned is larget than allowed %llu /%llu\n", quota_in_used, - quota_in); /* FIXME: Can happen atm, we have some rounding error */ + quota_in); + } } static void -- 2.25.1