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

/* 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"),
356
357
358
359
360
  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"),
361
362
  { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL }
};
363
364
#undef VAR

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

375
376
377
  VAR("EntryGuard",              LINELIST_S,  EntryGuards,             NULL),
  VAR("EntryGuardDownSince",     LINELIST_S,  EntryGuards,             NULL),
  VAR("EntryGuardUnlistedSince", LINELIST_S,  EntryGuards,             NULL),
378
  VAR("EntryGuardAddedBy",       LINELIST_S,  EntryGuards,             NULL),
379
  V(EntryGuards,                 LINELIST_V,  NULL),
Nick Mathewson's avatar
Nick Mathewson committed
380

381
382
383
384
385
386
  V(BWHistoryReadEnds,                ISOTIME,  NULL),
  V(BWHistoryReadInterval,            UINT,     "900"),
  V(BWHistoryReadValues,              CSV,      ""),
  V(BWHistoryWriteEnds,               ISOTIME,  NULL),
  V(BWHistoryWriteInterval,           UINT,     "900"),
  V(BWHistoryWriteValues,             CSV,      ""),
387

388
  V(TorVersion,                       STRING,   NULL),
389

390
391
  V(LastRotatedOnionKey,              ISOTIME,  NULL),
  V(LastWritten,                      ISOTIME,  NULL),
392

393
  { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL }
394
395
};

396
#undef VAR
397
#undef V
398
399
#undef OBSOLETE

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

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

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

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

559
  /* === directory cache options */
560
561
  { "DirPort", "Serve directory information from this port, and act as a "
    "directory cache." },
562
  { "DirListenAddress", "Bind to this address to listen for connections from "
563
564
    "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
565
    "port." },
566
567
568
569
570
571
572
573
574
575
576
577

  /*  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 */
578
579
580
581
  { NULL, NULL },
};

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

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

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

  { "TorVersion", "Which version of Tor generated this state file?" },
610
611
612
  { NULL, NULL },
};

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

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

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

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

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

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

709
/** Magic value for or_options_t. */
710
711
#define OR_OPTIONS_MAGIC 9090909

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

724
/** Magic value for or_state_t. */
725
726
#define OR_STATE_MAGIC 0x57A73f57

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

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

745
746
747
748
749
/*
 * Functions to read and write the global options pointer.
 */

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

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

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

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

  return 0;
801
802
}

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

805
806
static char *_version = NULL;

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

823
824
825
826
827
828
829
830
831
832
/** 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);
}

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

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

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

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