[or-cvs] r9109: clarify our use of local time vs GMT (in tor/trunk: doc src/or)

arma at seul.org arma at seul.org
Thu Dec 14 23:39:16 UTC 2006


Author: arma
Date: 2006-12-14 18:39:14 -0500 (Thu, 14 Dec 2006)
New Revision: 9109

Modified:
   tor/trunk/doc/control-spec.txt
   tor/trunk/src/or/circuitbuild.c
   tor/trunk/src/or/config.c
Log:
clarify our use of local time vs GMT


Modified: tor/trunk/doc/control-spec.txt
===================================================================
--- tor/trunk/doc/control-spec.txt	2006-12-14 08:12:11 UTC (rev 9108)
+++ tor/trunk/doc/control-spec.txt	2006-12-14 23:39:14 UTC (rev 9109)
@@ -930,6 +930,8 @@
      "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,

Modified: tor/trunk/src/or/circuitbuild.c
===================================================================
--- tor/trunk/src/or/circuitbuild.c	2006-12-14 08:12:11 UTC (rev 9108)
+++ tor/trunk/src/or/circuitbuild.c	2006-12-14 23:39:14 UTC (rev 9109)
@@ -2006,7 +2006,7 @@
       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);

Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c	2006-12-14 08:12:11 UTC (rev 9108)
+++ tor/trunk/src/or/config.c	2006-12-14 23:39:14 UTC (rev 9109)
@@ -3974,11 +3974,12 @@
   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);



More information about the tor-commits mailing list