[or-cvs] r11566: only mess with 'state' in init_keys if we're planning to act (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2007-09-21 17:52:31 -0400 (Fri, 21 Sep 2007)
New Revision: 11566

Modified:
   tor/trunk/src/or/router.c
Log:
only mess with 'state' in init_keys if we're planning to actually
run tor. this resolves a segfault in 'tor --list-fingerprints'
introduced by r11437.

backport candidate due to r11438.


Modified: tor/trunk/src/or/router.c
===================================================================
--- tor/trunk/src/or/router.c	2007-09-21 20:42:44 UTC (rev 11565)
+++ tor/trunk/src/or/router.c	2007-09-21 21:52:31 UTC (rev 11566)
@@ -381,7 +381,6 @@
   char v3_digest[20];
   char *cp;
   or_options_t *options = get_options();
-  or_state_t *state = get_or_state();
   authority_type_t type;
   time_t now = time(NULL);
 
@@ -441,18 +440,23 @@
   prkey = init_key_from_file(keydir, 1, LOG_ERR);
   if (!prkey) return -1;
   set_onion_key(prkey);
-  if (state->LastRotatedOnionKey > 100 && state->LastRotatedOnionKey < now) {
-    /* We allow for some parsing slop, but we don't want to risk accepting
-     * values in the distant future.  If we did, we might never rotate the
-     * onion key. */
-    onionkey_set_at = state->LastRotatedOnionKey;
-  } else {
-    /* We have no LastRotatedOnionKey set; either we just created the key
-     * or it's a holdover from 0.1.2.4-alpha-dev or earlier.  In either case,
-     * start the clock ticking now so that we will eventually rotate it even
-     * if we don't stay up for a full MIN_ONION_KEY_LIFETIME. */
-    state->LastRotatedOnionKey = onionkey_set_at = now;
-    or_state_mark_dirty(state, options->AvoidDiskWrites ? time(NULL)+3600 : 0);
+  if (options->command == CMD_RUN_TOR) {
+    /* only mess with the state file if we're actually running Tor */
+    or_state_t *state = get_or_state();
+    if (state->LastRotatedOnionKey > 100 && state->LastRotatedOnionKey < now) {
+      /* We allow for some parsing slop, but we don't want to risk accepting
+       * values in the distant future.  If we did, we might never rotate the
+       * onion key. */
+      onionkey_set_at = state->LastRotatedOnionKey;
+    } else {
+      /* We have no LastRotatedOnionKey set; either we just created the key
+       * or it's a holdover from 0.1.2.4-alpha-dev or earlier.  In either case,
+       * start the clock ticking now so that we will eventually rotate it even
+       * if we don't stay up for a full MIN_ONION_KEY_LIFETIME. */
+      state->LastRotatedOnionKey = onionkey_set_at = now;
+      or_state_mark_dirty(state, options->AvoidDiskWrites ?
+                                   time(NULL)+3600 : 0);
+    }
   }
 
   tor_snprintf(keydir,sizeof(keydir),