config.c 159 KB
Newer Older
Roger Dingledine's avatar
Roger Dingledine committed
1
2
/* Copyright (c) 2001 Matej Pfajfar.
 * Copyright (c) 2001-2004, Roger Dingledine.
3
 * Copyright (c) 2004-2007, Roger Dingledine, Nick Mathewson. */
4
5
/* See LICENSE for licensing information */
/* $Id$ */
6
7
const char config_c_id[] = \
  "$Id$";
8

Nick Mathewson's avatar
Nick Mathewson committed
9
/**
10
11
 * \file config.c
 * \brief Code to parse and interpret configuration files.
Nick Mathewson's avatar
Nick Mathewson committed
12
13
 **/

14
15
#define CONFIG_PRIVATE

Roger Dingledine's avatar
Roger Dingledine committed
16
#include "or.h"
17
18
19
#ifdef MS_WINDOWS
#include <shlobj.h>
#endif
Roger Dingledine's avatar
Roger Dingledine committed
20

Nick Mathewson's avatar
Nick Mathewson committed
21
22
/** Enumeration of types which option values can take */
typedef enum config_type_t {
23
24
  CONFIG_TYPE_STRING = 0,   /**< An arbitrary string. */
  CONFIG_TYPE_UINT,         /**< A non-negative integer less than MAX_INT */
25
26
  CONFIG_TYPE_INTERVAL,     /**< A number of seconds, with optional units*/
  CONFIG_TYPE_MEMUNIT,      /**< A number of bytes, with optional units*/
27
28
  CONFIG_TYPE_DOUBLE,       /**< A floating-point value */
  CONFIG_TYPE_BOOL,         /**< A boolean value, expressed as 0 or 1. */
29
  CONFIG_TYPE_ISOTIME,      /**< An ISO-formated time relative to GMT. */
30
31
  CONFIG_TYPE_CSV,          /**< A list of strings, separated by commas and
                              * optional whitespace. */
32
  CONFIG_TYPE_LINELIST,     /**< Uninterpreted config lines */
33
34
35
36
37
  CONFIG_TYPE_LINELIST_S,   /**< Uninterpreted, context-sensitive config lines,
                             * mixed with other keywords. */
  CONFIG_TYPE_LINELIST_V,   /**< Catch-all "virtual" option to summarize
                             * context-sensitive config lines when fetching.
                             */
38
  CONFIG_TYPE_OBSOLETE,     /**< Obsolete (ignored) option. */
Nick Mathewson's avatar
Nick Mathewson committed
39
} config_type_t;
40

41
/** An abbreviation for a configuration option allowed on the command line. */
42
typedef struct config_abbrev_t {
43
44
  const char *abbreviated;
  const char *full;
45
  int commandline_only;
46
  int warn;
47
48
} config_abbrev_t;

49
50
/* Handy macro for declaring "In the config file or on the command line,
 * you can abbreviate <b>tok</b>s as <b>tok</b>". */
51
#define PLURAL(tok) { #tok, #tok "s", 0, 0 }
52

Nick Mathewson's avatar
Nick Mathewson committed
53
/* A list of command-line abbreviations. */
54
static config_abbrev_t _option_abbrevs[] = {
55
  PLURAL(ExitNode),
56
  PLURAL(EntryNode),
57
58
  PLURAL(ExcludeNode),
  PLURAL(FirewallPort),
59
  PLURAL(LongLivedPort),
60
61
  PLURAL(HiddenServiceNode),
  PLURAL(HiddenServiceExcludeNode),
62
  PLURAL(NumCpu),
63
64
  PLURAL(RendNode),
  PLURAL(RendExcludeNode),
65
66
  PLURAL(StrictEntryNode),
  PLURAL(StrictExitNode),
67
  { "l", "Log", 1, 0},
68
  { "AllowUnverifiedNodes", "AllowInvalidNodes", 0, 0},
69
70
  { "AutomapHostSuffixes", "AutomapHostsSuffixes", 0, 0},
  { "AutomapHostOnResolve", "AutomapHostsOnResolve", 0, 0},
71
72
73
74
  { "BandwidthRateBytes", "BandwidthRate", 0, 0},
  { "BandwidthBurstBytes", "BandwidthBurst", 0, 0},
  { "DirFetchPostPeriod", "StatusFetchPeriod", 0, 0},
  { "MaxConn", "ConnLimit", 0, 1},
75
76
77
  { "ORBindAddress", "ORListenAddress", 0, 0},
  { "DirBindAddress", "DirListenAddress", 0, 0},
  { "SocksBindAddress", "SocksListenAddress", 0, 0},
78
79
80
81
  { "UseHelperNodes", "UseEntryGuards", 0, 0},
  { "NumHelperNodes", "NumEntryGuards", 0, 0},
  { "UseEntryNodes", "UseEntryGuards", 0, 0},
  { "NumEntryNodes", "NumEntryGuards", 0, 0},
82
83
  { "ResolvConf", "ServerDNSResolvConfFile", 0, 1},
  { "SearchDomains", "ServerDNSSearchDomains", 0, 1},
84
  { "PreferTunnelledDirConns", "PreferTunneledDirConns", 0, 0},
85
86
87
88
  { NULL, NULL, 0, 0},
};
/* A list of state-file abbreviations, for compatibility. */
static config_abbrev_t _state_abbrevs[] = {
89
  { "AccountingBytesReadInterval", "AccountingBytesReadInInterval", 0, 0 },
90
91
92
93
94
95
  { "HelperNode", "EntryGuard", 0, 0 },
  { "HelperNodeDownSince", "EntryGuardDownSince", 0, 0 },
  { "HelperNodeUnlistedSince", "EntryGuardUnlistedSince", 0, 0 },
  { "EntryNode", "EntryGuard", 0, 0 },
  { "EntryNodeDownSince", "EntryGuardDownSince", 0, 0 },
  { "EntryNodeUnlistedSince", "EntryGuardUnlistedSince", 0, 0 },
96
  { NULL, NULL, 0, 0},
97
};
98
#undef PLURAL
99

100
/** A variable allowed in the configuration file or on the command line. */
101
typedef struct config_var_t {
102
  const char *name; /**< The full keyword (case insensitive). */
103
104
  config_type_t type; /**< How to interpret the type and turn it into a
                       * value. */
105
106
  off_t var_offset; /**< Offset of the corresponding member of or_options_t. */
  const char *initvalue; /**< String (or null) describing initial value. */
107
108
} config_var_t;

