config.c 179 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-2006, Roger Dingledine, Nick Mathewson.
Roger Dingledine's avatar
Roger Dingledine committed
4
 * Copyright (c) 2007-2008, The Tor Project, Inc. */
5
6
/* See LICENSE for licensing information */
/* $Id$ */
7
8
const char config_c_id[] = \
  "$Id$";
9

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

15
16
#define CONFIG_PRIVATE

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

Nick Mathewson's avatar
Nick Mathewson committed
22
23
/** Enumeration of types which option values can take */
typedef enum config_type_t {
24
  CONFIG_TYPE_STRING = 0,   /**< An arbitrary string. */
25
  CONFIG_TYPE_FILENAME,     /**< A filename: some prefixes get expanded. */
26
  CONFIG_TYPE_UINT,         /**< A non-negative integer less than MAX_INT */
27
28
  CONFIG_TYPE_INTERVAL,     /**< A number of seconds, with optional units*/
  CONFIG_TYPE_MEMUNIT,      /**< A number of bytes, with optional units*/
29
30
  CONFIG_TYPE_DOUBLE,       /**< A floating-point value */
  CONFIG_TYPE_BOOL,         /**< A boolean value, expressed as 0 or 1. */
31
  CONFIG_TYPE_ISOTIME,      /**< An ISO-formated time relative to GMT. */
32
33
  CONFIG_TYPE_CSV,          /**< A list of strings, separated by commas and
                              * optional whitespace. */
34
  CONFIG_TYPE_LINELIST,     /**< Uninterpreted config lines */
35
36
37
38
39
  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.
                             */
40
41
  CONFIG_TYPE_ROUTERSET,    /**< A list of router names, addrs, and fps,
                             * parsed into a routerset_t. */
42
  CONFIG_TYPE_OBSOLETE,     /**< Obsolete (ignored) option. */
Nick Mathewson's avatar
Nick Mathewson committed
43
} config_type_t;
44

45
/** An abbreviation for a configuration option allowed on the command line. */
46
typedef struct config_abbrev_t {
47
48
  const char *abbreviated;
  const char *full;
49
  int commandline_only;
50
  int warn;
51
52
} config_abbrev_t;

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

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

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

Nick Mathewson's avatar
Nick Mathewson committed
115
116
117
118
/** 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>"
 */
119
120
#define VAR(name,conftype,member,initvalue)                             \
  { name, CONFIG_TYPE_ ## conftype, STRUCT_OFFSET(or_options_t, member), \
121
      initvalue }
122
123
124
/** 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
125
/** An entry for config_vars: "The option <b>name</b> is obsolete." */
126
#define OBSOLETE(name) { name, CONFIG_TYPE_OBSOLETE, 0, NULL }
127

Nick Mathewson's avatar
Nick Mathewson committed
128
129
130
131
/** Array of configuration options.  Until we disallow nonstandard
 * abbreviations, order is significant, since the first matching option will
 * be chosen first.
 */
132
static config_var_t _option_vars[] = {
133
  OBSOLETE("AccountingMaxKB"),
134
135
136
137
138
  V(AccountingMax,               MEMUNIT,  "0 bytes"),
  V(AccountingStart,             STRING,   NULL),
  V(Address,                     STRING,   NULL),
  V(AllowInvalidNodes,           CSV,      "middle,rendezvous"),
  V(AllowNonRFC953Hostnames,     BOOL,     "0"),
139
140
141
  V(AlternateBridgeAuthority,    LINELIST, NULL),
  V(AlternateDirAuthority,       LINELIST, NULL),
  V(AlternateHSAuthority,        LINELIST, NULL),
142
  V(AssumeReachable,             BOOL,     "0"),
143
  V(AuthDirBadDir,               LINELIST, NULL),
144
145
146
147
  V(AuthDirBadExit,              LINELIST, NULL),
  V(AuthDirInvalid,              LINELIST, NULL),
  V(AuthDirReject,               LINELIST, NULL),
  V(AuthDirRejectUnlisted,       BOOL,     "0"),
148
  V(AuthDirListBadDirs,          BOOL,     "0"),
149
  V(AuthDirListBadExits,         BOOL,     "0"),
150
151
  V(AuthDirMaxServersPerAddr,    UINT,     "2"),
  V(AuthDirMaxServersPerAuthAddr,UINT,     "5"),
152
153
154
155
  VAR("AuthoritativeDirectory",  BOOL, AuthoritativeDir,    "0"),
  V(AutomapHostsOnResolve,       BOOL,     "0"),
  V(AutomapHostsSuffixes,        CSV,      ".onion,.exit"),
  V(AvoidDiskWrites,             BOOL,     "0"),
156
157
  V(BandwidthBurst,              MEMUNIT,  "10 MB"),
  V(BandwidthRate,               MEMUNIT,  "5 MB"),
158
159
  V(BridgeAuthoritativeDir,      BOOL,     "0"),
  VAR("Bridge",                  LINELIST, Bridges,    NULL),
160
  V(BridgePassword,              STRING,   NULL),
161
  V(BridgeRecordUsageByCountry,  BOOL,     "1"),
162
  V(BridgeRelay,                 BOOL,     "0"),
163
164
165
166
167
168
169
170
171
172
173
174
175
176
  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),
