Browse Source

clarify our use of local time vs GMT

svn:r9109
Roger Dingledine 17 years ago
parent
commit
c44dd3870e
3 changed files with 6 additions and 3 deletions
  1. 2 0
      doc/control-spec.txt
  2. 1 1
      src/or/circuitbuild.c
  3. 3 2
      src/or/config.c

+ 2 - 0
doc/control-spec.txt

@@ -930,6 +930,8 @@ $Id$
      "650" SP "ADDRMAP" SP Address SP Address SP Expiry
      Expiry = DQOUTE ISOTime DQUOTE / "NEVER"
 
+  Expiry is expressed as the local time (rather than GMT).
+
   [XXX We should rename this to ADDRESSMAP. -RD]
 
   [FFF We should add a SOURCE=%s argument for extended events,

+ 1 - 1
src/or/circuitbuild.c

@@ -2006,7 +2006,7 @@ remove_dead_entries(void)
       base16_encode(dbuf, sizeof(dbuf), entry->identity, DIGEST_LEN);
       format_local_iso_time(tbuf, entry->bad_since);
       log_info(LD_CIRC, "Entry guard '%s' (%s) has been down or unlisted "
-               "since %s; removing.",
+               "since %s local time; removing.",
                entry->nickname, dbuf, tbuf);
       tor_free(entry);
       smartlist_del_keeporder(entry_guards, i);

+ 3 - 2
src/or/config.c

@@ -3974,11 +3974,12 @@ or_state_save(time_t now)
   tor_free(global_state->TorVersion);
   global_state->TorVersion = tor_strdup("Tor " VERSION);
   state = config_dump(&state_format, global_state, 1);
-  len = strlen(state)+128;
+  len = strlen(state)+256;
   contents = tor_malloc(len);
   format_local_iso_time(tbuf, time(NULL));
   tor_snprintf(contents, len,
-               "# Tor state file last generated on %s\n"
+               "# Tor state file last generated on %s local time\n"
+               "# Other times below are in GMT\n"
                "# You *do not* need to edit this file.\n\n%s",
                tbuf, state);
   tor_free(state);