Nick Mathewson's avatar
Nick Mathewson committed
109
110
111
112
/** An entry for config_vars: "The option <b>name</b> has type
 * CONFIG_TYPE_<b>conftype</b>, and corresponds to
 * or_options_t.<b>member</b>"
 */
113
114
#define VAR(name,conftype,member,initvalue)                             \
  { name, CONFIG_TYPE_ ## conftype, STRUCT_OFFSET(or_options_t, member), \
115
      initvalue }
116
117
118
/** As VAR, but the option name and member name are the same. */
#define V(member,conftype,initvalue)                                    \
  VAR(#member, conftype, member, initvalue)
Nick Mathewson's avatar
Nick Mathewson committed
119
/** An entry for config_vars: "The option <b>name</b> is obsolete." */
120
#define OBSOLETE(name) { name, CONFIG_TYPE_OBSOLETE, 0, NULL }
121

Nick Mathewson's avatar
Nick Mathewson committed
122
123
124
125
/** Array of configuration options.  Until we disallow nonstandard
 * abbreviations, order is significant, since the first matching option will
 * be chosen first.
 */
126
static config_var_t _option_vars[] = {
127
  OBSOLETE("AccountingMaxKB"),
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
  V(AccountingMax,               MEMUNIT,  "0 bytes"),
  V(AccountingStart,             STRING,   NULL),
  V(Address,                     STRING,   NULL),
  V(AllowInvalidNodes,           CSV,      "middle,rendezvous"),
  V(AllowNonRFC953Hostnames,     BOOL,     "0"),
  V(AssumeReachable,             BOOL,     "0"),
  V(AuthDirBadExit,              LINELIST, NULL),
  V(AuthDirInvalid,              LINELIST, NULL),
  V(AuthDirReject,               LINELIST, NULL),
  V(AuthDirRejectUnlisted,       BOOL,     "0"),
  V(AuthDirListBadExits,         BOOL,     "0"),
  VAR("AuthoritativeDirectory",  BOOL, AuthoritativeDir,    "0"),
  V(AutomapHostsOnResolve,       BOOL,     "0"),
  V(AutomapHostsSuffixes,        CSV,      ".onion,.exit"),
  V(AvoidDiskWrites,             BOOL,     "0"),
143
144
  V(BandwidthBurst,              MEMUNIT,  "10 MB"),
  V(BandwidthRate,               MEMUNIT,  "5 MB"),
145
146
  V(BridgeAuthoritativeDir,      BOOL,     "0"),
  VAR("Bridge",                  LINELIST, Bridges,    NULL),
147
  V(BridgeRelay,                 BOOL,     "0"),
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
  V(CircuitBuildTimeout,         INTERVAL, "1 minute"),
  V(CircuitIdleTimeout,          INTERVAL, "1 hour"),
  V(ClientDNSRejectInternalAddresses, BOOL,"1"),
  V(ClientOnly,                  BOOL,     "0"),
  V(ConnLimit,                   UINT,     "1000"),
  V(ConstrainedSockets,          BOOL,     "0"),
  V(ConstrainedSockSize,         MEMUNIT,  "8192"),
  V(ContactInfo,                 STRING,   NULL),
  V(ControlListenAddress,        LINELIST, NULL),
  V(ControlPort,                 UINT,     "0"),
  V(ControlSocket,               LINELIST, NULL),
  V(CookieAuthentication,        BOOL,     "0"),
  V(CookieAuthFileGroupReadable, BOOL,     "0"),
  V(CookieAuthFile,              STRING,   NULL),
  V(DataDirectory,               STRING,   NULL),
163
  OBSOLETE("DebugLogFile"),
164
165
  V(DirAllowPrivateAddresses,    BOOL,     NULL),
  V(DirListenAddress,            LINELIST, NULL),
166
  OBSOLETE("DirFetchPeriod"),
167
168
  V(DirPolicy,                   LINELIST, NULL),
  V(DirPort,                     UINT,     "0"),
169
  OBSOLETE("DirPostPeriod"),
170
171
172
173
174
175
176
177
178
179
  VAR("DirServer",               LINELIST, DirServers, NULL),
  V(DNSPort,                     UINT,     "0"),
  V(DNSListenAddress,            LINELIST, NULL),
  V(DownloadExtraInfo,           BOOL,     "0"),
  V(EnforceDistinctSubnets,      BOOL,     "1"),
  V(EntryNodes,                  STRING,   NULL),
  V(ExcludeNodes,                STRING,   NULL),
  V(ExitNodes,                   STRING,   NULL),
  V(ExitPolicy,                  LINELIST, NULL),
  V(ExitPolicyRejectPrivate,     BOOL,     "1"),
180
  V(FallbackNetworkstatusFile,   STRING,
181
    SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "fallback-consensus"),
182
183
184
185
186
187
188
189
190
  V(FascistFirewall,             BOOL,     "0"),
  V(FirewallPorts,               CSV,      ""),
  V(FastFirstHopPK,              BOOL,     "1"),
  V(FetchServerDescriptors,      BOOL,     "1"),
  V(FetchHidServDescriptors,     BOOL,     "1"),
  V(FetchUselessDescriptors,     BOOL,     "0"),
  V(Group,                       STRING,   NULL),
  V(HardwareAccel,               BOOL,     "0"),
  V(HashedControlPassword,       STRING,   NULL),
191
  V(HidServDirectoryV2,          BOOL,     "0"),
Nick Mathewson's avatar
Nick Mathewson committed
192
193
194
195
196
  VAR("HiddenServiceDir",    LINELIST_S, RendConfigLines,    NULL),
  VAR("HiddenServiceExcludeNodes", LINELIST_S, RendConfigLines, NULL),
  VAR("HiddenServiceNodes",  LINELIST_S, RendConfigLines,    NULL),
  VAR("HiddenServiceOptions",LINELIST_V, RendConfigLines,    NULL),
  VAR("HiddenServicePort",   LINELIST_S, RendConfigLines,    NULL),
197
  VAR("HiddenServiceVersion",LINELIST_S, RendConfigLines,    NULL),
198
199
200
201
202
203
  V(HSAuthoritativeDir,          BOOL,     "0"),
  V(HSAuthorityRecordStats,      BOOL,     "0"),
  V(HttpProxy,                   STRING,   NULL),
  V(HttpProxyAuthenticator,      STRING,   NULL),
  V(HttpsProxy,                  STRING,   NULL),
  V(HttpsProxyAuthenticator,     STRING,   NULL),
204
  OBSOLETE("IgnoreVersion"),
205
  V(KeepalivePeriod,             INTERVAL, "5 minutes"),
206
  V(LearnAuthorityAddrFromCerts, BOOL,     "1"),
207
  VAR("Log",                     LINELIST, Logs,             NULL),
208
  OBSOLETE("LinkPadding"),
209
210
  OBSOLETE("LogLevel"),
  OBSOLETE("LogFile"),
211
  V(LongLivedPorts,              CSV,
212
                         "21,22,706,1863,5050,5190,5222,5223,6667,6697,8300"),
213
214
215
216
  VAR("MapAddress",              LINELIST, AddressMap,           NULL),
  V(MaxAdvertisedBandwidth,      MEMUNIT,  "1 GB"),
  V(MaxCircuitDirtiness,         INTERVAL, "10 minutes"),
  V(MaxOnionsPending,            UINT,     "100"),
217
  OBSOLETE("MonthlyAccountingStart"),
218
219
  V(MyFamily,                    STRING,   NULL),
  V(NewCircuitPeriod,            INTERVAL, "30 seconds"),
220
  VAR("NamingAuthoritativeDirectory",BOOL, NamingAuthoritativeDir, "0"),
221
222
223
224
225
226
227
228
229
230
  V(NatdListenAddress,           LINELIST, NULL),
  V(NatdPort,                    UINT,     "0"),
  V(Nickname,                    STRING,   NULL),
  V(NoPublish,                   BOOL,     "0"),
  VAR("NodeFamily",              LINELIST, NodeFamilies,         NULL),
  V(NumCpus,                     UINT,     "1"),
  V(NumEntryGuards,              UINT,     "3"),
  V(ORListenAddress,             LINELIST, NULL),
  V(ORPort,                      UINT,     "0"),
  V(OutboundBindAddress,         STRING,   NULL),
231
  OBSOLETE("PathlenCoinWeight"),
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
  V(PidFile,                     STRING,   NULL),
  V(PreferTunneledDirConns,      BOOL,     "0"),
  V(ProtocolWarnings,            BOOL,     "0"),
  V(PublishServerDescriptor,     CSV,      "v1,v2"),
  V(PublishHidServDescriptors,   BOOL,     "1"),
  V(ReachableAddresses,          LINELIST, NULL),
  V(ReachableDirAddresses,       LINELIST, NULL),
  V(ReachableORAddresses,        LINELIST, NULL),
  V(RecommendedVersions,         LINELIST, NULL),
  V(RecommendedClientVersions,   LINELIST, NULL),
  V(RecommendedServerVersions,   LINELIST, NULL),
  V(RedirectExit,                LINELIST, NULL),
  V(RelayBandwidthBurst,         MEMUNIT,  "0"),
  V(RelayBandwidthRate,          MEMUNIT,  "0"),
  V(RendExcludeNodes,            STRING,   NULL),
  V(RendNodes,                   STRING,   NULL),
  V(RendPostPeriod,              INTERVAL, "1 hour"),
  V(RephistTrackTime,            INTERVAL, "24 hours"),
250
  OBSOLETE("RouterFile"),
251
252
253
254
255
256
257
258
259
  V(RunAsDaemon,                 BOOL,     "0"),
  V(RunTesting,                  BOOL,     "0"),
  V(SafeLogging,                 BOOL,     "1"),
  V(SafeSocks,                   BOOL,     "0"),
  V(ServerDNSAllowNonRFC953Hostnames, BOOL,"0"),
  V(ServerDNSDetectHijacking,    BOOL,     "1"),
  V(ServerDNSResolvConfFile,     STRING,   NULL),
  V(ServerDNSSearchDomains,      BOOL,     "0"),
  V(ServerDNSTestAddresses,      CSV,
260
      "www.google.com,www.mit.edu,www.yahoo.com,www.slashdot.org"),
261
262
263
264
265
  V(ShutdownWaitLength,          INTERVAL, "30 seconds"),
  V(SocksListenAddress,          LINELIST, NULL),
  V(SocksPolicy,                 LINELIST, NULL),
  V(SocksPort,                   UINT,     "9050"),
  V(SocksTimeout,                INTERVAL, "2 minutes"),
266
  OBSOLETE("StatusFetchPeriod"),
267
268
  V(StrictEntryNodes,            BOOL,     "0"),
  V(StrictExitNodes,             BOOL,     "0"),
269
  OBSOLETE("SysLog"),
270
271
272
273
  V(TestSocks,                   BOOL,     "0"),
  V(TestVia,                     STRING,   NULL),
  V(TrackHostExits,              CSV,      NULL),
  V(TrackHostExitsExpire,        INTERVAL, "30 minutes"),
274
  OBSOLETE("TrafficShaping"),
275
276
277
278
279
280
281
  V(TransListenAddress,          LINELIST, NULL),
  V(TransPort,                   UINT,     "0"),
  V(TunnelDirConns,              BOOL,     "0"),
  V(UpdateBridgesFromAuthority,  BOOL,     "0"),
  V(UseBridges,                  BOOL,     "0"),
  V(UseEntryGuards,              BOOL,     "1"),
  V(User,                        STRING,   NULL),
282
  VAR("V1AuthoritativeDirectory",BOOL, V1AuthoritativeDir,   "0"),
283
  VAR("V2AuthoritativeDirectory",BOOL, V2AuthoritativeDir,   "0"),
284
  VAR("V3AuthoritativeDirectory",BOOL, V3AuthoritativeDir,   "0"),
285
286
287
288
  V(V3AuthVotingInterval,        INTERVAL, "1 hour"),
  V(V3AuthVoteDelay,             INTERVAL, "5 minutes"),
  V(V3AuthDistDelay,             INTERVAL, "5 minutes"),
  V(V3AuthNIntervalsValid,       UINT,     "3"),
289
  VAR("VersioningAuthoritativeDirectory",BOOL,VersioningAuthoritativeDir, "0"),
290
291
292
293
  V(VirtualAddrNetwork,          STRING,   "127.192.0.0/10"),
  VAR("__AllDirActionsPrivate",  BOOL,  AllDirActionsPrivate,     "0"),
  VAR("__DisablePredictedCircuits",BOOL,DisablePredictedCircuits, "0"),
  VAR("__LeaveStreamsUnattached",BOOL,  LeaveStreamsUnattached,   "0"),
294
  V(MinUptimeHidServDirectoryV2, INTERVAL, "24 hours"),
295
  { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL }
296
};
297
298
#undef VAR

299
300
#define VAR(name,conftype,member,initvalue)                             \
  { name, CONFIG_TYPE_ ## conftype, STRUCT_OFFSET(or_state_t, member),  \
301
      initvalue }
302
static config_var_t _state_vars[] = {
303
304
305
306
307
  V(AccountingBytesReadInInterval,    MEMUNIT,  NULL),
  V(AccountingBytesWrittenInInterval, MEMUNIT,  NULL),
  V(AccountingExpectedUsage,          MEMUNIT,  NULL),
  V(AccountingIntervalStart,          ISOTIME,  NULL),
  V(AccountingSecondsActive,          INTERVAL, NULL),
Roger Dingledine's avatar
Roger Dingledine committed
308

309
310
311
  VAR("EntryGuard",              LINELIST_S,  EntryGuards,             NULL),
  VAR("EntryGuardDownSince",     LINELIST_S,  EntryGuards,             NULL),
  VAR("EntryGuardUnlistedSince", LINELIST_S,  EntryGuards,             NULL),
312
  VAR("EntryGuardAddedBy",       LINELIST_S,  EntryGuards,             NULL),
313
  V(EntryGuards,                 LINELIST_V,  NULL),
Nick Mathewson's avatar
Nick Mathewson committed
314

315
316
317
318
319
320
  V(BWHistoryReadEnds,                ISOTIME,  NULL),
  V(BWHistoryReadInterval,            UINT,     "900"),
  V(BWHistoryReadValues,              CSV,      ""),
  V(BWHistoryWriteEnds,               ISOTIME,  NULL),
  V(BWHistoryWriteInterval,           UINT,     "900"),
  V(BWHistoryWriteValues,             CSV,      ""),
321

322
  V(TorVersion,                       STRING,   NULL),
323

324
325
  V(LastRotatedOnionKey,              ISOTIME,  NULL),
  V(LastWritten,                      ISOTIME,  NULL),
326

327
  { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL }
328
329
};

330
#undef VAR
331
#undef V
332
333
#undef OBSOLETE

334
335
/** Represents an English description of a configuration variable; used when
 * generating configuration file comments. */
336
337
338
339
340
341
typedef struct config_var_description_t {
  const char *name;
  const char *description;
} config_var_description_t;

static config_var_description_t options_description[] = {
342
  /* ==== general options */
343
344
  { "AvoidDiskWrites", "If non-zero, try to write to disk less frequently than"
    " we would otherwise." },
345
346
347
348
349
  { "BandwidthRate", "A token bucket limits the average incoming bandwidth on "
    "this node to the specified number of bytes per second." },
  { "BandwidthBurst", "Limit the maximum token buffer size (also known as "
    "burst) to the given number of bytes." },
  { "ConnLimit", "Maximum number of simultaneous sockets allowed." },
350
351
352
353
354
  { "ConstrainedSockets", "Shrink tx and rx buffers for sockets to avoid "
    "system limits on vservers and related environments.  See man page for "
    "more information regarding this option." },
  { "ConstrainedSockSize", "Limit socket buffers to this size when "
    "ConstrainedSockets is enabled." },
355
356
357
358
359
360
361
  /*  ControlListenAddress */
  { "ControlPort", "If set, Tor will accept connections from the same machine "
    "(localhost only) on this port, and allow those connections to control "
    "the Tor process using the Tor Control Protocol (described in"
    "control-spec.txt).", },
  { "CookieAuthentication", "If this option is set to 1, don't allow any "
    "connections to the control port except when the connecting process "
362
    "can read a file that Tor creates in its data directory." },
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
  { "DataDirectory", "Store working data, state, keys, and caches here." },
  { "DirServer", "Tor only trusts directories signed with one of these "
    "servers' keys.  Used to override the standard list of directory "
    "authorities." },
  /* { "FastFirstHopPK", "" }, */
  /* FetchServerDescriptors, FetchHidServDescriptors,
   * FetchUselessDescriptors */
  { "Group", "On startup, setgid to this group." },
  { "HardwareAccel", "If set, Tor tries to use hardware crypto accelerators "
    "when it can." },
  /* HashedControlPassword */
  { "HTTPProxy", "Force Tor to make all HTTP directory requests through this "
    "host:port (or host:80 if port is not set)." },
  { "HTTPProxyAuthenticator", "A username:password pair to be used with "
    "HTTPProxy." },
  { "HTTPSProxy", "Force Tor to make all TLS (SSL) connectinos through this "
    "host:port (or host:80 if port is not set)." },
  { "HTTPSProxyAuthenticator", "A username:password pair to be used with "
    "HTTPSProxy." },
  { "KeepalivePeriod", "Send a padding cell every N seconds to keep firewalls "
    "from closing our connections while Tor is not in use." },
  { "Log", "Where to send logging messages.  Format is "
    "minSeverity[-maxSeverity] (stderr|stdout|syslog|file FILENAME)." },
  { "OutboundBindAddress", "Make all outbound connections originate from the "
387
    "provided IP address (only useful for multiple network interfaces)." },
388
389
  { "PIDFile", "On startup, write our PID to this file. On clean shutdown, "
    "remove the file." },
390
  { "PreferTunneledDirConns", "If non-zero, avoid directory servers that "
391
    "don't support tunneled connections." },
392
  /* PreferTunneledDirConns */
393
394
395
396
397
398
  /* ProtocolWarnings */
  /* RephistTrackTime */
  { "RunAsDaemon", "If set, Tor forks and daemonizes to the background when "
    "started.  Unix only." },
  { "SafeLogging", "If set to 0, Tor logs potentially sensitive strings "
    "rather than replacing them with the string [scrubbed]." },
399
400
401
  { "TunnelDirConns", "If non-zero, when a directory server we contact "
    "supports it, we will build a one-hop circuit and make an encrypted "
    "connection via its ORPort." },
402
403
404
405
406
  { "User", "On startup, setuid to this user" },

  /* ==== client options */
  { "AllowInvalidNodes", "Where on our circuits should Tor allow servers "
    "that the directory authorities haven't called \"valid\"?" },
407
408
  { "AllowNonRFC953Hostnames", "If set to 1, we don't automatically reject "
    "hostnames for having invalid characters." },
409
410
  /*  CircuitBuildTimeout, CircuitIdleTimeout */
  { "ClientOnly", "If set to 1, Tor will under no circumstances run as a "
411
    "server, even if ORPort is enabled." },
412
  { "EntryNodes", "A list of preferred entry nodes to use for the first hop "
413
    "in circuits, when possible." },
414
415
416
417
418
  /* { "EnforceDistinctSubnets" , "" }, */
  { "ExitNodes", "A list of preferred nodes to use for the last hop in "
    "circuits, when possible." },
  { "ExcludeNodes", "A list of nodes never to use when building a circuit." },
  { "FascistFirewall", "If set, Tor will only create outgoing connections to "
419
420
    "servers running on the ports listed in FirewallPorts." },
  { "FirewallPorts", "A list of ports that we can connect to.  Only used "
421
422
    "when FascistFirewall is set." },
  { "LongLivedPorts", "A list of ports for services that tend to require "
423
    "high-uptime connections." },
424
425
426
  { "MapAddress", "Force Tor to treat all requests for one address as if "
    "they were for another." },
  { "NewCircuitPeriod", "Force Tor to consider whether to build a new circuit "
427
    "every NUM seconds." },
428
  { "MaxCircuitDirtiness", "Do not attach new streams to a circuit that has "
429
    "been used more than this many seconds ago." },
430
431
432
433
434
435
436
437
438
  /* NatdPort, NatdListenAddress */
  { "NodeFamily", "A list of servers that constitute a 'family' and should "
    "never be used in the same circuit." },
  { "NumEntryGuards", "How many entry guards should we keep at a time?" },
  /* PathlenCoinWeight */
  { "ReachableAddresses", "Addresses we can connect to, as IP/bits:port-port. "
    "By default, we assume all addresses are reachable." },
  /* reachablediraddresses, reachableoraddresses. */
  { "RendNodes", "A list of preferred nodes to use for a rendezvous point, "
439
    "when possible." },
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
  { "RendExcludenodes", "A list of nodes never to use as rendezvous points." },
  /* SafeSOCKS */
  { "SOCKSPort", "The port where we listen for SOCKS connections from "
    "applications." },
  { "SOCKSListenAddress", "Bind to this address to listen to connections from "
    "SOCKS-speaking applications." },
  { "SOCKSPolicy", "Set an entry policy to limit which addresses can connect "
    "to the SOCKSPort." },
  /* SocksTimeout */
  { "StrictExitNodes", "If set, Tor will fail to operate when none of the "
    "configured ExitNodes can be used." },
  { "StrictEntryNodes", "If set, Tor will fail to operate when none of the "
    "configured EntryNodes can be used." },
  /* TestSocks */
  { "TrackHostsExit", "Hosts and domains which should, if possible, be "
455
    "accessed from the same exit node each time we connect to them." },
456
457
458
459
  { "TrackHostsExitExpire", "Time after which we forget which exit we were "
    "using to connect to hosts in TrackHostsExit." },
  /* "TransPort", "TransListenAddress */
  { "UseEntryGuards", "Set to 0 if we want to pick from the whole set of "
460
461
    "servers for the first position in each circuit, rather than picking a "
    "set of 'Guards' to prevent profiling attacks." },
462
463

  /* === server options */
464
  { "Address", "The advertised (external) address we should use." },
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
  /* Accounting* options. */
  /* AssumeReachable */
  { "ContactInfo", "Administrative contact information to advertise for this "
    "server." },
  { "ExitPolicy", "Address/port ranges for which to accept or reject outgoing "
    "connections on behalf of Tor users." },
  /*  { "ExitPolicyRejectPrivate, "" }, */
  { "MaxAdvertisedBandwidth", "If set, we will not advertise more than this "
    "amount of bandwidth for our bandwidth rate, regardless of how much "
    "bandwidth we actually detect." },
  { "MaxOnionsPending", "Reject new attempts to extend circuits when we "
    "already have this many pending." },
  { "MyFamily", "Declare a list of other servers as belonging to the same "
    "family as this one, so that clients will not use two from the same "
    "family in the same circuit." },
  { "Nickname", "Set the server nickname." },
481
  { "NoPublish", "{DEPRECATED}" },
482
483
484
485
486
  { "NumCPUs", "How many processes to use at once for public-key crypto." },
  { "ORPort", "Advertise this port to listen for connections from Tor clients "
    "and servers." },
  { "ORListenAddress", "Bind to this address to listen for connections from "
    "clients and servers, instead of the default 0.0.0.0:ORPort." },
487
  { "PublishServerDescriptor", "Set to 0 to keep the server from "
488
    "uploading info to the directory authorities." },
489
490
491
492
493
494
495
496
  /*{ "RedirectExit", "When an outgoing connection tries to connect to a "
   *"given address, redirect it to another address instead." },
   */
  /* ServerDNS: DetectHijacking, ResolvConfFile, SearchDomains */
  { "ShutdownWaitLength", "Wait this long for clients to finish when "
    "shutting down because of a SIGINT." },
  /* { "TestVia", } */

497
  /* === directory cache options */
498
499
  { "DirPort", "Serve directory information from this port, and act as a "
    "directory cache." },
500
  { "DirListenAddress", "Bind to this address to listen for connections from "
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
    "clients and servers, instead of the default 0.0.0.0:DirPort." },
  { "DirPolicy", "Set a policy to limit who can connect to the directory "
    "port" },

  /*  Authority options: AuthDirBadExit, AuthDirInvalid, AuthDirReject,
   * AuthDirRejectUnlisted, AuthDirListBadExits, AuthoritativeDirectory,
   * DirAllowPrivateAddresses, HSAuthoritativeDir,
   * NamingAuthoritativeDirectory, RecommendedVersions,
   * RecommendedClientVersions, RecommendedServerVersions, RendPostPeriod,
   * RunTesting, V1AuthoritativeDirectory, VersioningAuthoritativeDirectory, */

  /* Hidden service options: HiddenService: dir,excludenodes, nodes,
   * options, port.  PublishHidServDescriptor */

  /* Nonpersistent options: __LeaveStreamsUnattached, __AllDirActionsPrivate */
516
517
518
519
  { NULL, NULL },
};

static config_var_description_t state_description[] = {
520
  { "AccountingBytesReadInInterval",
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
    "How many bytes have we read in this accounting period?" },
  { "AccountingBytesWrittenInInterval",
    "How many bytes have we written in this accounting period?" },
  { "AccountingExpectedUsage",
    "How many bytes did we expect to use per minute? (0 for no estimate.)" },
  { "AccountingIntervalStart", "When did this accounting period begin?" },
  { "AccountingSecondsActive", "How long have we been awake in this period?" },

  { "BWHistoryReadEnds", "When does the last-recorded read-interval end?" },
  { "BWHistoryReadInterval", "How long is each read-interval (in seconds)?" },
  { "BWHistoryReadValues", "Number of bytes read in each interval." },
  { "BWHistoryWriteEnds", "When does the last-recorded write-interval end?" },
  { "BWHistoryWriteInterval", "How long is each write-interval (in seconds)?"},
  { "BWHistoryWriteValues", "Number of bytes written in each interval." },

536
537
  { "EntryGuard", "One of the nodes we have chosen as a fixed entry" },
  { "EntryGuardDownSince",
538
    "The last entry guard has been unreachable since this time." },
539
  { "EntryGuardUnlistedSince",
540
    "The last entry guard has been unusable since this time." },
Roger Dingledine's avatar
Roger Dingledine committed
541

542
543
544
  { "LastRotatedOnionKey",
    "The last time at which we changed the medium-term private key used for "
    "building circuits." },
545
546
547
  { "LastWritten", "When was this state file last regenerated?" },

  { "TorVersion", "Which version of Tor generated this state file?" },
548
549
550
  { NULL, NULL },
};

551
/** Type of a callback to validate whether a given configuration is
Roger Dingledine's avatar
Roger Dingledine committed
552
 * well-formed and consistent. See options_trial_assign() for documentation
553
 * of arguments. */
554
typedef int (*validate_fn_t)(void*,void*,int,char**);
555

556
557
558
/** Information on the keys, value types, key-to-struct-member mappings,
 * variable descriptions, validation functions, and abbreviations for a
 * configuration or storage format. */
559
typedef struct {
560
561
562
  size_t size; /**< Size of the struct that everything gets parsed into. */
  uint32_t magic; /**< Required 'magic value' to make sure we have a struct
                   * of the right type. */
Roger Dingledine's avatar
Roger Dingledine committed
563
  off_t magic_offset; /**< Offset of the magic value within the struct. */
564
  config_abbrev_t *abbrevs; /**< List of abbreviations that we expand when
Roger Dingledine's avatar
Roger Dingledine committed
565
                             * parsing this format. */
566
567
568
569
  config_var_t *vars; /**< List of variables we recognize, their default
                       * values, and where we stick them in the structure. */
  validate_fn_t validate_fn; /**< Function to validate config. */
  /** Documentation for configuration variables. */
570
  config_var_description_t *descriptions;
Roger Dingledine's avatar
Roger Dingledine committed
571
572
573
  /** If present, extra is a LINELIST variable for unrecognized
   * lines.  Otherwise, unrecognized lines are an error. */
  config_var_t *extra;
574
575
} config_format_t;

576
577
/** Macro: assert that <b>cfg</b> has the right magic field for format
 * <b>fmt</b>. */
578
#define CHECK(fmt, cfg) STMT_BEGIN                                      \
579
    tor_assert(fmt && cfg);                                             \
580
    tor_assert((fmt)->magic ==                                          \
581
               *(uint32_t*)STRUCT_VAR_P(cfg,fmt->magic_offset));        \
582
  STMT_END
583

584
static void config_line_append(config_line_t **lst,
585
                               const char *key, const char *val);
586
587
static void option_clear(config_format_t *fmt, or_options_t *options,
                         config_var_t *var);
588
static void option_reset(config_format_t *fmt, or_options_t *options,
589
                         config_var_t *var, int use_defaults);
590
static void config_free(config_format_t *fmt, void *options);
591
static int option_is_same(config_format_t *fmt,
592
593
                          or_options_t *o1, or_options_t *o2,
                          const char *name);
594
static or_options_t *options_dup(config_format_t *fmt, or_options_t *old);
595
596
597
static int options_validate(or_options_t *old_options, or_options_t *options,
                            int from_setconf, char **msg);
static int options_act_reversible(or_options_t *old_options, char **msg);
598
static int options_act(or_options_t *old_options);
599
600
static int options_transition_allowed(or_options_t *old, or_options_t *new,
                                      char **msg);
601
602
603
604
static int options_transition_affects_workers(or_options_t *old_options,
                                              or_options_t *new_options);
static int options_transition_affects_descriptor(or_options_t *old_options,
                                                 or_options_t *new_options);
605
static int check_nickname_list(const char *lst, const char *name, char **msg);
606
static void config_register_addressmaps(or_options_t *options);
607

608
static int parse_bridge_line(const char *line, int validate_only);
609
static int parse_dir_server_line(const char *line, int validate_only);
610
static int parse_redirect_line(smartlist_t *result,
611
                               config_line_t *line, char **msg);
612
613
static int parse_log_severity_range(const char *range, int *min_out,
                                    int *max_out);
614
static int validate_data_directory(or_options_t *options);
615
static int write_configuration_file(const char *fname, or_options_t *options);
616
static config_line_t *get_assigned_option(config_format_t *fmt,
617
                                     or_options_t *options, const char *key);
618
static void config_init(config_format_t *fmt, void *options);
619
static int or_state_validate(or_state_t *old_options, or_state_t *options,
620
                             int from_setconf, char **msg);
621
622
static int or_state_load(void);
static int options_init_logs(or_options_t *options, int validate_only);
623

624
625
static uint64_t config_parse_memunit(const char *s, int *ok);
static int config_parse_interval(const char *s, int *ok);
626
static void print_svn_version(void);
627
static void init_libevent(void);
628
static int opt_streq(const char *s1, const char *s2);
629
/** Versions of libevent. */
630
typedef enum {
631
632
  /* Note: we compare these, so it's important that "old" precede everything,
   * and that "other" come last. */
633
  LE_OLD=0, LE_10C, LE_10D, LE_10E, LE_11, LE_11A, LE_11B, LE_12, LE_12A,
634
  LE_13, LE_13A, LE_13B, LE_13C, LE_13D,
635
  LE_OTHER
636
637
} le_version_t;
static le_version_t decode_libevent_version(void);
638
#if defined(HAVE_EVENT_GET_VERSION) && defined(HAVE_EVENT_GET_METHOD)
639
static void check_libevent_version(const char *m, int server);
640
#endif
641

642
/** Magic value for or_options_t. */
643
644
#define OR_OPTIONS_MAGIC 9090909

645
/** Configuration format for or_options_t. */
646
static config_format_t options_format = {
647
648
649
  sizeof(or_options_t),
  OR_OPTIONS_MAGIC,
  STRUCT_OFFSET(or_options_t, _magic),
650
651
652
  _option_abbrevs,
  _option_vars,
  (validate_fn_t)options_validate,
653
654
  options_description,
  NULL
655
656
};

657
/** Magic value for or_state_t. */
658
659
#define OR_STATE_MAGIC 0x57A73f57

660
661
/** "Extra" variable in the state that receives lines we can't parse. This
 * lets us preserve options from versions of Tor newer than us. */
662
663
664
665
static config_var_t state_extra_var = {
  "__extra", CONFIG_TYPE_LINELIST, STRUCT_OFFSET(or_state_t, ExtraLines), NULL
};

666
/** Configuration format for or_state_t. */
667
668
669
670
static config_format_t state_format = {
  sizeof(or_state_t),
  OR_STATE_MAGIC,
  STRUCT_OFFSET(or_state_t, _magic),
671
  _state_abbrevs,
672
673
  _state_vars,
  (validate_fn_t)or_state_validate,
674
675
  state_description,
  &state_extra_var,
676
677
};

678
679
680
681
682
/*
 * Functions to read and write the global options pointer.
 */

/** Command-line and config-file options. */
683
static or_options_t *global_options = NULL;
Roger Dingledine's avatar
Roger Dingledine committed
684
/** Name of most recently read torrc file. */
685
static char *torrc_fname = NULL;
686
/** Persistent serialized state. */
687
static or_state_t *global_state = NULL;
688

689
/** Allocate an empty configuration object of a given format type. */
690
691
692
static void *
config_alloc(config_format_t *fmt)
{
693
  void *opts = tor_malloc_zero(fmt->size);
694
  *(uint32_t*)STRUCT_VAR_P(opts, fmt->magic_offset) = fmt->magic;
695
696
697
698
  CHECK(fmt, opts);
  return opts;
}

699
700
/** Return the currently configured options. */
or_options_t *
701
702
get_options(void)
{
703
704
705
  tor_assert(global_options);
  return global_options;
}
706

707
708
709
/** Change the current global options to contain <b>new_val</b> instead of
 * their current value; take action based on the new value; free the old value
 * as necessary.
710
 */
711
int
712
set_options(or_options_t *new_val, char **msg)
713
{
714
  or_options_t *old_options = global_options;
715
  global_options = new_val;
716
717
  /* Note that we pass the *old* options below, for comparison. It
   * pulls the new options directly out of global_options. */
718
719
  if (options_act_reversible(old_options, msg)<0) {
    tor_assert(*msg);
720
721
722
    global_options = old_options;
    return -1;
  }
723
  if (options_act(old_options) < 0) { /* acting on the options failed. die. */
724
    log_err(LD_BUG,
Roger Dingledine's avatar
Roger Dingledine committed
725
            "Acting on config options left us in a broken state. Dying.");
726
727
728
    exit(1);
  }
  if (old_options)
729
    config_free(&options_format, old_options);
730
731

  return 0;
732
733
}

Roger Dingledine's avatar
Roger Dingledine committed
734
extern const char tor_svn_revision[]; /* from tor_main.c */
735

736
737
static char *_version = NULL;

738
739
740
741
/** Return the current Tor version, possibly */
const char *
get_version(void)
{
742
  if (_version == NULL) {
743
744
    if (strlen(tor_svn_revision)) {
      size_t len = strlen(VERSION)+strlen(tor_svn_revision)+8;
745
746
      _version = tor_malloc(len);
      tor_snprintf(_version, len, "%s (r%s)", VERSION, tor_svn_revision);
747
    } else {
748
      _version = tor_strdup(VERSION);
749
750
    }
  }
751
  return _version;
752
753
}

754
755
/** Release all memory and resources held by global configuration structures.
 */
756
757
758
void
config_free_all(void)
{
759
760
761
762
763
764
765
766
  if (global_options) {
    config_free(&options_format, global_options);
    global_options = NULL;
  }
  if (global_state) {
    config_free(&state_format, global_state);
    global_state = NULL;
  }
767
  tor_free(torrc_fname);
768
  tor_free(_version);
769
770
}

771
772
773
774
/** If options->SafeLogging is on, return a not very useful string,
 * else return address.
 */
const char *
775
776
safe_str(const char *address)
{
777
  tor_assert(address);
778
779
780
781
782
783
  if (get_options()->SafeLogging)
    return "[scrubbed]";
  else
    return address;
}

784
/** Equivalent to escaped(safe_str(address)).  See reentrancy note on
785
786
 * escaped(): don't use this outside the main thread, or twice in the same
 * log statement. */
787
788
789
790
791
792
793
794
795
const char *
escaped_safe_str(const char *address)
{
  if (get_options()->SafeLogging)
    return "[scrubbed]";
  else
    return escaped(address);
}

796
797
798
799
/** Add the default directory servers directly into the trusted dir list. */
static void
add_default_trusted_dirservers(void)
{
800
  int i;
801
  const char *dirservers[] = {
802
803
    "moria1 v1 orport=9001 v3ident=5420FD8EA46BD4290F1D07A1883C9D85ECC486C4 "
      "128.31.0.34:9031 FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441",
804
    "moria2 v1 orport=9002 128.31.0.34:9032 "
805
      "719B E45D E224 B607 C537 07D0 E214 3E2D 423E 74CF",
Peter Palfrader's avatar
Peter Palfrader committed
806
807
    "tor26 v1 orport=443 v3ident=A9AC67E64B200BBF2FA26DF194AC0469E2A948C6 "
      "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
808
    "lefkada orport=443 140.247.60.64:80 "
809
      "38D4 F5FC F7B1 0232 28B8 95EA 56ED E7D5 CCDC AF32",
810
811
    "dizum 194.109.206.212:80 "
      "7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
812
813
    "Tonga orport=443 bridge no-v2 82.94.251.206:80 "
      "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
814
815
    "ides orport=9090 no-v2 v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 "
      "216.224.124.114:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B",
816
    NULL
817
  };
818
819
  for (i=0; dirservers[i]; i++)
    parse_dir_server_line(dirservers[i], 0);
820
821
}

822
823
824
825
826
827
828
/** Fetch the active option list, and take actions based on it. All of the
 * things we do should survive being done repeatedly.  If present,
 * <b>old_options</b> contains the previous value of the options.
 *
 * Return 0 if all goes well, return -1 if things went badly.
 */
static int
829
options_act_reversible(or_options_t *old_options, char **msg)
830
831
832
833
834
835
836
837
{
  smartlist_t *new_listeners = smartlist_create();
  smartlist_t *replaced_listeners = smartlist_create();
  static int libevent_initialized = 0;
  or_options_t *options = get_options();
  int running_tor = options->command == CMD_RUN_TOR;
  int set_conn_limit = 0;
  int r = -1;
838
  int logs_marked = 0;
839

840
  /* Daemonize _first_, since we only want to open most of this stuff in
841
842
   * the subprocess.  Libevent bases can't be reliably inherited across
   * processes. */
843
844
845
846
847
  if (running_tor && options->RunAsDaemon) {
    /* No need to roll back, since you can't change the value. */
    start_daemon();
  }

848
849
850
851
852
853
854
855
#ifndef HAVE_SYS_UN_H
  if (options->ControlSocket) {
    *msg = tor_strdup("Unix domain sockets (ControlSocket) not supported"
                      " on this OS/with this build.");
    goto rollback;
  }
#endif

856
857
858
859
860
861
862
863
864
  if (running_tor) {
    /* We need to set the connection limit before we can open the listeners. */
    options->_ConnLimit =
      set_max_file_descriptors((unsigned)options->ConnLimit, MAXCONNECTIONS);
    if (options->_ConnLimit < 0) {
      *msg = tor_strdup("Problem with ConnLimit value. See logs for details.");
      goto rollback;
    }
    set_conn_limit = 1;
865

866
867
868
869
870
871
    /* Set up libevent.  (We need to do this before we can register the
     * listeners as listeners.) */
    if (running_tor && !libevent_initialized) {
      init_libevent();
      libevent_initialized = 1;
    }
872

873
874
    /* Launch the listeners.  (We do this before we setuid, so we can bind to
     * ports under 1024.) */
875
    if (retry_all_listeners(replaced_listeners, new_listeners) < 0) {
876
877
878
      *msg = tor_strdup("Failed to bind one of the listener ports.");
      goto rollback;
    }
879
880
  }

881
882
883
884
  /* Setuid/setgid as appropriate */
  if (options->User || options->Group) {
    if (switch_id(options->User, options->Group) != 0) {
      /* No need to roll back, since you can't change the value. */
885
886
      *msg = tor_strdup("Problem with User or Group value. "
                        "See logs for details.");
887
888
889
890
891
892
      goto done;
    }
  }

  /* Ensure data directory is private; create if possible. */
  if (check_private_dir(options->DataDirectory, CPD_CREATE)<0) {
893
894
895
896
897
    char buf[1024];
    int tmp = tor_snprintf(buf, sizeof(buf),
              "Couldn't access/create private data directory \"%s\"",
              options->DataDirectory);
    *msg = tor_strdup(tmp >= 0 ? buf : "internal error");
898
    goto done;
899
    /* No need to roll back, since you can't change the value. */
900
901
902
  }

  /* Bail out at this point if we're not going to be a client or server:
903
   * we don't run Tor itself. */
904
  if (!running_tor)
905
906
    goto commit;

907
908
  mark_logs_temp(); /* Close current logs once new logs are open. */
  logs_marked = 1;
909
910
  if (options_init_logs(options, 0)<0) { /* Configure the log(s) */
    *msg = tor_strdup("Failed to init Log options. See logs for details.");
911
    goto rollback;
912
  }
913

914
915
 commit:
  r = 0;
916
917
918
919
920
  if (logs_marked) {
    close_temp_logs();
    add_callback_log(LOG_ERR, LOG_ERR, control_event_logmsg);
    control_adjust_event_log_severity();
  }
921
922
  SMARTLIST_FOREACH(replaced_listeners, connection_t *, conn,
  {
Roger Dingledine's avatar
Roger Dingledine committed
923
924
    log_notice(LD_NET, "Closing old %s on %s:%d",
               conn_type_to_string(conn->type), conn->address, conn->port);
925
926
927
928
929
930
931
    connection_close_immediate(conn);
    connection_mark_for_close(conn);
  });
  goto done;

 rollback:
  r = -1;
932
  tor_assert(*msg);
933

934
935
936
937
938
  if (logs_marked) {
    rollback_log_changes();
    control_adjust_event_log_severity();
  }

939
940
941
942
943
  if (set_conn_limit && old_options)
    set_max_file_descriptors((unsigned)old_options->ConnLimit,MAXCONNECTIONS);

  SMARTLIST_FOREACH(new_listeners, connection_t *, conn,
  {
944
    log_notice(LD_NET, "Closing partially-constructed listener %s on %s:%d",
Roger Dingledine's avatar
Roger Dingledine committed
945
               conn_type_to_string(conn->type), conn->address, conn->port);
946
947
948
949
950
951
952
953
954
955
    connection_close_immediate(conn);
    connection_mark_for_close(conn);
  });

 done:
  smartlist_free(new_listeners);
  smartlist_free(replaced_listeners);
  return r;
}

956
957
958
/** Fetch the active option list, and take actions based on it. All of the
 * things we do should survive being done repeatedly.  If present,
 * <b>old_options</b> contains the previous value of the options.
959
 *
960
 * Return 0 if all goes well, return -1 if it's time to die.
961
 *
962
 * Note: We haven't moved all the "act on new configuration" logic
963
 * here yet.  Some is still in do_hup() and other places.
964
 */
965
966
static int
options_act(or_options_t *old_options)
967
{
968
  config_line_t *cl;
969
970
  char *fn;
  size_t len;
971
  or_options_t *options = get_options();
972
  int running_tor = options->command == CMD_RUN_TOR;
973
  char *msg;
974

975
  if (options->DirServers) {
976
    clear_trusted_dir_servers();
977
978
    for (cl = options->DirServers; cl; cl = cl->next) {
      if (parse_dir_server_line(cl->value, 0)<0) {
Roger Dingledine's avatar
Roger Dingledine committed
979
980
        log_warn(LD_BUG,
                 "Previously validated DirServer line could not be added!");
981
982
        return -1;
      }
983
    }
984
  } else {
985
    if (!smartlist_len(router_get_trusted_dir_servers()))