177
  V(DataDirectory,               FILENAME, NULL),
178
  OBSOLETE("DebugLogFile"),
179
  V(DirAllowPrivateAddresses,    BOOL,     NULL),
180
  V(TestingAuthDirTimeToLearnReachability, INTERVAL, "30 minutes"),
181
  V(DirListenAddress,            LINELIST, NULL),
182
  OBSOLETE("DirFetchPeriod"),
183
184
  V(DirPolicy,                   LINELIST, NULL),
  V(DirPort,                     UINT,     "0"),
185
  OBSOLETE("DirPostPeriod"),
186
187
#ifdef ENABLE_GEOIP_STATS
  V(DirRecordUsageByCountry,     BOOL,     "0"),
188
189
190
  V(DirRecordUsageGranularity,   UINT,     "4"),
  V(DirRecordUsageRetainIPs,     INTERVAL, "14 days"),
  V(DirRecordUsageSaveInterval,  INTERVAL, "6 hours"),
191
#endif
192
193
194
195
196
  VAR("DirServer",               LINELIST, DirServers, NULL),
  V(DNSPort,                     UINT,     "0"),
  V(DNSListenAddress,            LINELIST, NULL),
  V(DownloadExtraInfo,           BOOL,     "0"),
  V(EnforceDistinctSubnets,      BOOL,     "1"),
197
  V(EntryNodes,                  ROUTERSET,   NULL),
198
  V(TestingEstimatedDescriptorPropagationTime, INTERVAL, "10 minutes"),
199
200
  V(ExcludeNodes,                ROUTERSET, NULL),
  V(ExcludeExitNodes,            ROUTERSET, NULL),
201
  V(ExitNodes,                   ROUTERSET, NULL),
202
203
  V(ExitPolicy,                  LINELIST, NULL),
  V(ExitPolicyRejectPrivate,     BOOL,     "1"),
204
  V(FallbackNetworkstatusFile,   FILENAME,
205
    SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "fallback-consensus"),
206
207
208
  V(FascistFirewall,             BOOL,     "0"),
  V(FirewallPorts,               CSV,      ""),
  V(FastFirstHopPK,              BOOL,     "1"),
209
  V(FetchDirInfoEarly,           BOOL,     "0"),
210
211
212
  V(FetchServerDescriptors,      BOOL,     "1"),
  V(FetchHidServDescriptors,     BOOL,     "1"),
  V(FetchUselessDescriptors,     BOOL,     "0"),
213
#ifdef WIN32
214
  V(GeoIPFile,                   FILENAME, "<default>"),
