Commit 3fc43deb authored by Nick Mathewson's avatar Nick Mathewson 🦞
Browse files

Merge remote branch 'origin/maint-0.2.2'

parents bbadf07d dc2f10bd

changes/bug2146.1

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  - Major bugfixes:

    o Fix a bug that could break accounting on 64-bit systems with large

      time_t values, making them hibernate for impossibly long intervals.

      Bugfix on 0.0.9pre6; fix for bug 2146; fix by boboper.

src/or/hibernate.c

+3 −6
Original line number Diff line number Diff line
@@ -515,7 +515,6 @@ accounting_run_housekeeping(time_t now) 
static void

accounting_set_wakeup_time(void)

{

  char buf[ISO_TIME_LEN+1];

  char digest[DIGEST_LEN];

  crypto_digest_env_t *d_env;

  int time_in_interval;
@@ -530,6 +529,7 @@ accounting_set_wakeup_time(void) 
  }



  if (server_identity_key_is_set()) {

    char buf[ISO_TIME_LEN+1];

    format_iso_time(buf, interval_start_time);



    crypto_pk_get_digest(get_server_identity_key(), digest);
@@ -548,7 +548,6 @@ accounting_set_wakeup_time(void) 
    char buf2[ISO_TIME_LEN+1];

    format_local_iso_time(buf1, interval_start_time);

    format_local_iso_time(buf2, interval_end_time);

    time_to_exhaust_bw = GUESS_TIME_TO_USE_BANDWIDTH;

    interval_wakeup_time = interval_start_time;



    log_notice(LD_ACCT,
@@ -563,8 +562,8 @@ accounting_set_wakeup_time(void) 


  time_to_exhaust_bw =

    (get_options()->AccountingMax/expected_bandwidth_usage)*60;

  if (time_to_exhaust_bw > TIME_MAX) {

    time_to_exhaust_bw = TIME_MAX;

  if (time_to_exhaust_bw > INT_MAX) {

    time_to_exhaust_bw = INT_MAX;

    time_to_consider = 0;

  } else {

    time_to_consider = time_in_interval - (int)time_to_exhaust_bw;
@@ -582,8 +581,6 @@ accounting_set_wakeup_time(void) 
     * to be chosen than the last half. */

    interval_wakeup_time = interval_start_time +

      (get_uint32(digest) % time_to_consider);



    format_iso_time(buf, interval_wakeup_time);

  }



  {