215
#else
216
217
  V(GeoIPFile,                   FILENAME,
    SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"),
218
#endif
219
220
  V(Group,                       STRING,   NULL),
  V(HardwareAccel,               BOOL,     "0"),
221
  V(HashedControlPassword,       LINELIST, NULL),
222
  V(HidServDirectoryV2,          BOOL,     "1"),
Nick Mathewson's avatar
Nick Mathewson committed
223
  VAR("HiddenServiceDir",    LINELIST_S, RendConfigLines,    NULL),
224
225
  OBSOLETE("HiddenServiceExcludeNodes"),
  OBSOLETE("HiddenServiceNodes"),
Nick Mathewson's avatar
Nick Mathewson committed
226
227
  VAR("HiddenServiceOptions",LINELIST_V, RendConfigLines,    NULL),
  VAR("HiddenServicePort",   LINELIST_S, RendConfigLines,    NULL),
228
  VAR("HiddenServiceVersion",LINELIST_S, RendConfigLines,    NULL),
229
  VAR("HiddenServiceAuthorizeClient",LINELIST_S,RendConfigLines, NULL),
230
  V(HidServAuth,                 LINELIST, NULL),
231
232
233
234
235
236
  V(HSAuthoritativeDir,          BOOL,     "0"),
  V(HSAuthorityRecordStats,      BOOL,     "0"),
  V(HttpProxy,                   STRING,   NULL),
  V(HttpProxyAuthenticator,      STRING,   NULL),
  V(HttpsProxy,                  STRING,   NULL),
  V(HttpsProxyAuthenticator,     STRING,   NULL),
237
  OBSOLETE("IgnoreVersion"),
238
239
  V(KeepalivePeriod,             INTERVAL, "5 minutes"),
  VAR("Log",                     LINELIST, Logs,             NULL),
240
  OBSOLETE("LinkPadding"),
241
242
  OBSOLETE("LogLevel"),
  OBSOLETE("LogFile"),
243
  V(LongLivedPorts,              CSV,
244
                         "21,22,706,1863,5050,5190,5222,5223,6667,6697,8300"),
245
246
247
248
  VAR("MapAddress",              LINELIST, AddressMap,           NULL),
  V(MaxAdvertisedBandwidth,      MEMUNIT,  "1 GB"),
  V(MaxCircuitDirtiness,         INTERVAL, "10 minutes"),
  V(MaxOnionsPending,            UINT,     "100"),
249
  OBSOLETE("MonthlyAccountingStart"),
250
251
  V(MyFamily,                    STRING,   NULL),
  V(NewCircuitPeriod,            INTERVAL, "30 seconds"),
252
  VAR("NamingAuthoritativeDirectory",BOOL, NamingAuthoritativeDir, "0"),
253
254
255
256
257
258
259
260
261
262
  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),
263
  OBSOLETE("PathlenCoinWeight"),
264
  V(PidFile,                     STRING,   NULL),
265
  V(TestingTorNetwork,           BOOL,     "0"),
Roger Dingledine's avatar
Roger Dingledine committed
266
  V(PreferTunneledDirConns,      BOOL,     "1"),
267
  V(ProtocolWarnings,            BOOL,     "0"),
268
  V(PublishServerDescriptor,     CSV,      "1"),
269
270
271
272
273
274
275
276
  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),
277
  V(RejectPlaintextPorts,        CSV,      ""),
278
279
  V(RelayBandwidthBurst,         MEMUNIT,  "0"),
  V(RelayBandwidthRate,          MEMUNIT,  "0"),
280
281
  OBSOLETE("RendExcludeNodes"),
  OBSOLETE("RendNodes"),
282
283
  V(RendPostPeriod,              INTERVAL, "1 hour"),
  V(RephistTrackTime,            INTERVAL, "24 hours"),
284
  OBSOLETE("RouterFile"),
285
286
287
288
  V(RunAsDaemon,                 BOOL,     "0"),
  V(RunTesting,                  BOOL,     "0"),
  V(SafeLogging,                 BOOL,     "1"),
  V(SafeSocks,                   BOOL,     "0"),
289
  V(ServerDNSAllowBrokenResolvConf, BOOL,  "0"),
290
291
292
293
294
  V(ServerDNSAllowNonRFC953Hostnames, BOOL,"0"),
  V(ServerDNSDetectHijacking,    BOOL,     "1"),
  V(ServerDNSResolvConfFile,     STRING,   NULL),
  V(ServerDNSSearchDomains,      BOOL,     "0"),
  V(ServerDNSTestAddresses,      CSV,
295
      "www.google.com,www.mit.edu,www.yahoo.com,www.slashdot.org"),
296
297
298
299
300
  V(ShutdownWaitLength,          INTERVAL, "30 seconds"),
  V(SocksListenAddress,          LINELIST, NULL),
  V(SocksPolicy,                 LINELIST, NULL),
  V(SocksPort,                   UINT,     "9050"),
  V(SocksTimeout,                INTERVAL, "2 minutes"),
301
  OBSOLETE("StatusFetchPeriod"),
302
303
  V(StrictEntryNodes,            BOOL,     "0"),
  V(StrictExitNodes,             BOOL,     "0"),
304
  OBSOLETE("SysLog"),
305
  V(TestSocks,                   BOOL,     "0"),
306
  OBSOLETE("TestVia"),
307
308
  V(TrackHostExits,              CSV,      NULL),
  V(TrackHostExitsExpire,        INTERVAL, "30 minutes"),
309
  OBSOLETE("TrafficShaping"),
310
311
  V(TransListenAddress,          LINELIST, NULL),
  V(TransPort,                   UINT,     "0"),
Roger Dingledine's avatar
Roger Dingledine committed
312
  V(TunnelDirConns,              BOOL,     "1"),
313
314
315
316
  V(UpdateBridgesFromAuthority,  BOOL,     "0"),
  V(UseBridges,                  BOOL,     "0"),
  V(UseEntryGuards,              BOOL,     "1"),
  V(User,                        STRING,   NULL),
317
  VAR("V1AuthoritativeDirectory",BOOL, V1AuthoritativeDir,   "0"),
318
  VAR("V2AuthoritativeDirectory",BOOL, V2AuthoritativeDir,   "0"),
319
  VAR("V3AuthoritativeDirectory",BOOL, V3AuthoritativeDir,   "0"),
320
321
322
  V(TestingV3AuthInitialVotingInterval, INTERVAL, "30 minutes"),
  V(TestingV3AuthInitialVoteDelay, INTERVAL, "5 minutes"),
  V(TestingV3AuthInitialDistDelay, INTERVAL, "5 minutes"),
323
324
325
326
  V(V3AuthVotingInterval,        INTERVAL, "1 hour"),
  V(V3AuthVoteDelay,             INTERVAL, "5 minutes"),
  V(V3AuthDistDelay,             INTERVAL, "5 minutes"),
  V(V3AuthNIntervalsValid,       UINT,     "3"),
327
  V(V3AuthUseLegacyKey,          BOOL,     "0"),
328
  VAR("VersioningAuthoritativeDirectory",BOOL,VersioningAuthoritativeDir, "0"),
329
  V(VirtualAddrNetwork,          STRING,   "127.192.0.0/10"),
330
  V(WarnPlaintextPorts,          CSV,      "23,109,110,143"),
331
332
333
  VAR("__AllDirActionsPrivate",  BOOL,  AllDirActionsPrivate,     "0"),
  VAR("__DisablePredictedCircuits",BOOL,DisablePredictedCircuits, "0"),
  VAR("__LeaveStreamsUnattached",BOOL,  LeaveStreamsUnattached,   "0"),
334
335
  VAR("__HashedControlSessionPassword", LINELIST, HashedControlSessionPassword,
      NULL),
336
  V(MinUptimeHidServDirectoryV2, INTERVAL, "24 hours"),
337
  { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL }
338
};
339
340
341
342
343
344
345
346
347
348
349
350
351
352

/* Keep defaults synchronous with man page and config value check. */
static config_var_t testing_tor_network_defaults[] = {
  V(ServerDNSAllowBrokenResolvConf, BOOL,  "1"),
  V(DirAllowPrivateAddresses,    BOOL,     "1"),
  V(EnforceDistinctSubnets,      BOOL,     "0"),
  V(AssumeReachable,             BOOL,     "1"),
  V(AuthDirMaxServersPerAddr,    UINT,     "0"),
  V(AuthDirMaxServersPerAuthAddr,UINT,     "0"),
  V(ClientDNSRejectInternalAddresses, BOOL,"0"),
  V(ExitPolicyRejectPrivate,     BOOL,     "0"),
  V(V3AuthVotingInterval,        INTERVAL, "5 minutes"),
  V(V3AuthVoteDelay,             INTERVAL, "20 seconds"),
  V(V3AuthDistDelay,             INTERVAL, "20 seconds"),
353
354
355
356
357
  V(TestingV3AuthInitialVotingInterval, INTERVAL, "5 minutes"),
  V(TestingV3AuthInitialVoteDelay, INTERVAL, "20 seconds"),
  V(TestingV3AuthInitialDistDelay, INTERVAL, "20 seconds"),
  V(TestingAuthDirTimeToLearnReachability, INTERVAL, "0 minutes"),
  V(TestingEstimatedDescriptorPropagationTime, INTERVAL, "0 minutes"),
358
359
  { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL }
};
360
361
#undef VAR

362
363
#define VAR(name,conftype,member,initvalue)                             \
  { name, CONFIG_TYPE_ ## conftype, STRUCT_OFFSET(or_state_t, member),  \
364
      initvalue }
365
static config_var_t _state_vars[] = {
366
367
368
369
370
  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
371

372
373
374
  VAR("EntryGuard",              LINELIST_S,  EntryGuards,             NULL),
  VAR("EntryGuardDownSince",     LINELIST_S,  EntryGuards,             NULL),
  VAR("EntryGuardUnlistedSince", LINELIST_S,  EntryGuards,             NULL),
375
  VAR("EntryGuardAddedBy",       LINELIST_S,  EntryGuards,             NULL),
376
  V(EntryGuards,                 LINELIST_V,  NULL),
Nick Mathewson's avatar
Nick Mathewson committed
377

378
379
380
381
382
383
  V(BWHistoryReadEnds,                ISOTIME,  NULL),
  V(BWHistoryReadInterval,            UINT,     "900"),
  V(BWHistoryReadValues,              CSV,      ""),
  V(BWHistoryWriteEnds,               ISOTIME,  NULL),
  V(BWHistoryWriteInterval,           UINT,     "900"),
  V(BWHistoryWriteValues,             CSV,      ""),
384

385
  V(TorVersion,                       STRING,   NULL),
386

387
388
  V(LastRotatedOnionKey,              ISOTIME,  NULL),
  V(LastWritten,                      ISOTIME,  NULL),
389

390
  { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL }
391
392
};

393
#undef VAR
394
#undef V
395
396
#undef OBSOLETE

397
398
/** Represents an English description of a configuration variable; used when
 * generating configuration file comments. */
399
400
401
402
403
404
typedef struct config_var_description_t {
  const char *name;
  const char *description;
} config_var_description_t;

static config_var_description_t options_description[] = {
405
  /* ==== general options */
406
407
  { "AvoidDiskWrites", "If non-zero, try to write to disk less frequently than"
    " we would otherwise." },
408
409
410
411
  { "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." },
412
  { "ConnLimit", "Minimum number of simultaneous sockets we must have." },
413
414
415
416
417
  { "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." },
418
419
420
  /*  ControlListenAddress */
  { "ControlPort", "If set, Tor will accept connections from the same machine "
    "(localhost only) on this port, and allow those connections to control "
Karsten Loesing's avatar
Karsten Loesing committed
421
    "the Tor process using the Tor Control Protocol (described in "
422
423
424
    "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 "
425
    "can read a file that Tor creates in its data directory." },
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
  { "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 "
450
    "provided IP address (only useful for multiple network interfaces)." },
451
452
  { "PIDFile", "On startup, write our PID to this file. On clean shutdown, "
    "remove the file." },
453
  { "PreferTunneledDirConns", "If non-zero, avoid directory servers that "
454
    "don't support tunneled connections." },
455
  /* PreferTunneledDirConns */
456
457
458
459
460
461
  /* 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]." },
462
463
464
  { "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." },
Karsten Loesing's avatar
Karsten Loesing committed
465
  { "User", "On startup, setuid to this user." },
466
467
468
469

  /* ==== client options */
  { "AllowInvalidNodes", "Where on our circuits should Tor allow servers "
    "that the directory authorities haven't called \"valid\"?" },
470
471
  { "AllowNonRFC953Hostnames", "If set to 1, we don't automatically reject "
    "hostnames for having invalid characters." },
472
473
  /*  CircuitBuildTimeout, CircuitIdleTimeout */
  { "ClientOnly", "If set to 1, Tor will under no circumstances run as a "
474
    "server, even if ORPort is enabled." },
475
  { "EntryNodes", "A list of preferred entry nodes to use for the first hop "
476
    "in circuits, when possible." },
477
478
479
480
481
  /* { "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 "
482
483
    "servers running on the ports listed in FirewallPorts." },
  { "FirewallPorts", "A list of ports that we can connect to.  Only used "
484
485
    "when FascistFirewall is set." },
  { "LongLivedPorts", "A list of ports for services that tend to require "
486
    "high-uptime connections." },
487
488
489
  { "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 "
490
    "every NUM seconds." },
491
  { "MaxCircuitDirtiness", "Do not attach new streams to a circuit that has "
492
    "been used more than this many seconds ago." },
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
  /* 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. */
  /* 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 "
515
    "accessed from the same exit node each time we connect to them." },
516
517
518
519
  { "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 "
520
521
    "servers for the first position in each circuit, rather than picking a "
    "set of 'Guards' to prevent profiling attacks." },
522
523

  /* === server options */
524
  { "Address", "The advertised (external) address we should use." },
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
  /* 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." },
541
  { "NoPublish", "{DEPRECATED}" },
542
543
544
545
546
  { "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." },
547
  { "PublishServerDescriptor", "Set to 0 to keep the server from "
548
    "uploading info to the directory authorities." },
549
550
551
552
553
554
555
  /*{ "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." },

556
  /* === directory cache options */
557
558
  { "DirPort", "Serve directory information from this port, and act as a "
    "directory cache." },
559
  { "DirListenAddress", "Bind to this address to listen for connections from "
560
561
    "clients and servers, instead of the default 0.0.0.0:DirPort." },
  { "DirPolicy", "Set a policy to limit who can connect to the directory "
Karsten Loesing's avatar
Karsten Loesing committed
562
    "port." },
563
564
565
566
567
568
569
570
571
572
573
574

  /*  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 */
575
576
577
578
  { NULL, NULL },
};

static config_var_description_t state_description[] = {
579
  { "AccountingBytesReadInInterval",
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
    "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." },

595
596
  { "EntryGuard", "One of the nodes we have chosen as a fixed entry" },
  { "EntryGuardDownSince",
597
    "The last entry guard has been unreachable since this time." },
598
  { "EntryGuardUnlistedSince",
599
    "The last entry guard has been unusable since this time." },
Roger Dingledine's avatar
Roger Dingledine committed
600

601
602
603
  { "LastRotatedOnionKey",
    "The last time at which we changed the medium-term private key used for "
    "building circuits." },
604
605
606
  { "LastWritten", "When was this state file last regenerated?" },

  { "TorVersion", "Which version of Tor generated this state file?" },
607
608
609
  { NULL, NULL },
};

610
/** Type of a callback to validate whether a given configuration is
Roger Dingledine's avatar
Roger Dingledine committed
611
 * well-formed and consistent. See options_trial_assign() for documentation
612
 * of arguments. */
613
typedef int (*validate_fn_t)(void*,void*,int,char**);
614

615
616
617
/** Information on the keys, value types, key-to-struct-member mappings,
 * variable descriptions, validation functions, and abbreviations for a
 * configuration or storage format. */
618
typedef struct {
619
620
621
  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
622
  off_t magic_offset; /**< Offset of the magic value within the struct. */
623
  config_abbrev_t *abbrevs; /**< List of abbreviations that we expand when
Roger Dingledine's avatar
Roger Dingledine committed
624
                             * parsing this format. */
625
626
627
628
  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. */
629
  config_var_description_t *descriptions;
Roger Dingledine's avatar
Roger Dingledine committed
630
631
632
  /** If present, extra is a LINELIST variable for unrecognized
   * lines.  Otherwise, unrecognized lines are an error. */
  config_var_t *extra;
633
634
} config_format_t;

635
636
/** Macro: assert that <b>cfg</b> has the right magic field for format
 * <b>fmt</b>. */
637
#define CHECK(fmt, cfg) STMT_BEGIN                                      \
638
    tor_assert(fmt && cfg);                                             \
639
    tor_assert((fmt)->magic ==                                          \
640
               *(uint32_t*)STRUCT_VAR_P(cfg,fmt->magic_offset));        \
641
  STMT_END
642

643
644
645
#ifdef MS_WINDOWS
static char *get_windows_conf_root(void);
#endif
646
static void config_line_append(config_line_t **lst,
647
                               const char *key, const char *val);
648
649
static void option_clear(config_format_t *fmt, or_options_t *options,
                         config_var_t *var);
650
static void option_reset(config_format_t *fmt, or_options_t *options,
651
                         config_var_t *var, int use_defaults);
652
static void config_free(config_format_t *fmt, void *options);
653
static int config_lines_eq(config_line_t *a, config_line_t *b);
654
static int option_is_same(config_format_t *fmt,
655
656
                          or_options_t *o1, or_options_t *o2,
                          const char *name);
657
static or_options_t *options_dup(config_format_t *fmt, or_options_t *old);
658
659
660
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);
661
static int options_act(or_options_t *old_options);
662
663
static int options_transition_allowed(or_options_t *old, or_options_t *new,
                                      char **msg);
664
665
666
667
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);
668
static int check_nickname_list(const char *lst, const char *name, char **msg);
669
static void config_register_addressmaps(or_options_t *options);
670

671
static int parse_bridge_line(const char *line, int validate_only);
672
673
674
static int parse_dir_server_line(const char *line,
                                 authority_type_t required_type,
                                 int validate_only);
675
static int parse_redirect_line(smartlist_t *result,
676
                               config_line_t *line, char **msg);
677
static int validate_data_directory(or_options_t *options);
678
static int write_configuration_file(const char *fname, or_options_t *options);
679
static config_line_t *get_assigned_option(config_format_t *fmt,
680
681
                                      or_options_t *options, const char *key,
                                      int escape_val);
682
static void config_init(config_format_t *fmt, void *options);
683
static int or_state_validate(or_state_t *old_options, or_state_t *options,
684
                             int from_setconf, char **msg);
685
686
static int or_state_load(void);
static int options_init_logs(or_options_t *options, int validate_only);
687

688
689
static uint64_t config_parse_memunit(const char *s, int *ok);
static int config_parse_interval(const char *s, int *ok);
690
static void print_svn_version(void);
691
static void init_libevent(void);
692
static int opt_streq(const char *s1, const char *s2);
693
/** Versions of libevent. */
694
typedef enum {
695
696
  /* Note: we compare these, so it's important that "old" precede everything,
   * and that "other" come last. */
697
  LE_OLD=0, LE_10C, LE_10D, LE_10E, LE_11, LE_11A, LE_11B, LE_12, LE_12A,
698
  LE_13, LE_13A, LE_13B, LE_13C, LE_13D,
699
  LE_OTHER
700
701
} le_version_t;
static le_version_t decode_libevent_version(void);
702
#if defined(HAVE_EVENT_GET_VERSION) && defined(HAVE_EVENT_GET_METHOD)
703
static void check_libevent_version(const char *m, int server);
704
#endif
705

706
/** Magic value for or_options_t. */
707
708
#define OR_OPTIONS_MAGIC 9090909

709
/** Configuration format for or_options_t. */
710
static config_format_t options_format = {
711
712
713
  sizeof(or_options_t),
  OR_OPTIONS_MAGIC,
  STRUCT_OFFSET(or_options_t, _magic),
714
715
716
  _option_abbrevs,
  _option_vars,
  (validate_fn_t)options_validate,
717
718
  options_description,
  NULL
719
720
};

721
/** Magic value for or_state_t. */
722
723
#define OR_STATE_MAGIC 0x57A73f57

724
725
/** "Extra" variable in the state that receives lines we can't parse. This
 * lets us preserve options from versions of Tor newer than us. */
726
727
728
729
static config_var_t state_extra_var = {
  "__extra", CONFIG_TYPE_LINELIST, STRUCT_OFFSET(or_state_t, ExtraLines), NULL
};

730
/** Configuration format for or_state_t. */
731
732
733
734
static config_format_t state_format = {
  sizeof(or_state_t),
  OR_STATE_MAGIC,
  STRUCT_OFFSET(or_state_t, _magic),
735
  _state_abbrevs,
736
737
  _state_vars,
  (validate_fn_t)or_state_validate,
738
739
  state_description,
  &state_extra_var,
740
741
};

742
743
744
745
746
/*
 * Functions to read and write the global options pointer.
 */

/** Command-line and config-file options. */
747
static or_options_t *global_options = NULL;
Roger Dingledine's avatar
Roger Dingledine committed
748
/** Name of most recently read torrc file. */
749
static char *torrc_fname = NULL;
750
/** Persistent serialized state. */
751
static or_state_t *global_state = NULL;
752
753
/** Configuration Options set by command line. */
static config_line_t *global_cmdline_options = NULL;
754

755
/** Allocate an empty configuration object of a given format type. */
756
757
758
static void *
config_alloc(config_format_t *fmt)
{
759
  void *opts = tor_malloc_zero(fmt->size);
760
  *(uint32_t*)STRUCT_VAR_P(opts, fmt->magic_offset) = fmt->magic;
761
762
763
764
  CHECK(fmt, opts);
  return opts;
}

765
766
/** Return the currently configured options. */
or_options_t *
767
768
get_options(void)
{
769
770
771
  tor_assert(global_options);
  return global_options;
}
772

773
774
/** 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
775
 * as necessary.  Returns 0 on success, -1 on failure.
776
 */
777
int
778
set_options(or_options_t *new_val, char **msg)
779
{
780
  or_options_t *old_options = global_options;
781
  global_options = new_val;
782
783
  /* Note that we pass the *old* options below, for comparison. It
   * pulls the new options directly out of global_options. */
784
785
  if (options_act_reversible(old_options, msg)<0) {
    tor_assert(*msg);
786
787
788
    global_options = old_options;
    return -1;
  }
789
  if (options_act(old_options) < 0) { /* acting on the options failed. die. */
790
    log_err(LD_BUG,
Roger Dingledine's avatar
Roger Dingledine committed
791
            "Acting on config options left us in a broken state. Dying.");
792
793
794
    exit(1);
  }
  if (old_options)
795
    config_free(&options_format, old_options);
796
797

  return 0;
798
799
}

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

802
803
static char *_version = NULL;

804
805
806
807
/** Return the current Tor version, possibly */
const char *
get_version(void)
{
808
  if (_version == NULL) {
809
810
    if (strlen(tor_svn_revision)) {
      size_t len = strlen(VERSION)+strlen(tor_svn_revision)+8;
811
812
      _version = tor_malloc(len);
      tor_snprintf(_version, len, "%s (r%s)", VERSION, tor_svn_revision);
813
    } else {
814
      _version = tor_strdup(VERSION);
815
816
    }
  }
817
  return _version;
818
819
}

820
821
822
823
824
825
826
827
828
829
/** Release additional memory allocated in options
 */
static void
or_options_free(or_options_t *options)
{
  if (options->_ExcludeExitNodesUnion)
    routerset_free(options->_ExcludeExitNodesUnion);
  config_free(&options_format, options);
}

830
831
/** Release all memory and resources held by global configuration structures.
 */
832
833
834
void
config_free_all(void)
{
835
  if (global_options) {
836
    or_options_free(global_options);
837
838
839
840
841
842
    global_options = NULL;
  }
  if (global_state) {
    config_free(&state_format, global_state);
    global_state = NULL;
  }
843
844
845
846
  if (global_cmdline_options) {
    config_free_lines(global_cmdline_options);
    global_cmdline_options = NULL;
  }
847
  tor_free(torrc_fname);
848
  tor_free(_version);
849
850
}

851
852
853
854
/** If options->SafeLogging is on, return a not very useful string,
 * else return address.
 */
const char *
855
856
safe_str(const char *address)
{
857
  tor_assert(address);
858
859
860
861
862
863
  if (get_options()->SafeLogging)
    return "[scrubbed]";
  else
    return address;
}

864
/** Equivalent to escaped(safe_str(address)).  See reentrancy note on
865
866
 * escaped(): don't use this outside the main thread, or twice in the same
 * log statement. */
867
868
869
870
871
872
873
874
875
const char *
escaped_safe_str(const char *address)
{
  if (get_options()->SafeLogging)
    return "[scrubbed]";
  else
    return escaped(address);
}

876
877
/** Add the default directory authorities directly into the trusted dir list,
 * but only add them insofar as they share bits with <b>type</b>. */
878
static void
879
add_default_trusted_dir_authorities(authority_type_t type)
880
{
881
  int i;
882
  const char *dirservers[] = {
883
    "moria1 v1 orport=9001 v3ident=E2A2AF570166665D738736D0DD58169CC61D8A8B "
884
      "128.31.0.34:9031 FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441",
885
    "moria2 v1 orport=9002 128.31.0.34:9032 "
886
      "719B E45D E224 B607 C537 07D0 E214 3E2D 423E 74CF",
887
    "tor26 v1 orport=443 v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
Peter Palfrader's avatar
Peter Palfrader committed
888
      "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
Roger Dingledine's avatar
Roger Dingledine committed
889
    "lefkada orport=443 "
890
      "140.247.60.64:80 38D4 F5FC F7B1 0232 28B8 95EA 56ED E7D5 CCDC AF32",
Roger Dingledine's avatar
Roger Dingledine committed
891
892
    "dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
      "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
893
894
    "Tonga orport=443 bridge no-v2 82.94.251.206:80 "
      "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
895
896
    "ides orport=9090 no-v2 v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 "
      "216.224.124.114:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B",
897
    "gabelmoo orport=443 no-v2 "
898
      "v3ident=81349FC1F2DBA2C2C11B45CB9706637D480AB913 "
899
      "88.198.7.215:80 6833 3D07 61BC F397 A587 A0C0 B963 E4A9 E99E C4D3",
900
901
902
    "dannenberg orport=443 no-v2 "
      "v3ident=585769C78764D58426B8B52B6651A5A71137189A "
      "213.73.91.31:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
903
    NULL
904
  };
905
906
907
908
909
910
  for (i=0; dirservers[i]; i++) {
    if (parse_dir_server_line(dirservers[i], type, 0)<0) {
      log_err(LD_BUG, "Couldn't parse internal dirserver line %s",
              dirservers[i]);
    }
  }
911