2006-02-09 06:46:49 +01:00
|
|
|
/* Copyright (c) 2001 Matej Pfajfar.
|
|
|
|
* Copyright (c) 2001-2004, Roger Dingledine.
|
|
|
|
* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. */
|
Implemented link padding and receiver token buckets
Each socket reads at most 'bandwidth' bytes per second sustained, but
can handle bursts of up to 10*bandwidth bytes.
Cells are now sent out at evenly-spaced intervals, with padding sent
out otherwise. Set Linkpadding=0 in the rc file to send cells as soon
as they're available (and to never send padding cells).
Added license/copyrights statements at the top of most files.
router->min and router->max have been merged into a single 'bandwidth'
value. We should make the routerinfo_t reflect this (want to do that,
Mat?)
As the bandwidth increases, and we want to stop sleeping more and more
frequently to send a single cell, cpu usage goes up. At 128kB/s we're
pretty much calling poll with a timeout of 1ms or even 0ms. The current
code takes a timeout of 0-9ms and makes it 10ms. prepare_for_poll()
handles everything that should have happened in the past, so as long as
our buffers don't get too full in that 10ms, we're ok.
Speaking of too full, if you run three servers at 100kB/s with -l debug,
it spends too much time printing debugging messages to be able to keep
up with the cells. The outbuf ultimately fills up and it kills that
connection. If you run with -l err, it works fine up through 500kB/s and
probably beyond. Down the road we'll want to teach it to recognize when
an outbuf is getting full, and back off.
svn:r50
2002-07-16 03:12:15 +02:00
|
|
|
/* See LICENSE for licensing information */
|
|
|
|
/* $Id$ */
|
2005-12-14 21:40:40 +01:00
|
|
|
const char config_c_id[] = \
|
|
|
|
"$Id$";
|
2005-06-11 07:31:17 +02:00
|
|
|
|
2004-05-10 06:48:13 +02:00
|
|
|
/**
|
2004-11-30 07:17:35 +01:00
|
|
|
* \file config.c
|
|
|
|
* \brief Code to parse and interpret configuration files.
|
2004-05-10 06:48:13 +02:00
|
|
|
**/
|
|
|
|
|
2002-06-27 00:45:49 +02:00
|
|
|
#include "or.h"
|
2004-08-18 05:42:55 +02:00
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
#include <shlobj.h>
|
|
|
|
#endif
|
2004-11-29 23:25:31 +01:00
|
|
|
#include "../common/aes.h"
|
2002-10-03 04:17:41 +02:00
|
|
|
|
2004-05-10 06:48:13 +02:00
|
|
|
/** Enumeration of types which option values can take */
|
|
|
|
typedef enum config_type_t {
|
2004-10-14 04:47:09 +02:00
|
|
|
CONFIG_TYPE_STRING = 0, /**< An arbitrary string. */
|
|
|
|
CONFIG_TYPE_UINT, /**< A non-negative integer less than MAX_INT */
|
2004-11-22 22:56:51 +01:00
|
|
|
CONFIG_TYPE_INTERVAL, /**< A number of seconds, with optional units*/
|
|
|
|
CONFIG_TYPE_MEMUNIT, /**< A number of bytes, with optional units*/
|
2004-10-14 04:47:09 +02:00
|
|
|
CONFIG_TYPE_DOUBLE, /**< A floating-point value */
|
|
|
|
CONFIG_TYPE_BOOL, /**< A boolean value, expressed as 0 or 1. */
|
2005-07-28 21:01:48 +02:00
|
|
|
CONFIG_TYPE_ISOTIME, /**< An ISO-formated time relative to GMT. */
|
2005-12-14 21:40:40 +01:00
|
|
|
CONFIG_TYPE_CSV, /**< A list of strings, separated by commas and
|
|
|
|
* optional whitespace. */
|
2004-10-14 04:47:09 +02:00
|
|
|
CONFIG_TYPE_LINELIST, /**< Uninterpreted config lines */
|
2004-11-04 23:31:50 +01:00
|
|
|
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.
|
|
|
|
*/
|
2004-10-14 04:47:09 +02:00
|
|
|
CONFIG_TYPE_OBSOLETE, /**< Obsolete (ignored) option. */
|
2004-05-10 06:48:13 +02:00
|
|
|
} config_type_t;
|
2003-09-08 07:16:18 +02:00
|
|
|
|
2005-10-06 07:08:00 +02:00
|
|
|
/** An abbreviation for a configuration option allowed on the command line. */
|
2004-10-27 04:30:28 +02:00
|
|
|
typedef struct config_abbrev_t {
|
2004-10-27 23:14:11 +02:00
|
|
|
const char *abbreviated;
|
|
|
|
const char *full;
|
2004-10-27 19:37:01 +02:00
|
|
|
int commandline_only;
|
2005-10-17 05:06:00 +02:00
|
|
|
int warn;
|
2004-10-27 04:30:28 +02:00
|
|
|
} config_abbrev_t;
|
|
|
|
|
2004-10-27 19:37:01 +02:00
|
|
|
/* Handy macro for declaring "In the config file or on the command line,
|
|
|
|
* you can abbreviate <b>tok</b>s as <b>tok</b>". */
|
2005-10-17 05:06:00 +02:00
|
|
|
#define PLURAL(tok) { #tok, #tok "s", 0, 0 }
|
2004-10-27 19:37:01 +02:00
|
|
|
|
2004-10-27 05:08:04 +02:00
|
|
|
/* A list of command-line abbreviations. */
|
2005-07-28 21:01:48 +02:00
|
|
|
static config_abbrev_t _option_abbrevs[] = {
|
2004-10-27 19:37:01 +02:00
|
|
|
PLURAL(ExitNode),
|
2004-11-09 07:09:06 +01:00
|
|
|
PLURAL(EntryNode),
|
2004-10-27 19:37:01 +02:00
|
|
|
PLURAL(ExcludeNode),
|
|
|
|
PLURAL(FirewallPort),
|
2005-01-12 05:58:23 +01:00
|
|
|
PLURAL(LongLivedPort),
|
2004-10-27 19:37:01 +02:00
|
|
|
PLURAL(HiddenServiceNode),
|
|
|
|
PLURAL(HiddenServiceExcludeNode),
|
2005-04-23 21:29:09 +02:00
|
|
|
PLURAL(NumCpu),
|
2004-10-27 19:37:01 +02:00
|
|
|
PLURAL(RendNode),
|
|
|
|
PLURAL(RendExcludeNode),
|
2004-11-21 00:16:03 +01:00
|
|
|
PLURAL(StrictEntryNode),
|
|
|
|
PLURAL(StrictExitNode),
|
2005-10-18 01:00:08 +02:00
|
|
|
{ "l", "Log", 1, 0},
|
2005-10-17 05:06:00 +02:00
|
|
|
{ "BandwidthRateBytes", "BandwidthRate", 0, 0},
|
|
|
|
{ "BandwidthBurstBytes", "BandwidthBurst", 0, 0},
|
|
|
|
{ "DirFetchPostPeriod", "StatusFetchPeriod", 0, 0},
|
|
|
|
{ "MaxConn", "ConnLimit", 0, 1},
|
2005-11-11 18:04:14 +01:00
|
|
|
{ "ORBindAddress", "ORListenAddress", 0, 0},
|
|
|
|
{ "DirBindAddress", "DirListenAddress", 0, 0},
|
|
|
|
{ "SocksBindAddress", "SocksListenAddress", 0, 0},
|
2006-01-10 23:42:44 +01:00
|
|
|
{ "UseHelperNodes", "UseEntryGuards", 0, 0},
|
|
|
|
{ "NumHelperNodes", "NumEntryGuards", 0, 0},
|
|
|
|
{ "UseEntryNodes", "UseEntryGuards", 0, 0},
|
|
|
|
{ "NumEntryNodes", "NumEntryGuards", 0, 0},
|
2005-12-28 10:07:31 +01:00
|
|
|
{ NULL, NULL, 0, 0},
|
|
|
|
};
|
|
|
|
/* A list of state-file abbreviations, for compatibility. */
|
|
|
|
static config_abbrev_t _state_abbrevs[] = {
|
2006-01-06 16:43:03 +01:00
|
|
|
{ "AccountingBytesReadInterval", "AccountingBytesReadInInterval", 0, 0 },
|
2006-01-10 23:42:44 +01:00
|
|
|
{ "HelperNode", "EntryGuard", 0, 0 },
|
|
|
|
{ "HelperNodeDownSince", "EntryGuardDownSince", 0, 0 },
|
|
|
|
{ "HelperNodeUnlistedSince", "EntryGuardUnlistedSince", 0, 0 },
|
|
|
|
{ "EntryNode", "EntryGuard", 0, 0 },
|
|
|
|
{ "EntryNodeDownSince", "EntryGuardDownSince", 0, 0 },
|
|
|
|
{ "EntryNodeUnlistedSince", "EntryGuardUnlistedSince", 0, 0 },
|
2005-10-17 05:06:00 +02:00
|
|
|
{ NULL, NULL, 0, 0},
|
2004-10-27 04:30:28 +02:00
|
|
|
};
|
2004-10-27 19:37:01 +02:00
|
|
|
#undef PLURAL
|
2004-10-27 04:30:28 +02:00
|
|
|
|
2004-11-03 11:08:44 +01:00
|
|
|
/** A variable allowed in the configuration file or on the command line. */
|
2004-10-27 04:30:28 +02:00
|
|
|
typedef struct config_var_t {
|
2004-11-03 11:08:44 +01:00
|
|
|
const char *name; /**< The full keyword (case insensitive). */
|
2005-12-14 21:40:40 +01:00
|
|
|
config_type_t type; /**< How to interpret the type and turn it into a
|
|
|
|
* value. */
|
2004-11-03 11:08:44 +01:00
|
|
|
off_t var_offset; /**< Offset of the corresponding member of or_options_t. */
|
|
|
|
const char *initvalue; /**< String (or null) describing initial value. */
|
2004-10-27 04:30:28 +02:00
|
|
|
} config_var_t;
|
|
|
|
|
2004-10-27 05:08:04 +02:00
|
|
|
/** Return the offset of <b>member</b> within the type <b>tp</b>, in bytes */
|
2005-12-14 21:40:40 +01:00
|
|
|
#define STRUCT_OFFSET(tp, member) \
|
|
|
|
((off_t) (((char*)&((tp*)0)->member)-(char*)0))
|
2006-02-12 23:28:30 +01:00
|
|
|
|
|
|
|
#define STRUCT_VAR_P(st, off) \
|
|
|
|
((void*) ( ((char*)st) + off ) )
|
|
|
|
|
2004-10-27 05:08:04 +02:00
|
|
|
/** 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>"
|
|
|
|
*/
|
2005-12-14 21:40:40 +01:00
|
|
|
#define VAR(name,conftype,member,initvalue) \
|
|
|
|
{ name, CONFIG_TYPE_ ## conftype, STRUCT_OFFSET(or_options_t, member), \
|
2006-01-06 16:43:03 +01:00
|
|
|
initvalue }
|
2004-10-27 05:08:04 +02:00
|
|
|
/** An entry for config_vars: "The option <b>name</b> is obsolete." */
|
2006-01-06 16:43:03 +01:00
|
|
|
#define OBSOLETE(name) { name, CONFIG_TYPE_OBSOLETE, 0, NULL }
|
2004-10-27 04:30:28 +02:00
|
|
|
|
2004-10-27 05:08:04 +02:00
|
|
|
/** Array of configuration options. Until we disallow nonstandard
|
|
|
|
* abbreviations, order is significant, since the first matching option will
|
|
|
|
* be chosen first.
|
|
|
|
*/
|
2005-07-28 21:01:48 +02:00
|
|
|
static config_var_t _option_vars[] = {
|
2005-09-08 20:15:57 +02:00
|
|
|
VAR("AccountingMax", MEMUNIT, AccountingMax, "0 bytes"),
|
2005-08-05 03:35:43 +02:00
|
|
|
VAR("AccountingMaxKB", UINT, _AccountingMaxKB, "0"),
|
2004-11-22 22:56:51 +01:00
|
|
|
VAR("AccountingStart", STRING, AccountingStart, NULL),
|
2005-08-05 03:35:43 +02:00
|
|
|
VAR("Address", STRING, Address, NULL),
|
2005-12-14 21:40:40 +01:00
|
|
|
VAR("AllowUnverifiedNodes",CSV, AllowUnverifiedNodes,
|
|
|
|
"middle,rendezvous"),
|
2005-08-26 09:41:19 +02:00
|
|
|
VAR("AssumeReachable", BOOL, AssumeReachable, "0"),
|
2005-09-15 16:39:05 +02:00
|
|
|
VAR("AuthDirInvalid", LINELIST, AuthDirInvalid, NULL),
|
|
|
|
VAR("AuthDirReject", LINELIST, AuthDirReject, NULL),
|
2005-12-15 22:39:38 +01:00
|
|
|
VAR("AuthDirRejectUnlisted",BOOL, AuthDirRejectUnlisted,"0"),
|
2004-11-03 11:08:44 +01:00
|
|
|
VAR("AuthoritativeDirectory",BOOL, AuthoritativeDir, "0"),
|
2006-01-28 09:28:15 +01:00
|
|
|
VAR("BandwidthBurst", MEMUNIT, BandwidthBurst, "6 MB"),
|
|
|
|
VAR("BandwidthRate", MEMUNIT, BandwidthRate, "3 MB"),
|
2004-11-03 11:08:44 +01:00
|
|
|
VAR("ClientOnly", BOOL, ClientOnly, "0"),
|
2005-08-05 03:35:43 +02:00
|
|
|
VAR("ConnLimit", UINT, ConnLimit, "1024"),
|
2004-11-03 11:08:44 +01:00
|
|
|
VAR("ContactInfo", STRING, ContactInfo, NULL),
|
2006-02-13 07:25:16 +01:00
|
|
|
VAR("ControlListenAddress",LINELIST, ControlListenAddress, NULL),
|
2004-11-04 07:41:49 +01:00
|
|
|
VAR("ControlPort", UINT, ControlPort, "0"),
|
2004-11-12 17:39:03 +01:00
|
|
|
VAR("CookieAuthentication",BOOL, CookieAuthentication, "0"),
|
2004-11-03 11:08:44 +01:00
|
|
|
VAR("DataDirectory", STRING, DataDirectory, NULL),
|
2005-08-05 03:35:43 +02:00
|
|
|
VAR("DebugLogFile", STRING, DebugLogFile, NULL),
|
2005-01-06 22:03:27 +01:00
|
|
|
VAR("DirAllowPrivateAddresses",BOOL, DirAllowPrivateAddresses, NULL),
|
2005-10-17 05:17:29 +02:00
|
|
|
VAR("DirListenAddress", LINELIST, DirListenAddress, NULL),
|
|
|
|
/* if DirFetchPeriod is 0, see get_dir_fetch_period() in main.c */
|
|
|
|
VAR("DirFetchPeriod", INTERVAL, DirFetchPeriod, "0 seconds"),
|
2004-11-03 11:08:44 +01:00
|
|
|
VAR("DirPolicy", LINELIST, DirPolicy, NULL),
|
2005-08-05 03:35:43 +02:00
|
|
|
VAR("DirPort", UINT, DirPort, "0"),
|
2005-08-22 23:53:12 +02:00
|
|
|
OBSOLETE("DirPostPeriod"),
|
2004-11-03 11:08:44 +01:00
|
|
|
VAR("DirServer", LINELIST, DirServers, NULL),
|
|
|
|
VAR("EntryNodes", STRING, EntryNodes, NULL),
|
|
|
|
VAR("ExcludeNodes", STRING, ExcludeNodes, NULL),
|
2005-08-05 03:35:43 +02:00
|
|
|
VAR("ExitNodes", STRING, ExitNodes, NULL),
|
|
|
|
VAR("ExitPolicy", LINELIST, ExitPolicy, NULL),
|
2006-02-01 04:53:52 +01:00
|
|
|
VAR("ExitPolicyRejectPrivate", BOOL, ExitPolicyRejectPrivate, "1"),
|
2004-11-03 11:08:44 +01:00
|
|
|
VAR("FascistFirewall", BOOL, FascistFirewall, "0"),
|
2005-08-07 23:24:00 +02:00
|
|
|
VAR("FirewallPorts", CSV, FirewallPorts, ""),
|
2005-12-07 23:09:02 +01:00
|
|
|
VAR("FastFirstHopPK", BOOL, FastFirstHopPK, "1"),
|
2004-11-03 11:08:44 +01:00
|
|
|
VAR("Group", STRING, Group, NULL),
|
2006-01-16 21:08:33 +01:00
|
|
|
VAR("HardwareAccel", BOOL, HardwareAccel, "0"),
|
2004-11-03 20:49:03 +01:00
|
|
|
VAR("HashedControlPassword",STRING, HashedControlPassword, NULL),
|
2005-08-05 03:35:43 +02:00
|
|
|
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),
|
2004-11-03 11:08:44 +01:00
|
|
|
VAR("HttpProxy", STRING, HttpProxy, NULL),
|
2005-05-20 10:51:45 +02:00
|
|
|
VAR("HttpProxyAuthenticator",STRING, HttpProxyAuthenticator,NULL),
|
2005-02-24 11:56:55 +01:00
|
|
|
VAR("HttpsProxy", STRING, HttpsProxy, NULL),
|
2005-04-26 20:33:33 +02:00
|
|
|
VAR("HttpsProxyAuthenticator",STRING,HttpsProxyAuthenticator,NULL),
|
2005-08-08 23:52:57 +02:00
|
|
|
OBSOLETE("IgnoreVersion"),
|
2004-11-20 01:37:00 +01:00
|
|
|
VAR("KeepalivePeriod", INTERVAL, KeepalivePeriod, "5 minutes"),
|
2004-11-05 06:50:35 +01:00
|
|
|
VAR("Log", LINELIST, Logs, NULL),
|
2004-10-27 04:30:28 +02:00
|
|
|
OBSOLETE("LinkPadding"),
|
2005-08-05 03:35:43 +02:00
|
|
|
VAR("LogFile", LINELIST_S, OldLogOptions, NULL),
|
|
|
|
VAR("LogLevel", LINELIST_S, OldLogOptions, NULL),
|
2005-12-14 21:40:40 +01:00
|
|
|
VAR("LongLivedPorts", CSV, LongLivedPorts,
|
|
|
|
"21,22,706,1863,5050,5190,5222,5223,6667,8300,8888"),
|
2005-08-05 03:35:43 +02:00
|
|
|
VAR("MapAddress", LINELIST, AddressMap, NULL),
|
|
|
|
VAR("MaxAdvertisedBandwidth",MEMUNIT,MaxAdvertisedBandwidth,"128 TB"),
|
|
|
|
VAR("MaxCircuitDirtiness", INTERVAL, MaxCircuitDirtiness, "10 minutes"),
|
2004-11-03 11:08:44 +01:00
|
|
|
VAR("MaxOnionsPending", UINT, MaxOnionsPending, "100"),
|
2005-08-15 11:17:47 +02:00
|
|
|
OBSOLETE("MonthlyAccountingStart"),
|
2005-08-05 03:35:43 +02:00
|
|
|
VAR("MyFamily", STRING, MyFamily, NULL),
|
2004-11-20 01:37:00 +01:00
|
|
|
VAR("NewCircuitPeriod", INTERVAL, NewCircuitPeriod, "30 seconds"),
|
2005-10-08 07:47:58 +02:00
|
|
|
VAR("NamingAuthoritativeDirectory",BOOL, NamingAuthoritativeDir, "0"),
|
2005-08-05 03:35:43 +02:00
|
|
|
VAR("Nickname", STRING, Nickname, NULL),
|
|
|
|
VAR("NoPublish", BOOL, NoPublish, "0"),
|
|
|
|
VAR("NodeFamily", LINELIST, NodeFamilies, NULL),
|
2004-11-03 11:08:44 +01:00
|
|
|
VAR("NumCpus", UINT, NumCpus, "1"),
|
2006-01-10 23:42:44 +01:00
|
|
|
VAR("NumEntryGuards", UINT, NumEntryGuards, "3"),
|
2005-12-28 10:07:31 +01:00
|
|
|
VAR("ORListenAddress", LINELIST, ORListenAddress, NULL),
|
2005-08-05 03:35:43 +02:00
|
|
|
VAR("ORPort", UINT, ORPort, "0"),
|
2004-11-03 11:08:44 +01:00
|
|
|
VAR("OutboundBindAddress", STRING, OutboundBindAddress, NULL),
|
|
|
|
VAR("PathlenCoinWeight", DOUBLE, PathlenCoinWeight, "0.3"),
|
2005-08-05 03:35:43 +02:00
|
|
|
VAR("PidFile", STRING, PidFile, NULL),
|
2005-10-17 02:35:53 +02:00
|
|
|
VAR("ProtocolWarnings", BOOL, ProtocolWarnings, "0"),
|
2005-08-08 23:58:48 +02:00
|
|
|
VAR("ReachableAddresses", LINELIST, ReachableAddresses, NULL),
|
2006-02-13 22:17:20 +01:00
|
|
|
VAR("ReachableORAddresses",LINELIST, ReachableORAddresses, NULL),
|
|
|
|
VAR("ReachableDirAddresses",LINELIST, ReachableDirAddresses, NULL),
|
2005-08-05 03:35:43 +02:00
|
|
|
VAR("RecommendedVersions", LINELIST, RecommendedVersions, NULL),
|
2005-08-25 22:33:17 +02:00
|
|
|
VAR("RecommendedClientVersions", LINELIST, RecommendedClientVersions, NULL),
|
|
|
|
VAR("RecommendedServerVersions", LINELIST, RecommendedServerVersions, NULL),
|
2004-11-03 11:08:44 +01:00
|
|
|
VAR("RedirectExit", LINELIST, RedirectExit, NULL),
|
2005-08-05 03:35:43 +02:00
|
|
|
VAR("RendExcludeNodes", STRING, RendExcludeNodes, NULL),
|
|
|
|
VAR("RendNodes", STRING, RendNodes, NULL),
|
2006-02-12 01:12:36 +01:00
|
|
|
VAR("RendPostPeriod", INTERVAL, RendPostPeriod, "1 hour"),
|
2005-07-25 12:29:21 +02:00
|
|
|
VAR("RephistTrackTime", INTERVAL, RephistTrackTime, "24 hours"),
|
2004-10-27 04:30:28 +02:00
|
|
|
OBSOLETE("RouterFile"),
|
2004-11-03 11:08:44 +01:00
|
|
|
VAR("RunAsDaemon", BOOL, RunAsDaemon, "0"),
|
|
|
|
VAR("RunTesting", BOOL, RunTesting, "0"),
|
2005-05-03 12:04:08 +02:00
|
|
|
VAR("SafeLogging", BOOL, SafeLogging, "1"),
|
2005-03-12 21:16:52 +01:00
|
|
|
VAR("ShutdownWaitLength", INTERVAL, ShutdownWaitLength, "30 seconds"),
|
2005-10-17 05:17:29 +02:00
|
|
|
VAR("SocksListenAddress", LINELIST, SocksListenAddress, NULL),
|
2004-11-03 11:08:44 +01:00
|
|
|
VAR("SocksPolicy", LINELIST, SocksPolicy, NULL),
|
2005-08-05 03:35:43 +02:00
|
|
|
VAR("SocksPort", UINT, SocksPort, "9050"),
|
2005-10-17 05:17:29 +02:00
|
|
|
/* if StatusFetchPeriod is 0, see get_status_fetch_period() in main.c */
|
|
|
|
VAR("StatusFetchPeriod", INTERVAL, StatusFetchPeriod, "0 seconds"),
|
2005-08-05 03:35:43 +02:00
|
|
|
VAR("StrictEntryNodes", BOOL, StrictEntryNodes, "0"),
|
|
|
|
VAR("StrictExitNodes", BOOL, StrictExitNodes, "0"),
|
2004-11-05 06:50:35 +01:00
|
|
|
VAR("SysLog", LINELIST_S, OldLogOptions, NULL),
|
2005-11-17 00:37:35 +01:00
|
|
|
VAR("TestSocks", BOOL, TestSocks, "0"),
|
2005-08-05 03:35:43 +02:00
|
|
|
VAR("TrackHostExits", CSV, TrackHostExits, NULL),
|
|
|
|
VAR("TrackHostExitsExpire",INTERVAL, TrackHostExitsExpire, "30 minutes"),
|
2004-10-27 04:30:28 +02:00
|
|
|
OBSOLETE("TrafficShaping"),
|
2006-01-10 23:42:44 +01:00
|
|
|
VAR("UseEntryGuards", BOOL, UseEntryGuards, "1"),
|
2005-08-05 03:35:43 +02:00
|
|
|
VAR("User", STRING, User, NULL),
|
2005-09-15 16:39:05 +02:00
|
|
|
VAR("V1AuthoritativeDirectory",BOOL, V1AuthoritativeDir, "0"),
|
2005-10-08 07:47:58 +02:00
|
|
|
VAR("VersioningAuthoritativeDirectory",BOOL,VersioningAuthoritativeDir, "0"),
|
2005-03-27 08:25:33 +02:00
|
|
|
VAR("__LeaveStreamsUnattached", BOOL,LeaveStreamsUnattached, "0"),
|
2006-01-06 16:43:03 +01:00
|
|
|
{ NULL, CONFIG_TYPE_OBSOLETE, 0, NULL }
|
2004-10-27 04:30:28 +02:00
|
|
|
};
|
2005-07-28 21:01:48 +02:00
|
|
|
#undef VAR
|
|
|
|
|
2005-12-14 21:40:40 +01:00
|
|
|
#define VAR(name,conftype,member,initvalue) \
|
|
|
|
{ name, CONFIG_TYPE_ ## conftype, STRUCT_OFFSET(or_state_t, member), \
|
2006-01-06 16:43:03 +01:00
|
|
|
initvalue }
|
2005-07-28 21:01:48 +02:00
|
|
|
static config_var_t _state_vars[] = {
|
2006-01-06 16:43:03 +01:00
|
|
|
VAR("AccountingBytesReadInInterval", MEMUNIT,
|
2005-12-28 10:07:31 +01:00
|
|
|
AccountingBytesReadInInterval, NULL),
|
2005-07-28 21:01:48 +02:00
|
|
|
VAR("AccountingBytesWrittenInInterval", MEMUNIT,
|
|
|
|
AccountingBytesWrittenInInterval, NULL),
|
|
|
|
VAR("AccountingExpectedUsage", MEMUNIT, AccountingExpectedUsage, NULL),
|
2005-12-14 21:40:40 +01:00
|
|
|
VAR("AccountingIntervalStart", ISOTIME, AccountingIntervalStart, NULL),
|
2005-08-05 03:35:43 +02:00
|
|
|
VAR("AccountingSecondsActive", INTERVAL, AccountingSecondsActive, NULL),
|
2006-01-10 23:42:44 +01:00
|
|
|
VAR("EntryGuard", LINELIST_S, EntryGuards, NULL),
|
|
|
|
VAR("EntryGuardDownSince", LINELIST_S, EntryGuards, NULL),
|
|
|
|
VAR("EntryGuardUnlistedSince", LINELIST_S, EntryGuards, NULL),
|
|
|
|
VAR("EntryGuards", LINELIST_V, EntryGuards, NULL),
|
2005-08-05 03:35:43 +02:00
|
|
|
|
2005-12-24 00:56:42 +01:00
|
|
|
VAR("BWHistoryReadEnds", ISOTIME, BWHistoryReadEnds, NULL),
|
|
|
|
VAR("BWHistoryReadInterval", UINT, BWHistoryReadInterval, NULL),
|
|
|
|
VAR("BWHistoryReadValues", CSV, BWHistoryReadValues, NULL),
|
|
|
|
VAR("BWHistoryWriteEnds", ISOTIME, BWHistoryWriteEnds, NULL),
|
|
|
|
VAR("BWHistoryWriteInterval", UINT, BWHistoryWriteInterval, NULL),
|
|
|
|
VAR("BWHistoryWriteValues", CSV, BWHistoryWriteValues, NULL),
|
|
|
|
|
2005-12-31 09:16:07 +01:00
|
|
|
VAR("TorVersion", STRING, TorVersion, NULL),
|
|
|
|
|
2005-12-28 10:07:31 +01:00
|
|
|
VAR("LastWritten", ISOTIME, LastWritten, NULL),
|
|
|
|
|
2006-01-06 16:43:03 +01:00
|
|
|
{ NULL, CONFIG_TYPE_OBSOLETE, 0, NULL }
|
2005-07-28 21:01:48 +02:00
|
|
|
};
|
|
|
|
|
2004-10-27 04:30:28 +02:00
|
|
|
#undef VAR
|
|
|
|
#undef OBSOLETE
|
|
|
|
|
2005-07-28 21:01:48 +02:00
|
|
|
/** DOCDOC*/
|
|
|
|
typedef struct config_var_description_t {
|
|
|
|
const char *name;
|
|
|
|
const char *description;
|
|
|
|
} config_var_description_t;
|
|
|
|
|
|
|
|
static config_var_description_t options_description[] = {
|
2005-08-04 21:56:41 +02:00
|
|
|
{ "Address", "The advertised (external) address we should use." },
|
2005-07-28 21:01:48 +02:00
|
|
|
// { "AccountingStart", ""},
|
|
|
|
{ NULL, NULL },
|
|
|
|
};
|
|
|
|
|
|
|
|
static config_var_description_t state_description[] = {
|
2006-01-11 00:26:59 +01:00
|
|
|
{ "AccountingBytesReadInInterval",
|
2006-01-06 16:43:03 +01:00
|
|
|
"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." },
|
|
|
|
|
2006-01-10 23:42:44 +01:00
|
|
|
{ "EntryGuard", "One of the nodes we have chosen as a fixed entry" },
|
|
|
|
{ "EntryGuardDownSince",
|
|
|
|
"The last entry guard has been down since this time." },
|
|
|
|
{ "EntryGuardUnlistedSince",
|
|
|
|
"The last entry guard has been unlisted since this time." },
|
2006-01-06 16:43:03 +01:00
|
|
|
{ "LastWritten", "When was this state file last regenerated?" },
|
|
|
|
|
|
|
|
{ "TorVersion", "Which version of Tor generated this state file?" },
|
2005-07-28 21:01:48 +02:00
|
|
|
{ NULL, NULL },
|
|
|
|
};
|
|
|
|
|
2006-01-10 21:27:47 +01:00
|
|
|
typedef int (*validate_fn_t)(void*,void*,int);
|
2005-07-22 22:37:42 +02:00
|
|
|
|
2005-10-06 06:33:40 +02:00
|
|
|
/** Information on the keys, value types, key-to-struct-member mappings,
|
|
|
|
* variable descriptions, validation functions, and abbreviations for a
|
|
|
|
* configuration or storage format. */
|
2005-07-22 22:37:42 +02:00
|
|
|
typedef struct {
|
|
|
|
size_t size;
|
|
|
|
uint32_t magic;
|
|
|
|
off_t magic_offset;
|
|
|
|
config_abbrev_t *abbrevs;
|
|
|
|
config_var_t *vars;
|
|
|
|
validate_fn_t validate_fn;
|
2005-07-28 21:01:48 +02:00
|
|
|
config_var_description_t *descriptions;
|
2006-02-13 09:22:57 +01:00
|
|
|
/** If present, extra is a LINELIST variable for unrecognized
|
|
|
|
* lines. Otherwise, unrecognized lines are an error. */
|
|
|
|
config_var_t *extra;
|
2005-07-22 22:37:42 +02:00
|
|
|
} config_format_t;
|
|
|
|
|
|
|
|
#define CHECK(fmt, cfg) do { \
|
|
|
|
tor_assert(fmt && cfg); \
|
2005-12-14 21:40:40 +01:00
|
|
|
tor_assert((fmt)->magic == \
|
2006-02-12 23:28:30 +01:00
|
|
|
*(uint32_t*)STRUCT_VAR_P(cfg,fmt->magic_offset)); \
|
2005-07-22 22:37:42 +02:00
|
|
|
} while (0)
|
|
|
|
|
2004-05-10 06:48:13 +02:00
|
|
|
/** Largest allowed config line */
|
2004-03-31 23:35:23 +02:00
|
|
|
#define CONFIG_LINE_T_MAXLEN 4096
|
2003-09-08 07:16:18 +02:00
|
|
|
|
2005-07-22 23:12:10 +02:00
|
|
|
static void config_line_append(config_line_t **lst,
|
2005-01-05 07:05:37 +01:00
|
|
|
const char *key, const char *val);
|
2005-09-08 08:59:58 +02:00
|
|
|
static void option_clear(config_format_t *fmt, or_options_t *options,
|
|
|
|
config_var_t *var);
|
2005-07-22 22:37:42 +02:00
|
|
|
static void option_reset(config_format_t *fmt, or_options_t *options,
|
2005-09-14 04:07:35 +02:00
|
|
|
config_var_t *var, int use_defaults);
|
2005-07-28 21:01:48 +02:00
|
|
|
static void config_free(config_format_t *fmt, void *options);
|
2005-07-22 22:37:42 +02:00
|
|
|
static int option_is_same(config_format_t *fmt,
|
2005-12-14 21:40:40 +01:00
|
|
|
or_options_t *o1, or_options_t *o2,
|
|
|
|
const char *name);
|
2005-07-22 22:37:42 +02:00
|
|
|
static or_options_t *options_dup(config_format_t *fmt, or_options_t *old);
|
2005-12-08 19:56:32 +01:00
|
|
|
static int options_validate(or_options_t *old_options,
|
2006-01-10 21:27:47 +01:00
|
|
|
or_options_t *options, int from_setconf);
|
2005-09-14 04:36:29 +02:00
|
|
|
static int options_act_reversible(or_options_t *old_options);
|
2005-08-22 02:18:45 +02:00
|
|
|
static int options_act(or_options_t *old_options);
|
2004-11-06 06:18:11 +01:00
|
|
|
static int options_transition_allowed(or_options_t *old, or_options_t *new);
|
2005-08-22 02:18:45 +02:00
|
|
|
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);
|
2004-11-06 06:18:11 +01:00
|
|
|
static int check_nickname_list(const char *lst, const char *name);
|
2005-02-22 01:53:08 +01:00
|
|
|
static void config_register_addressmaps(or_options_t *options);
|
2004-11-06 06:18:11 +01:00
|
|
|
|
2004-11-09 00:12:40 +01:00
|
|
|
static int parse_dir_server_line(const char *line, int validate_only);
|
2006-02-12 01:03:06 +01:00
|
|
|
static int config_cmp_single_addr_policy(addr_policy_t *a, addr_policy_t *b);
|
2006-02-12 23:59:38 +01:00
|
|
|
static int config_addr_policy_covers(addr_policy_t *a, addr_policy_t *b);
|
2006-02-13 02:54:31 +01:00
|
|
|
static int config_addr_policy_intersects(addr_policy_t *a, addr_policy_t *b);
|
2004-11-09 19:22:17 +01:00
|
|
|
static int parse_redirect_line(smartlist_t *result,
|
2005-07-22 23:12:10 +02:00
|
|
|
config_line_t *line);
|
2004-11-05 06:50:35 +01:00
|
|
|
static int parse_log_severity_range(const char *range, int *min_out,
|
|
|
|
int *max_out);
|
|
|
|
static int convert_log_option(or_options_t *options,
|
2005-07-22 23:12:10 +02:00
|
|
|
config_line_t *level_opt,
|
|
|
|
config_line_t *file_opt, int isDaemon);
|
2004-11-05 06:50:35 +01:00
|
|
|
static int add_single_log_option(or_options_t *options, int minSeverity,
|
|
|
|
int maxSeverity,
|
|
|
|
const char *type, const char *fname);
|
|
|
|
static int normalize_log_options(or_options_t *options);
|
2004-11-09 06:35:49 +01:00
|
|
|
static int validate_data_directory(or_options_t *options);
|
2004-11-14 21:51:28 +01:00
|
|
|
static int write_configuration_file(const char *fname, or_options_t *options);
|
2005-07-22 23:12:10 +02:00
|
|
|
static config_line_t *get_assigned_option(config_format_t *fmt,
|
2005-07-22 22:37:42 +02:00
|
|
|
or_options_t *options, const char *key);
|
2005-07-28 21:01:48 +02:00
|
|
|
static void config_init(config_format_t *fmt, void *options);
|
2006-01-10 21:38:33 +01:00
|
|
|
static int or_state_validate(or_state_t *old_options, or_state_t *options,
|
|
|
|
int from_setconf);
|
2003-09-08 07:16:18 +02:00
|
|
|
|
2004-11-20 01:37:00 +01:00
|
|
|
static uint64_t config_parse_memunit(const char *s, int *ok);
|
|
|
|
static int config_parse_interval(const char *s, int *ok);
|
2004-11-29 23:25:31 +01:00
|
|
|
static void print_cvs_version(void);
|
2005-08-08 23:58:48 +02:00
|
|
|
static void parse_reachable_addresses(void);
|
2005-06-08 15:53:19 +02:00
|
|
|
static int init_libevent(void);
|
2005-12-08 19:56:32 +01:00
|
|
|
static int opt_streq(const char *s1, const char *s2);
|
2005-06-08 22:35:28 +02:00
|
|
|
#if defined(HAVE_EVENT_GET_VERSION) && defined(HAVE_EVENT_GET_METHOD)
|
2005-06-08 15:53:19 +02:00
|
|
|
static void check_libevent_version(const char *m, const char *v, int server);
|
2005-06-08 22:35:28 +02:00
|
|
|
#endif
|
2004-11-20 01:37:00 +01:00
|
|
|
|
2005-08-12 19:24:53 +02:00
|
|
|
/*static*/ or_options_t *options_new(void);
|
|
|
|
|
2005-07-22 22:37:42 +02:00
|
|
|
#define OR_OPTIONS_MAGIC 9090909
|
|
|
|
|
2005-08-04 21:56:41 +02:00
|
|
|
static config_format_t options_format = {
|
2005-07-22 22:37:42 +02:00
|
|
|
sizeof(or_options_t),
|
|
|
|
OR_OPTIONS_MAGIC,
|
|
|
|
STRUCT_OFFSET(or_options_t, _magic),
|
2005-07-28 21:01:48 +02:00
|
|
|
_option_abbrevs,
|
|
|
|
_option_vars,
|
|
|
|
(validate_fn_t)options_validate,
|
2006-02-12 23:28:30 +01:00
|
|
|
options_description,
|
|
|
|
NULL
|
2005-07-28 21:01:48 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
#define OR_STATE_MAGIC 0x57A73f57
|
|
|
|
|
2006-02-12 23:28:30 +01:00
|
|
|
static config_var_t state_extra_var = {
|
|
|
|
"__extra", CONFIG_TYPE_LINELIST, STRUCT_OFFSET(or_state_t, ExtraLines), NULL
|
|
|
|
};
|
|
|
|
|
2005-07-28 21:01:48 +02:00
|
|
|
static config_format_t state_format = {
|
|
|
|
sizeof(or_state_t),
|
|
|
|
OR_STATE_MAGIC,
|
|
|
|
STRUCT_OFFSET(or_state_t, _magic),
|
2005-12-28 10:07:31 +01:00
|
|
|
_state_abbrevs,
|
2005-07-28 21:01:48 +02:00
|
|
|
_state_vars,
|
|
|
|
(validate_fn_t)or_state_validate,
|
2006-02-12 23:28:30 +01:00
|
|
|
state_description,
|
|
|
|
&state_extra_var,
|
2005-07-22 22:37:42 +02:00
|
|
|
};
|
|
|
|
|
2004-11-06 06:18:11 +01:00
|
|
|
/*
|
|
|
|
* Functions to read and write the global options pointer.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/** Command-line and config-file options. */
|
2005-07-28 21:01:48 +02:00
|
|
|
static or_options_t *global_options = NULL;
|
2004-11-15 04:53:03 +01:00
|
|
|
/** Name of most recently read torrc file. */
|
2005-08-10 20:05:20 +02:00
|
|
|
static char *torrc_fname = NULL;
|
2006-01-02 05:14:52 +01:00
|
|
|
/** Persistent serialized state. */
|
2005-07-28 21:01:48 +02:00
|
|
|
static or_state_t *global_state = NULL;
|
2005-08-08 23:58:48 +02:00
|
|
|
/** DOCDOC */
|
2006-02-13 22:17:20 +01:00
|
|
|
static addr_policy_t *reachable_or_addr_policy = NULL;
|
|
|
|
static addr_policy_t *reachable_dir_addr_policy = NULL;
|
2004-11-06 06:18:11 +01:00
|
|
|
|
2005-07-22 22:37:42 +02:00
|
|
|
static void *
|
|
|
|
config_alloc(config_format_t *fmt)
|
|
|
|
{
|
|
|
|
void *opts = opts = tor_malloc_zero(fmt->size);
|
2006-02-12 23:28:30 +01:00
|
|
|
*(uint32_t*)STRUCT_VAR_P(opts, fmt->magic_offset) = fmt->magic;
|
2005-07-22 22:37:42 +02:00
|
|
|
CHECK(fmt, opts);
|
|
|
|
return opts;
|
|
|
|
}
|
|
|
|
|
2004-11-09 00:12:40 +01:00
|
|
|
/** Return the currently configured options. */
|
|
|
|
or_options_t *
|
2005-06-11 20:52:12 +02:00
|
|
|
get_options(void)
|
|
|
|
{
|
2004-11-06 06:18:11 +01:00
|
|
|
tor_assert(global_options);
|
|
|
|
return global_options;
|
|
|
|
}
|
2004-11-09 00:12:40 +01:00
|
|
|
|
2005-08-22 02:18:45 +02:00
|
|
|
/** 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.
|
2004-11-09 00:12:40 +01:00
|
|
|
*/
|
2005-09-14 04:36:29 +02:00
|
|
|
int
|
2005-06-11 20:52:12 +02:00
|
|
|
set_options(or_options_t *new_val)
|
|
|
|
{
|
2005-08-22 02:18:45 +02:00
|
|
|
or_options_t *old_options = global_options;
|
2004-11-09 00:12:40 +01:00
|
|
|
global_options = new_val;
|
2005-08-26 22:26:20 +02:00
|
|
|
/* Note that we pass the *old* options below, for comparison. It
|
|
|
|
* pulls the new options directly out of global_options. */
|
2005-09-14 04:36:29 +02:00
|
|
|
if (options_act_reversible(old_options)<0) {
|
|
|
|
global_options = old_options;
|
|
|
|
return -1;
|
|
|
|
}
|
2005-08-22 02:18:45 +02:00
|
|
|
if (options_act(old_options) < 0) { /* acting on the options failed. die. */
|
2006-02-13 10:02:35 +01:00
|
|
|
log_err(LD_CONFIG,
|
|
|
|
"Acting on config options left us in a broken state. Dying.");
|
2005-08-22 02:18:45 +02:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
if (old_options)
|
2005-08-26 22:26:20 +02:00
|
|
|
config_free(&options_format, old_options);
|
2005-09-14 04:36:29 +02:00
|
|
|
|
|
|
|
return 0;
|
2004-11-09 05:28:18 +01:00
|
|
|
}
|
|
|
|
|
2005-02-11 02:26:47 +01:00
|
|
|
void
|
|
|
|
config_free_all(void)
|
|
|
|
{
|
2005-10-12 21:08:48 +02:00
|
|
|
if (global_options) {
|
|
|
|
config_free(&options_format, global_options);
|
|
|
|
global_options = NULL;
|
|
|
|
}
|
|
|
|
if (global_state) {
|
|
|
|
config_free(&state_format, global_state);
|
|
|
|
global_state = NULL;
|
|
|
|
}
|
2005-08-10 20:05:20 +02:00
|
|
|
tor_free(torrc_fname);
|
2006-02-13 22:17:20 +01:00
|
|
|
if (reachable_or_addr_policy) {
|
|
|
|
addr_policy_free(reachable_or_addr_policy);
|
|
|
|
reachable_or_addr_policy = NULL;
|
|
|
|
}
|
|
|
|
if (reachable_dir_addr_policy) {
|
|
|
|
addr_policy_free(reachable_dir_addr_policy);
|
|
|
|
reachable_dir_addr_policy = NULL;
|
2005-10-12 21:08:48 +02:00
|
|
|
}
|
2005-02-11 02:26:47 +01:00
|
|
|
}
|
|
|
|
|
2005-05-03 12:04:08 +02:00
|
|
|
/** If options->SafeLogging is on, return a not very useful string,
|
|
|
|
* else return address.
|
|
|
|
*/
|
|
|
|
const char *
|
2005-06-11 20:52:12 +02:00
|
|
|
safe_str(const char *address)
|
|
|
|
{
|
2005-05-03 12:04:08 +02:00
|
|
|
if (get_options()->SafeLogging)
|
|
|
|
return "[scrubbed]";
|
|
|
|
else
|
|
|
|
return address;
|
|
|
|
}
|
|
|
|
|
2005-11-18 03:47:09 +01:00
|
|
|
/** Add the default directory servers directly into the trusted dir list. */
|
|
|
|
static void
|
|
|
|
add_default_trusted_dirservers(void)
|
|
|
|
{
|
|
|
|
const char *dirservers[] = {
|
2005-12-14 21:40:40 +01:00
|
|
|
"moria1 v1 18.244.0.188:9031 "
|
|
|
|
"FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441",
|
|
|
|
"moria2 v1 18.244.0.114:80 719B E45D E224 B607 C537 07D0 E214 3E2D 423E 74CF",
|
|
|
|
"tor26 v1 86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D"
|
|
|
|
};
|
2005-11-18 03:47:09 +01:00
|
|
|
parse_dir_server_line(dirservers[0], 0);
|
|
|
|
parse_dir_server_line(dirservers[1], 0);
|
|
|
|
parse_dir_server_line(dirservers[2], 0);
|
|
|
|
}
|
|
|
|
|
2005-09-14 04:36:29 +02:00
|
|
|
/** 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
|
|
|
|
options_act_reversible(or_options_t *old_options)
|
|
|
|
{
|
|
|
|
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;
|
2006-01-11 20:40:14 +01:00
|
|
|
int logs_marked = 0;
|
2005-09-14 04:36:29 +02:00
|
|
|
|
|
|
|
if (running_tor && options->RunAsDaemon) {
|
|
|
|
/* No need to roll back, since you can't change the value. */
|
|
|
|
start_daemon();
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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. */
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set up libevent. */
|
|
|
|
if (running_tor && !libevent_initialized) {
|
|
|
|
if (init_libevent())
|
|
|
|
goto done;
|
|
|
|
libevent_initialized = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Ensure data directory is private; create if possible. */
|
|
|
|
if (check_private_dir(options->DataDirectory, CPD_CREATE)<0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_err(LD_FS, "Couldn't access/create private data directory \"%s\"",
|
|
|
|
options->DataDirectory);
|
2005-09-14 04:36:29 +02:00
|
|
|
/* No need to roll back, since you can't change the value. */
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Bail out at this point if we're not going to be a client or server:
|
|
|
|
* we don't run */
|
|
|
|
if (options->command != CMD_RUN_TOR)
|
|
|
|
goto commit;
|
|
|
|
|
|
|
|
options->_ConnLimit =
|
|
|
|
set_max_file_descriptors((unsigned)options->ConnLimit, MAXCONNECTIONS);
|
|
|
|
if (options->_ConnLimit < 0)
|
|
|
|
goto rollback;
|
|
|
|
set_conn_limit = 1;
|
|
|
|
|
|
|
|
if (retry_all_listeners(0, replaced_listeners, new_listeners) < 0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_err(LD_CONFIG, "Failed to bind one of the listener ports.");
|
2005-09-14 04:36:29 +02:00
|
|
|
goto rollback;
|
|
|
|
}
|
|
|
|
|
2006-01-11 20:40:14 +01:00
|
|
|
mark_logs_temp(); /* Close current logs once new logs are open. */
|
|
|
|
logs_marked = 1;
|
|
|
|
if (options_init_logs(options, 0)<0) /* Configure the log(s) */
|
|
|
|
goto rollback;
|
|
|
|
|
2005-09-14 04:36:29 +02:00
|
|
|
commit:
|
|
|
|
r = 0;
|
2006-01-11 20:40:14 +01:00
|
|
|
if (logs_marked) {
|
|
|
|
close_temp_logs();
|
|
|
|
add_callback_log(LOG_ERR, LOG_ERR, control_event_logmsg);
|
|
|
|
control_adjust_event_log_severity();
|
|
|
|
}
|
2005-09-14 04:36:29 +02:00
|
|
|
SMARTLIST_FOREACH(replaced_listeners, connection_t *, conn,
|
|
|
|
{
|
2006-02-13 10:02:35 +01:00
|
|
|
log_notice(LD_NET, "Closing old %s on %s:%d",
|
|
|
|
conn_type_to_string(conn->type), conn->address, conn->port);
|
2005-09-14 04:36:29 +02:00
|
|
|
connection_close_immediate(conn);
|
|
|
|
connection_mark_for_close(conn);
|
|
|
|
});
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
rollback:
|
|
|
|
r = -1;
|
|
|
|
|
2006-01-11 20:40:14 +01:00
|
|
|
if (logs_marked) {
|
|
|
|
rollback_log_changes();
|
|
|
|
control_adjust_event_log_severity();
|
|
|
|
}
|
|
|
|
|
2005-09-14 04:36:29 +02:00
|
|
|
if (set_conn_limit && old_options)
|
|
|
|
set_max_file_descriptors((unsigned)old_options->ConnLimit,MAXCONNECTIONS);
|
|
|
|
|
|
|
|
SMARTLIST_FOREACH(new_listeners, connection_t *, conn,
|
|
|
|
{
|
2006-02-13 10:02:35 +01:00
|
|
|
log_notice(LD_NET, "Closing %s on %s:%d",
|
|
|
|
conn_type_to_string(conn->type), conn->address, conn->port);
|
2005-09-14 04:36:29 +02:00
|
|
|
connection_close_immediate(conn);
|
|
|
|
connection_mark_for_close(conn);
|
|
|
|
});
|
|
|
|
|
|
|
|
done:
|
|
|
|
smartlist_free(new_listeners);
|
|
|
|
smartlist_free(replaced_listeners);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2005-08-22 02:18:45 +02:00
|
|
|
/** 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.
|
2004-12-31 22:47:54 +01:00
|
|
|
*
|
2005-08-22 02:18:45 +02:00
|
|
|
* Return 0 if all goes well, return -1 if it's time to die.
|
2004-12-31 22:47:54 +01:00
|
|
|
*
|
|
|
|
* Note 2: We haven't moved all the "act on new configuration" logic
|
|
|
|
* here yet. Some is still in do_hup() and other places.
|
2004-11-09 05:28:18 +01:00
|
|
|
*/
|
2005-08-22 02:18:45 +02:00
|
|
|
static int
|
|
|
|
options_act(or_options_t *old_options)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2005-07-22 23:12:10 +02:00
|
|
|
config_line_t *cl;
|
2005-08-27 00:03:57 +02:00
|
|
|
char *fn;
|
|
|
|
size_t len;
|
2004-11-09 05:28:18 +01:00
|
|
|
or_options_t *options = get_options();
|
2005-08-27 01:22:27 +02:00
|
|
|
int running_tor = options->command == CMD_RUN_TOR;
|
2004-11-09 00:12:40 +01:00
|
|
|
|
|
|
|
clear_trusted_dir_servers();
|
2005-11-18 03:47:09 +01:00
|
|
|
if (options->DirServers) {
|
|
|
|
for (cl = options->DirServers; cl; cl = cl->next) {
|
|
|
|
if (parse_dir_server_line(cl->value, 0)<0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_err(LD_BUG,
|
2005-11-18 03:47:09 +01:00
|
|
|
"Bug: Previously validated DirServer line could not be added!");
|
|
|
|
return -1;
|
|
|
|
}
|
2004-11-09 00:12:40 +01:00
|
|
|
}
|
2005-11-18 03:47:09 +01:00
|
|
|
} else {
|
|
|
|
add_default_trusted_dirservers();
|
2004-11-09 00:12:40 +01:00
|
|
|
}
|
|
|
|
|
2005-08-27 01:22:27 +02:00
|
|
|
if (running_tor && rend_config_services(options, 0)<0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_err(LD_BUG,
|
|
|
|
"Bug: Previously validated hidden services line could not be added!");
|
2004-11-09 05:28:18 +01:00
|
|
|
return -1;
|
2004-11-09 00:12:40 +01:00
|
|
|
}
|
2004-11-09 05:28:18 +01:00
|
|
|
|
2005-08-27 01:22:27 +02:00
|
|
|
if (running_tor) {
|
|
|
|
len = strlen(options->DataDirectory)+32;
|
|
|
|
fn = tor_malloc(len);
|
|
|
|
tor_snprintf(fn, len, "%s/cached-status", options->DataDirectory);
|
|
|
|
if (check_private_dir(fn, CPD_CREATE) != 0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_err(LD_CONFIG,
|
|
|
|
"Couldn't access/create private data directory \"%s\"", fn);
|
2005-08-27 01:22:27 +02:00
|
|
|
tor_free(fn);
|
|
|
|
return -1;
|
|
|
|
}
|
2005-08-27 00:03:57 +02:00
|
|
|
tor_free(fn);
|
|
|
|
}
|
2004-11-09 05:28:18 +01:00
|
|
|
|
2005-08-15 12:27:37 +02:00
|
|
|
/* Bail out at this point if we're not going to be a client or server:
|
|
|
|
* we want to not fork, and to log stuff to stderr. */
|
2004-11-09 05:28:18 +01:00
|
|
|
if (options->command != CMD_RUN_TOR)
|
|
|
|
return 0;
|
|
|
|
|
2005-07-28 21:01:48 +02:00
|
|
|
/* Load state */
|
|
|
|
if (! global_state)
|
|
|
|
if (or_state_load())
|
|
|
|
return -1;
|
|
|
|
|
2004-11-09 19:22:17 +01:00
|
|
|
{
|
|
|
|
smartlist_t *sl = smartlist_create();
|
|
|
|
for (cl = options->RedirectExit; cl; cl = cl->next) {
|
|
|
|
if (parse_redirect_line(sl, cl)<0)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
set_exit_redirects(sl);
|
|
|
|
}
|
|
|
|
|
2004-11-09 05:28:18 +01:00
|
|
|
/* Finish backgrounding the process */
|
2005-08-27 01:22:27 +02:00
|
|
|
if (running_tor && options->RunAsDaemon) {
|
2004-11-09 19:22:17 +01:00
|
|
|
/* We may be calling this for the n'th time (on SIGHUP), but it's safe. */
|
2005-04-06 21:07:38 +02:00
|
|
|
finish_daemon(options->DataDirectory);
|
2004-11-09 05:28:18 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Write our pid to the pid file. If we do not have write permissions we
|
|
|
|
* will log a warning */
|
2005-08-27 01:22:27 +02:00
|
|
|
if (running_tor && options->PidFile)
|
2004-11-09 05:28:18 +01:00
|
|
|
write_pidfile(options->PidFile);
|
|
|
|
|
2005-02-22 01:53:08 +01:00
|
|
|
/* Register addressmap directives */
|
|
|
|
config_register_addressmaps(options);
|
|
|
|
|
2004-11-12 20:39:13 +01:00
|
|
|
/* Update address policies. */
|
|
|
|
parse_socks_policy();
|
|
|
|
parse_dir_policy();
|
2005-09-15 16:39:05 +02:00
|
|
|
parse_authdir_policy();
|
2005-08-08 23:58:48 +02:00
|
|
|
parse_reachable_addresses();
|
2004-11-12 20:39:13 +01:00
|
|
|
|
2004-11-12 17:39:03 +01:00
|
|
|
init_cookie_authentication(options->CookieAuthentication);
|
|
|
|
|
2004-11-09 05:28:18 +01:00
|
|
|
/* reload keys as needed for rendezvous services. */
|
|
|
|
if (rend_service_load_keys()<0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_err(LD_GENERAL,"Error loading rendezvous service keys");
|
2004-11-09 05:28:18 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-11-14 23:21:23 +01:00
|
|
|
/* Set up accounting */
|
2004-11-22 22:56:51 +01:00
|
|
|
if (accounting_parse_options(options, 0)<0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_err(LD_CONFIG,"Error in accounting options");
|
2004-11-22 22:56:51 +01:00
|
|
|
return -1;
|
|
|
|
}
|
2004-11-15 05:01:31 +01:00
|
|
|
if (accounting_is_enabled(options))
|
2004-11-14 23:21:23 +01:00
|
|
|
configure_accounting(time(NULL));
|
|
|
|
|
2005-08-27 01:22:27 +02:00
|
|
|
if (!running_tor)
|
|
|
|
return 0;
|
|
|
|
|
2005-08-22 02:18:45 +02:00
|
|
|
/* Check for transitions that need action. */
|
|
|
|
if (old_options) {
|
2006-01-10 23:42:44 +01:00
|
|
|
if (options->UseEntryGuards && !old_options->UseEntryGuards) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_CIRC,
|
|
|
|
"Switching to entry guards; abandoning previous circuits");
|
2005-10-06 01:02:40 +02:00
|
|
|
circuit_mark_all_unused_circs();
|
|
|
|
circuit_expire_all_dirty_circs();
|
|
|
|
}
|
|
|
|
|
2005-08-22 02:18:45 +02:00
|
|
|
if (options_transition_affects_workers(old_options, options)) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_GENERAL,
|
|
|
|
"Worker-related options changed. Rotating workers.");
|
2006-01-17 05:01:32 +01:00
|
|
|
if (server_mode(options) && !server_mode(old_options)) {
|
|
|
|
extern int has_completed_circuit;
|
|
|
|
if (init_keys() < 0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_err(LD_GENERAL,"Error initializing keys; exiting");
|
2006-01-17 05:01:32 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
server_has_changed_ip();
|
|
|
|
if (has_completed_circuit)
|
|
|
|
inform_testing_reachability();
|
|
|
|
}
|
2005-08-22 02:18:45 +02:00
|
|
|
cpuworkers_rotate();
|
|
|
|
dnsworkers_rotate();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-12-31 07:32:57 +01:00
|
|
|
/* Check if we need to parse and add the EntryNodes config option. */
|
2006-01-02 06:14:21 +01:00
|
|
|
if (options->EntryNodes &&
|
|
|
|
(!old_options ||
|
|
|
|
!opt_streq(old_options->EntryNodes, options->EntryNodes)))
|
2005-12-31 07:32:57 +01:00
|
|
|
entry_nodes_should_be_added();
|
|
|
|
|
2004-11-13 17:53:48 +01:00
|
|
|
/* Since our options changed, we might need to regenerate and upload our
|
2005-08-22 02:18:45 +02:00
|
|
|
* server descriptor.
|
2004-11-13 17:53:48 +01:00
|
|
|
*/
|
2005-12-14 21:40:40 +01:00
|
|
|
if (!old_options ||
|
|
|
|
options_transition_affects_descriptor(old_options, options))
|
2005-08-22 02:18:45 +02:00
|
|
|
mark_my_descriptor_dirty();
|
2004-11-13 17:53:48 +01:00
|
|
|
|
2004-11-09 05:28:18 +01:00
|
|
|
return 0;
|
2004-11-06 06:18:11 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Functions to parse config options
|
|
|
|
*/
|
|
|
|
|
2004-10-27 05:08:04 +02:00
|
|
|
/** If <b>option</b> is an official abbreviation for a longer option,
|
2004-10-27 19:37:01 +02:00
|
|
|
* return the longer option. Otherwise return <b>option</b>.
|
|
|
|
* If <b>command_line</b> is set, apply all abbreviations. Otherwise, only
|
2005-10-17 05:06:00 +02:00
|
|
|
* apply abbreviations that work for the config file and the command line.
|
|
|
|
* If <b>warn_obsolete</b> is set, warn about deprecated names. */
|
2004-10-27 04:30:28 +02:00
|
|
|
static const char *
|
2005-10-17 05:06:00 +02:00
|
|
|
expand_abbrev(config_format_t *fmt, const char *option, int command_line,
|
|
|
|
int warn_obsolete)
|
2004-10-27 04:30:28 +02:00
|
|
|
{
|
|
|
|
int i;
|
2005-07-22 22:37:42 +02:00
|
|
|
if (! fmt->abbrevs)
|
|
|
|
return option;
|
|
|
|
for (i=0; fmt->abbrevs[i].abbreviated; ++i) {
|
2005-10-17 05:06:00 +02:00
|
|
|
/* Abbreviations are casei. */
|
2005-07-22 22:37:42 +02:00
|
|
|
if (!strcasecmp(option,fmt->abbrevs[i].abbreviated) &&
|
|
|
|
(command_line || !fmt->abbrevs[i].commandline_only)) {
|
2005-10-17 05:06:00 +02:00
|
|
|
if (warn_obsolete && fmt->abbrevs[i].warn) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,
|
|
|
|
"The configuration option '%s' is deprecated; "
|
|
|
|
"use '%s' instead.",
|
|
|
|
fmt->abbrevs[i].abbreviated,
|
|
|
|
fmt->abbrevs[i].full);
|
2005-10-17 05:06:00 +02:00
|
|
|
}
|
2005-07-22 22:37:42 +02:00
|
|
|
return fmt->abbrevs[i].full;
|
2004-10-27 19:37:01 +02:00
|
|
|
}
|
2004-10-27 04:30:28 +02:00
|
|
|
}
|
|
|
|
return option;
|
|
|
|
}
|
2004-10-17 03:57:34 +02:00
|
|
|
|
2005-09-10 06:40:27 +02:00
|
|
|
/** Helper: Read a list of configuration options from the command line.
|
|
|
|
* If successful, put them in *<b>result</b> and return 0, and return
|
|
|
|
* -1 and leave *<b>result</b> alone. */
|
|
|
|
static int
|
|
|
|
config_get_commandlines(int argc, char **argv, config_line_t **result)
|
2004-10-14 04:47:09 +02:00
|
|
|
{
|
2005-07-22 23:12:10 +02:00
|
|
|
config_line_t *front = NULL;
|
|
|
|
config_line_t **new = &front;
|
2002-11-23 07:49:01 +01:00
|
|
|
char *s;
|
|
|
|
int i = 1;
|
|
|
|
|
2005-09-10 06:40:27 +02:00
|
|
|
while (i < argc) {
|
2004-11-03 20:49:03 +01:00
|
|
|
if (!strcmp(argv[i],"-f") ||
|
|
|
|
!strcmp(argv[i],"--hash-password")) {
|
|
|
|
i += 2; /* command-line option with argument. ignore them. */
|
2002-11-23 07:49:01 +01:00
|
|
|
continue;
|
2004-10-30 21:18:37 +02:00
|
|
|
} else if (!strcmp(argv[i],"--list-fingerprint")) {
|
|
|
|
i += 1; /* command-line option. ignore it. */
|
2004-11-03 20:49:03 +01:00
|
|
|
continue;
|
2005-02-05 22:40:25 +01:00
|
|
|
} else if (!strcmp(argv[i],"--nt-service")) {
|
|
|
|
i += 1;
|
|
|
|
continue;
|
2002-11-23 07:49:01 +01:00
|
|
|
}
|
2005-09-10 06:40:27 +02:00
|
|
|
if (i == argc-1) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,"Command-line option '%s' with no value. Failing.",
|
|
|
|
argv[i]);
|
2005-09-10 06:40:27 +02:00
|
|
|
config_free_lines(front);
|
|
|
|
return -1;
|
|
|
|
}
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2005-07-22 23:12:10 +02:00
|
|
|
*new = tor_malloc_zero(sizeof(config_line_t));
|
2002-11-23 07:49:01 +01:00
|
|
|
s = argv[i];
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
while (*s == '-')
|
2002-11-23 07:49:01 +01:00
|
|
|
s++;
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2005-10-17 05:06:00 +02:00
|
|
|
(*new)->key = tor_strdup(expand_abbrev(&options_format, s, 1, 1));
|
2005-07-11 19:35:36 +02:00
|
|
|
(*new)->value = tor_strdup(argv[i+1]);
|
|
|
|
(*new)->next = NULL;
|
2005-10-25 09:05:03 +02:00
|
|
|
log(LOG_DEBUG, LD_CONFIG, "Commandline: parsed keyword '%s', value '%s'",
|
2005-07-11 19:35:36 +02:00
|
|
|
(*new)->key, (*new)->value);
|
|
|
|
|
|
|
|
new = &((*new)->next);
|
2002-11-23 07:49:01 +01:00
|
|
|
i += 2;
|
|
|
|
}
|
2005-09-10 06:40:27 +02:00
|
|
|
*result = front;
|
|
|
|
return 0;
|
2002-11-23 07:49:01 +01:00
|
|
|
}
|
|
|
|
|
2004-05-10 06:48:13 +02:00
|
|
|
/** Helper: allocate a new configuration option mapping 'key' to 'val',
|
2005-01-05 07:05:37 +01:00
|
|
|
* append it to *<b>lst</b>. */
|
|
|
|
static void
|
2005-07-22 23:12:10 +02:00
|
|
|
config_line_append(config_line_t **lst,
|
2005-01-05 07:05:37 +01:00
|
|
|
const char *key,
|
|
|
|
const char *val)
|
2004-03-31 23:35:23 +02:00
|
|
|
{
|
2005-07-22 23:12:10 +02:00
|
|
|
config_line_t *newline;
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2005-07-22 23:12:10 +02:00
|
|
|
newline = tor_malloc(sizeof(config_line_t));
|
2004-03-31 23:35:23 +02:00
|
|
|
newline->key = tor_strdup(key);
|
|
|
|
newline->value = tor_strdup(val);
|
2005-01-05 07:05:37 +01:00
|
|
|
newline->next = NULL;
|
|
|
|
while (*lst)
|
|
|
|
lst = &((*lst)->next);
|
|
|
|
|
|
|
|
(*lst) = newline;
|
2004-03-31 23:35:23 +02:00
|
|
|
}
|
|
|
|
|
2004-11-06 06:18:11 +01:00
|
|
|
/** Helper: parse the config string and strdup into key/value
|
|
|
|
* strings. Set *result to the list, or NULL if parsing the string
|
2004-09-03 00:08:36 +02:00
|
|
|
* failed. Return 0 on success, -1 on failure. Warn and ignore any
|
|
|
|
* misformatted lines. */
|
2004-11-06 06:18:11 +01:00
|
|
|
int
|
2005-07-22 23:12:10 +02:00
|
|
|
config_get_lines(char *string, config_line_t **result)
|
2004-10-14 04:47:09 +02:00
|
|
|
{
|
2005-07-22 23:12:10 +02:00
|
|
|
config_line_t *list = NULL, **next;
|
2004-11-06 06:18:11 +01:00
|
|
|
char *k, *v;
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2005-01-05 07:05:37 +01:00
|
|
|
next = &list;
|
2004-11-06 06:18:11 +01:00
|
|
|
do {
|
|
|
|
string = parse_line_from_str(string, &k, &v);
|
|
|
|
if (!string) {
|
|
|
|
config_free_lines(list);
|
|
|
|
return -1;
|
|
|
|
}
|
2005-01-05 07:05:37 +01:00
|
|
|
if (k && v) {
|
|
|
|
/* This list can get long, so we keep a pointer to the end of it
|
|
|
|
* rather than using config_line_append over and over and getting n^2
|
|
|
|
* performance. This is the only really long list. */
|
2005-07-22 23:12:10 +02:00
|
|
|
*next = tor_malloc(sizeof(config_line_t));
|
2005-01-05 07:05:37 +01:00
|
|
|
(*next)->key = tor_strdup(k);
|
|
|
|
(*next)->value = tor_strdup(v);
|
|
|
|
(*next)->next = NULL;
|
|
|
|
next = &((*next)->next);
|
|
|
|
}
|
2004-11-06 06:18:11 +01:00
|
|
|
} while (*string);
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2004-11-06 06:18:11 +01:00
|
|
|
*result = list;
|
2004-11-04 09:26:34 +01:00
|
|
|
return 0;
|
2002-06-27 00:45:49 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 06:48:13 +02:00
|
|
|
/**
|
|
|
|
* Free all the configuration lines on the linked list <b>front</b>.
|
|
|
|
*/
|
2004-11-06 06:18:11 +01:00
|
|
|
void
|
2005-07-22 23:12:10 +02:00
|
|
|
config_free_lines(config_line_t *front)
|
2004-10-14 04:47:09 +02:00
|
|
|
{
|
2005-07-22 23:12:10 +02:00
|
|
|
config_line_t *tmp;
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
while (front) {
|
2002-11-23 07:49:01 +01:00
|
|
|
tmp = front;
|
|
|
|
front = tmp->next;
|
|
|
|
|
2004-09-29 08:52:36 +02:00
|
|
|
tor_free(tmp->key);
|
|
|
|
tor_free(tmp->value);
|
|
|
|
tor_free(tmp);
|
2002-11-23 07:49:01 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-08-04 21:56:41 +02:00
|
|
|
/** DOCDOC */
|
|
|
|
static const char *
|
|
|
|
config_find_description(config_format_t *fmt, const char *name)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i=0; fmt->descriptions[i].name; ++i) {
|
|
|
|
if (!strcasecmp(name, fmt->descriptions[i].name))
|
|
|
|
return fmt->descriptions[i].description;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2004-10-27 05:08:04 +02:00
|
|
|
/** If <b>key</b> is a configuration option, return the corresponding
|
|
|
|
* config_var_t. Otherwise, if <b>key</b> is a non-standard abbreviation,
|
|
|
|
* warn, and return the corresponding config_var_t. Otherwise return NULL.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static config_var_t *
|
2005-07-22 22:37:42 +02:00
|
|
|
config_find_option(config_format_t *fmt, const char *key)
|
2004-10-27 04:30:28 +02:00
|
|
|
{
|
|
|
|
int i;
|
2005-02-01 01:05:57 +01:00
|
|
|
size_t keylen = strlen(key);
|
2005-02-05 22:42:46 +01:00
|
|
|
if (!keylen)
|
2005-02-01 01:05:57 +01:00
|
|
|
return NULL; /* if they say "--" on the commandline, it's not an option */
|
2004-10-27 05:08:04 +02:00
|
|
|
/* First, check for an exact (case-insensitive) match */
|
2005-07-22 22:37:42 +02:00
|
|
|
for (i=0; fmt->vars[i].name; ++i) {
|
2005-08-04 21:56:41 +02:00
|
|
|
if (!strcasecmp(key, fmt->vars[i].name)) {
|
2005-07-22 22:37:42 +02:00
|
|
|
return &fmt->vars[i];
|
2005-08-04 21:56:41 +02:00
|
|
|
}
|
2004-10-27 05:08:04 +02:00
|
|
|
}
|
|
|
|
/* If none, check for an abbreviated match */
|
2005-07-22 22:37:42 +02:00
|
|
|
for (i=0; fmt->vars[i].name; ++i) {
|
|
|
|
if (!strncasecmp(key, fmt->vars[i].name, keylen)) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "The abbreviation '%s' is deprecated. "
|
|
|
|
"Please use '%s' instead",
|
|
|
|
key, fmt->vars[i].name);
|
2005-07-22 22:37:42 +02:00
|
|
|
return &fmt->vars[i];
|
2004-10-27 04:30:28 +02:00
|
|
|
}
|
|
|
|
}
|
2004-12-01 04:48:14 +01:00
|
|
|
/* Okay, unrecognized options */
|
2004-10-27 04:30:28 +02:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2005-09-14 04:07:35 +02:00
|
|
|
/*
|
|
|
|
* Functions to assign config options.
|
|
|
|
*/
|
|
|
|
|
2005-09-10 04:42:32 +02:00
|
|
|
/** <b>c</b>-\>key is known to be a real key. Update <b>options</b>
|
|
|
|
* with <b>c</b>-\>value and return 0, or return -1 if bad value.
|
2005-09-14 04:07:35 +02:00
|
|
|
*
|
|
|
|
* Called from config_assign_line() and option_reset().
|
2004-11-04 23:31:50 +01:00
|
|
|
*/
|
2004-10-14 04:47:09 +02:00
|
|
|
static int
|
2005-09-10 04:42:32 +02:00
|
|
|
config_assign_value(config_format_t *fmt, or_options_t *options,
|
|
|
|
config_line_t *c)
|
2004-10-14 04:47:09 +02:00
|
|
|
{
|
2004-10-12 22:22:09 +02:00
|
|
|
int i, ok;
|
2004-10-27 04:30:28 +02:00
|
|
|
config_var_t *var;
|
|
|
|
void *lvalue;
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2005-07-22 22:37:42 +02:00
|
|
|
CHECK(fmt, options);
|
|
|
|
|
|
|
|
var = config_find_option(fmt, c->key);
|
2005-09-10 04:42:32 +02:00
|
|
|
tor_assert(var);
|
2004-11-04 23:31:50 +01:00
|
|
|
|
2006-02-12 23:28:30 +01:00
|
|
|
lvalue = STRUCT_VAR_P(options, var->var_offset);
|
2005-09-10 04:42:32 +02:00
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
switch (var->type) {
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
case CONFIG_TYPE_UINT:
|
|
|
|
i = tor_parse_long(c->value, 10, 0, INT_MAX, &ok, NULL);
|
|
|
|
if (!ok) {
|
2005-10-25 09:05:03 +02:00
|
|
|
log(LOG_WARN, LD_CONFIG,
|
2005-12-14 21:40:40 +01:00
|
|
|
"Int keyword '%s %s' is malformed or out of bounds.",
|
|
|
|
c->key, c->value);
|
2005-09-10 04:42:32 +02:00
|
|
|
return -1;
|
2004-10-14 04:47:09 +02:00
|
|
|
}
|
2004-10-27 04:30:28 +02:00
|
|
|
*(int *)lvalue = i;
|
2004-10-14 04:47:09 +02:00
|
|
|
break;
|
|
|
|
|
2004-11-20 01:37:00 +01:00
|
|
|
case CONFIG_TYPE_INTERVAL: {
|
|
|
|
i = config_parse_interval(c->value, &ok);
|
|
|
|
if (!ok) {
|
2005-09-10 04:42:32 +02:00
|
|
|
return -1;
|
2004-11-20 01:37:00 +01:00
|
|
|
}
|
|
|
|
*(int *)lvalue = i;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case CONFIG_TYPE_MEMUNIT: {
|
|
|
|
uint64_t u64 = config_parse_memunit(c->value, &ok);
|
|
|
|
if (!ok) {
|
2005-09-10 04:42:32 +02:00
|
|
|
return -1;
|
2004-11-20 01:37:00 +01:00
|
|
|
}
|
|
|
|
*(uint64_t *)lvalue = u64;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
case CONFIG_TYPE_BOOL:
|
|
|
|
i = tor_parse_long(c->value, 10, 0, 1, &ok, NULL);
|
|
|
|
if (!ok) {
|
2005-10-25 09:05:03 +02:00
|
|
|
log(LOG_WARN, LD_CONFIG, "Boolean keyword '%s' expects 0 or 1.", c->key);
|
2005-09-10 04:42:32 +02:00
|
|
|
return -1;
|
2004-10-14 04:47:09 +02:00
|
|
|
}
|
2004-10-27 04:30:28 +02:00
|
|
|
*(int *)lvalue = i;
|
2004-10-14 04:47:09 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case CONFIG_TYPE_STRING:
|
2004-10-27 04:30:28 +02:00
|
|
|
tor_free(*(char **)lvalue);
|
|
|
|
*(char **)lvalue = tor_strdup(c->value);
|
2004-10-14 04:47:09 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case CONFIG_TYPE_DOUBLE:
|
2004-10-27 04:30:28 +02:00
|
|
|
*(double *)lvalue = atof(c->value);
|
2004-10-14 04:47:09 +02:00
|
|
|
break;
|
|
|
|
|
2005-07-28 21:01:48 +02:00
|
|
|
case CONFIG_TYPE_ISOTIME:
|
|
|
|
if (parse_iso_time(c->value, (time_t *)lvalue)) {
|
2005-10-25 09:05:03 +02:00
|
|
|
log(LOG_WARN, LD_CONFIG,
|
|
|
|
"Invalid time '%s' for keyword '%s'", c->value, c->key);
|
2005-09-10 04:42:32 +02:00
|
|
|
return -1;
|
2005-07-28 21:01:48 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
case CONFIG_TYPE_CSV:
|
2005-09-14 04:13:35 +02:00
|
|
|
if (*(smartlist_t**)lvalue) {
|
2005-09-14 04:12:29 +02:00
|
|
|
SMARTLIST_FOREACH(*(smartlist_t**)lvalue, char *, cp, tor_free(cp));
|
|
|
|
smartlist_clear(*(smartlist_t**)lvalue);
|
|
|
|
} else {
|
2004-10-27 04:30:28 +02:00
|
|
|
*(smartlist_t**)lvalue = smartlist_create();
|
2005-01-05 03:51:04 +01:00
|
|
|
}
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2004-10-27 04:30:28 +02:00
|
|
|
smartlist_split_string(*(smartlist_t**)lvalue, c->value, ",",
|
2004-10-14 04:47:09 +02:00
|
|
|
SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
|
|
|
|
break;
|
|
|
|
|
2004-11-04 23:31:50 +01:00
|
|
|
case CONFIG_TYPE_LINELIST:
|
|
|
|
case CONFIG_TYPE_LINELIST_S:
|
2005-07-22 23:12:10 +02:00
|
|
|
config_line_append((config_line_t**)lvalue, c->key, c->value);
|
2004-11-04 23:31:50 +01:00
|
|
|
break;
|
2004-10-14 04:47:09 +02:00
|
|
|
|
|
|
|
case CONFIG_TYPE_OBSOLETE:
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Skipping obsolete configuration option '%s'", c->key);
|
2004-10-14 04:47:09 +02:00
|
|
|
break;
|
2004-11-04 23:31:50 +01:00
|
|
|
case CONFIG_TYPE_LINELIST_V:
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Can't provide value for virtual option '%s'", c->key);
|
2005-09-10 04:42:32 +02:00
|
|
|
return -1;
|
2004-11-04 23:31:50 +01:00
|
|
|
default:
|
|
|
|
tor_assert(0);
|
|
|
|
break;
|
2002-11-23 07:49:01 +01:00
|
|
|
}
|
2004-10-27 04:30:28 +02:00
|
|
|
return 0;
|
2002-11-23 07:49:01 +01:00
|
|
|
}
|
|
|
|
|
2005-09-10 04:42:32 +02:00
|
|
|
/** If <b>c</b> is a syntactically valid configuration line, update
|
2005-12-14 21:40:40 +01:00
|
|
|
* <b>options</b> with its value and return 0. Otherwise return -1 for bad
|
|
|
|
* key, -2 for bad value.
|
2005-09-10 04:42:32 +02:00
|
|
|
*
|
2005-09-14 04:07:35 +02:00
|
|
|
* If <b>clear_first</b> is set, clear the value first. Then if
|
|
|
|
* <b>use_defaults</b> is set, set the value to the default.
|
|
|
|
*
|
|
|
|
* Called from config_assign().
|
2005-09-10 04:42:32 +02:00
|
|
|
*/
|
|
|
|
static int
|
|
|
|
config_assign_line(config_format_t *fmt, or_options_t *options,
|
2005-09-14 04:35:06 +02:00
|
|
|
config_line_t *c, int use_defaults, int clear_first)
|
2005-09-10 04:42:32 +02:00
|
|
|
{
|
|
|
|
config_var_t *var;
|
|
|
|
|
|
|
|
CHECK(fmt, options);
|
|
|
|
|
|
|
|
var = config_find_option(fmt, c->key);
|
|
|
|
if (!var) {
|
2006-02-12 23:28:30 +01:00
|
|
|
if (fmt->extra) {
|
|
|
|
void *lvalue = STRUCT_VAR_P(options, fmt->extra->var_offset);
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_CONFIG,
|
|
|
|
"Found unrecognized option '%s'; saving it.", c->key);
|
2006-02-12 23:28:30 +01:00
|
|
|
config_line_append((config_line_t**)lvalue, c->key, c->value);
|
|
|
|
return 0;
|
|
|
|
} else {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Unknown option '%s'. Failing.", c->key);
|
2006-02-12 23:28:30 +01:00
|
|
|
return -1;
|
|
|
|
}
|
2005-09-10 04:42:32 +02:00
|
|
|
}
|
|
|
|
/* Put keyword into canonical case. */
|
|
|
|
if (strcmp(var->name, c->key)) {
|
|
|
|
tor_free(c->key);
|
|
|
|
c->key = tor_strdup(var->name);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strlen(c->value)) { /* reset or clear it, then return */
|
2005-09-14 04:35:06 +02:00
|
|
|
if (!clear_first) /* not already cleared */
|
|
|
|
option_reset(fmt, options, var, use_defaults);
|
2005-09-10 04:42:32 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (config_assign_value(fmt, options, c) < 0)
|
|
|
|
return -2;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-09-14 04:07:35 +02:00
|
|
|
/** Restore the option named <b>key</b> in options to its default value.
|
|
|
|
* Called from config_assign(). */
|
2004-11-04 23:31:50 +01:00
|
|
|
static void
|
2005-09-14 04:07:35 +02:00
|
|
|
config_reset_line(config_format_t *fmt, or_options_t *options,
|
|
|
|
const char *key, int use_defaults)
|
2004-11-04 23:31:50 +01:00
|
|
|
{
|
|
|
|
config_var_t *var;
|
|
|
|
|
2005-07-22 22:37:42 +02:00
|
|
|
CHECK(fmt, options);
|
|
|
|
|
|
|
|
var = config_find_option(fmt, key);
|
2004-11-04 23:31:50 +01:00
|
|
|
if (!var)
|
|
|
|
return; /* give error on next pass. */
|
|
|
|
|
2005-09-14 04:07:35 +02:00
|
|
|
option_reset(fmt, options, var, use_defaults);
|
2004-11-04 23:31:50 +01:00
|
|
|
}
|
|
|
|
|
2004-11-09 07:40:32 +01:00
|
|
|
/** Return true iff key is a valid configuration option. */
|
|
|
|
int
|
2005-07-23 03:58:05 +02:00
|
|
|
option_is_recognized(const char *key)
|
2004-11-09 07:40:32 +01:00
|
|
|
{
|
2005-08-04 21:56:41 +02:00
|
|
|
config_var_t *var = config_find_option(&options_format, key);
|
2004-11-09 07:40:32 +01:00
|
|
|
return (var != NULL);
|
|
|
|
}
|
|
|
|
|
2005-07-11 19:35:36 +02:00
|
|
|
/** Return the canonical name of a configuration option. */
|
|
|
|
const char *
|
2005-07-23 03:58:05 +02:00
|
|
|
option_get_canonical_name(const char *key)
|
2005-07-11 19:35:36 +02:00
|
|
|
{
|
2005-08-04 21:56:41 +02:00
|
|
|
config_var_t *var = config_find_option(&options_format, key);
|
2005-07-11 19:35:36 +02:00
|
|
|
return var->name;
|
|
|
|
}
|
|
|
|
|
2004-11-03 19:29:29 +01:00
|
|
|
/** Return a canonicalized list of the options assigned for key.
|
|
|
|
*/
|
2005-07-22 23:12:10 +02:00
|
|
|
config_line_t *
|
2005-07-23 03:58:05 +02:00
|
|
|
option_get_assignment(or_options_t *options, const char *key)
|
2005-07-22 22:37:42 +02:00
|
|
|
{
|
2005-08-04 21:56:41 +02:00
|
|
|
return get_assigned_option(&options_format, options, key);
|
2005-07-22 22:37:42 +02:00
|
|
|
}
|
|
|
|
|
2005-08-25 22:33:17 +02:00
|
|
|
static config_line_t *
|
|
|
|
config_lines_dup(const config_line_t *inp)
|
|
|
|
{
|
|
|
|
config_line_t *result = NULL;
|
|
|
|
config_line_t **next_out = &result;
|
|
|
|
while (inp) {
|
|
|
|
*next_out = tor_malloc(sizeof(config_line_t));
|
|
|
|
(*next_out)->key = tor_strdup(inp->key);
|
|
|
|
(*next_out)->value = tor_strdup(inp->value);
|
|
|
|
inp = inp->next;
|
|
|
|
next_out = &((*next_out)->next);
|
|
|
|
}
|
|
|
|
(*next_out) = NULL;
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2005-07-22 23:12:10 +02:00
|
|
|
static config_line_t *
|
2005-12-14 21:40:40 +01:00
|
|
|
get_assigned_option(config_format_t *fmt, or_options_t *options,
|
|
|
|
const char *key)
|
2004-11-03 19:29:29 +01:00
|
|
|
{
|
|
|
|
config_var_t *var;
|
|
|
|
const void *value;
|
|
|
|
char buf[32];
|
2005-07-22 23:12:10 +02:00
|
|
|
config_line_t *result;
|
2004-11-09 07:40:32 +01:00
|
|
|
tor_assert(options && key);
|
2004-11-03 19:29:29 +01:00
|
|
|
|
2005-07-22 22:37:42 +02:00
|
|
|
CHECK(fmt, options);
|
|
|
|
|
|
|
|
var = config_find_option(fmt, key);
|
2004-11-03 19:29:29 +01:00
|
|
|
if (!var) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Unknown option '%s'. Failing.", key);
|
2004-11-03 19:29:29 +01:00
|
|
|
return NULL;
|
2004-11-04 23:31:50 +01:00
|
|
|
} else if (var->type == CONFIG_TYPE_LINELIST_S) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,
|
|
|
|
"Can't return context-sensitive '%s' on its own", key);
|
2004-11-04 23:31:50 +01:00
|
|
|
return NULL;
|
2004-11-03 19:29:29 +01:00
|
|
|
}
|
2006-02-12 23:28:30 +01:00
|
|
|
value = STRUCT_VAR_P(options, var->var_offset);
|
2004-11-03 19:29:29 +01:00
|
|
|
|
2004-11-04 23:31:50 +01:00
|
|
|
if (var->type == CONFIG_TYPE_LINELIST ||
|
|
|
|
var->type == CONFIG_TYPE_LINELIST_V) {
|
2004-11-03 19:29:29 +01:00
|
|
|
/* Linelist requires special handling: we just copy and return it. */
|
2005-08-25 22:33:17 +02:00
|
|
|
return config_lines_dup(*(const config_line_t**)value);
|
2004-11-03 19:29:29 +01:00
|
|
|
}
|
|
|
|
|
2005-07-22 23:12:10 +02:00
|
|
|
result = tor_malloc_zero(sizeof(config_line_t));
|
2004-11-03 19:29:29 +01:00
|
|
|
result->key = tor_strdup(var->name);
|
2004-11-28 10:05:49 +01:00
|
|
|
switch (var->type)
|
2004-11-03 19:29:29 +01:00
|
|
|
{
|
|
|
|
case CONFIG_TYPE_STRING:
|
2004-11-09 07:40:32 +01:00
|
|
|
if (*(char**)value) {
|
|
|
|
result->value = tor_strdup(*(char**)value);
|
|
|
|
} else {
|
|
|
|
tor_free(result->key);
|
|
|
|
tor_free(result);
|
|
|
|
return NULL;
|
|
|
|
}
|
2004-11-03 19:29:29 +01:00
|
|
|
break;
|
2005-07-28 21:01:48 +02:00
|
|
|
case CONFIG_TYPE_ISOTIME:
|
|
|
|
if (*(time_t*)value) {
|
|
|
|
result->value = tor_malloc(ISO_TIME_LEN+1);
|
|
|
|
format_iso_time(result->value, *(time_t*)value);
|
|
|
|
} else {
|
|
|
|
tor_free(result->key);
|
|
|
|
tor_free(result);
|
|
|
|
}
|
|
|
|
break;
|
2004-11-20 01:37:00 +01:00
|
|
|
case CONFIG_TYPE_INTERVAL:
|
2004-11-03 19:29:29 +01:00
|
|
|
case CONFIG_TYPE_UINT:
|
2004-11-09 19:22:17 +01:00
|
|
|
/* This means every or_options_t uint or bool element
|
2004-11-06 06:18:11 +01:00
|
|
|
* needs to be an int. Not, say, a uint16_t or char. */
|
2004-11-03 19:29:29 +01:00
|
|
|
tor_snprintf(buf, sizeof(buf), "%d", *(int*)value);
|
|
|
|
result->value = tor_strdup(buf);
|
|
|
|
break;
|
2004-11-20 01:37:00 +01:00
|
|
|
case CONFIG_TYPE_MEMUNIT:
|
|
|
|
tor_snprintf(buf, sizeof(buf), U64_FORMAT,
|
|
|
|
U64_PRINTF_ARG(*(uint64_t*)value));
|
|
|
|
result->value = tor_strdup(buf);
|
|
|
|
break;
|
2004-11-03 19:29:29 +01:00
|
|
|
case CONFIG_TYPE_DOUBLE:
|
|
|
|
tor_snprintf(buf, sizeof(buf), "%f", *(double*)value);
|
|
|
|
result->value = tor_strdup(buf);
|
|
|
|
break;
|
|
|
|
case CONFIG_TYPE_BOOL:
|
|
|
|
result->value = tor_strdup(*(int*)value ? "1" : "0");
|
|
|
|
break;
|
|
|
|
case CONFIG_TYPE_CSV:
|
2004-11-09 06:59:22 +01:00
|
|
|
if (*(smartlist_t**)value)
|
2005-12-14 21:40:40 +01:00
|
|
|
result->value =
|
|
|
|
smartlist_join_strings(*(smartlist_t**)value, ",", 0, NULL);
|
2004-11-03 19:29:29 +01:00
|
|
|
else
|
|
|
|
result->value = tor_strdup("");
|
|
|
|
break;
|
2004-11-09 07:18:17 +01:00
|
|
|
case CONFIG_TYPE_OBSOLETE:
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,
|
|
|
|
"You asked me for the value of an obsolete config option '%s'.",
|
|
|
|
key);
|
2004-11-09 07:18:17 +01:00
|
|
|
tor_free(result->key);
|
|
|
|
tor_free(result);
|
|
|
|
return NULL;
|
2004-11-03 19:29:29 +01:00
|
|
|
default:
|
|
|
|
tor_free(result->key);
|
|
|
|
tor_free(result);
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_BUG,"Bug: unknown type %d for known key '%s'",
|
|
|
|
var->type, key);
|
2004-11-03 19:29:29 +01:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2004-11-04 09:26:34 +01:00
|
|
|
/** Iterate through the linked list of requested options <b>list</b>.
|
2004-05-10 06:48:13 +02:00
|
|
|
* For each item, convert as appropriate and assign to <b>options</b>.
|
2004-03-02 06:00:50 +01:00
|
|
|
* If an item is unrecognized, return -1 immediately,
|
2004-11-04 23:31:50 +01:00
|
|
|
* else return 0 for success.
|
|
|
|
*
|
2005-09-14 04:07:35 +02:00
|
|
|
* If <b>clear_first</b>, interpret config options as replacing (not
|
|
|
|
* extending) their previous values. If <b>clear_first</b> is set,
|
|
|
|
* then <b>use_defaults</b> to decide if you set to defaults after
|
|
|
|
* clearing, or make the value 0 or NULL.
|
|
|
|
*
|
|
|
|
* Here are the use cases:
|
2005-09-14 04:12:29 +02:00
|
|
|
* 1. A non-empty AllowUnverified line in your torrc. Appends to current
|
|
|
|
* if linelist, replaces current if csv.
|
2005-09-14 04:07:35 +02:00
|
|
|
* 2. An empty AllowUnverified line in your torrc. Should clear it.
|
|
|
|
* 3. "RESETCONF AllowUnverified" sets it to default.
|
|
|
|
* 4. "SETCONF AllowUnverified" makes it NULL.
|
|
|
|
* 5. "SETCONF AllowUnverified=foo" clears it and sets it to "foo".
|
2005-09-08 08:55:53 +02:00
|
|
|
*
|
2005-09-14 04:07:35 +02:00
|
|
|
* Use_defaults Clear_first
|
|
|
|
* 0 0 "append"
|
|
|
|
* 1 0 undefined, don't use
|
|
|
|
* 0 1 "set to null first"
|
|
|
|
* 1 1 "set to defaults first"
|
2005-09-08 08:55:53 +02:00
|
|
|
* Return 0 on success, -1 on bad key, -2 on bad value.
|
2004-11-04 23:31:50 +01:00
|
|
|
*/
|
2005-09-14 04:07:35 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
There are three call cases for config_assign() currently.
|
|
|
|
|
|
|
|
Case one: Torrc entry
|
|
|
|
options_init_from_torrc() calls config_assign(0, 0)
|
2005-09-14 04:35:06 +02:00
|
|
|
calls config_assign_line(0, 0).
|
2005-09-14 04:07:35 +02:00
|
|
|
if value is empty, calls option_reset(0) and returns.
|
|
|
|
calls config_assign_value(), appends.
|
|
|
|
|
|
|
|
Case two: setconf
|
|
|
|
options_trial_assign() calls config_assign(0, 1)
|
|
|
|
calls config_reset_line(0)
|
|
|
|
calls option_reset(0)
|
|
|
|
calls option_clear().
|
2005-09-14 04:35:06 +02:00
|
|
|
calls config_assign_line(0, 1).
|
|
|
|
if value is empty, returns.
|
2005-09-14 04:07:35 +02:00
|
|
|
calls config_assign_value(), appends.
|
|
|
|
|
|
|
|
Case three: resetconf
|
|
|
|
options_trial_assign() calls config_assign(1, 1)
|
|
|
|
calls config_reset_line(1)
|
|
|
|
calls option_reset(1)
|
|
|
|
calls option_clear().
|
|
|
|
calls config_assign_value(default)
|
2005-09-14 04:35:06 +02:00
|
|
|
calls config_assign_line(1, 1).
|
|
|
|
returns.
|
2005-09-14 04:07:35 +02:00
|
|
|
*/
|
2004-10-14 04:47:09 +02:00
|
|
|
static int
|
2005-09-14 04:07:35 +02:00
|
|
|
config_assign(config_format_t *fmt, void *options,
|
|
|
|
config_line_t *list, int use_defaults, int clear_first)
|
2004-10-14 04:47:09 +02:00
|
|
|
{
|
2005-07-22 23:12:10 +02:00
|
|
|
config_line_t *p;
|
2005-07-22 22:37:42 +02:00
|
|
|
|
|
|
|
CHECK(fmt, options);
|
2004-11-04 23:31:50 +01:00
|
|
|
|
|
|
|
/* pass 1: normalize keys */
|
|
|
|
for (p = list; p; p = p->next) {
|
2005-10-17 05:06:00 +02:00
|
|
|
const char *full = expand_abbrev(fmt, p->key, 0, 1);
|
2004-11-04 23:31:50 +01:00
|
|
|
if (strcmp(full,p->key)) {
|
|
|
|
tor_free(p->key);
|
|
|
|
p->key = tor_strdup(full);
|
2004-10-27 19:37:01 +02:00
|
|
|
}
|
2004-11-04 23:31:50 +01:00
|
|
|
}
|
|
|
|
|
2005-09-14 04:07:35 +02:00
|
|
|
/* pass 2: if we're reading from a resetting source, clear all
|
|
|
|
* mentioned config options, and maybe set to their defaults. */
|
|
|
|
if (clear_first) {
|
2004-11-04 23:31:50 +01:00
|
|
|
for (p = list; p; p = p->next)
|
2005-09-14 04:07:35 +02:00
|
|
|
config_reset_line(fmt, options, p->key, use_defaults);
|
2004-11-04 23:31:50 +01:00
|
|
|
}
|
2004-10-27 19:37:01 +02:00
|
|
|
|
2004-11-04 23:31:50 +01:00
|
|
|
/* pass 3: assign. */
|
|
|
|
while (list) {
|
2004-11-07 23:59:30 +01:00
|
|
|
int r;
|
2005-09-14 04:35:06 +02:00
|
|
|
if ((r=config_assign_line(fmt, options, list, use_defaults, clear_first)))
|
2004-11-07 23:59:30 +01:00
|
|
|
return r;
|
2002-11-23 07:49:01 +01:00
|
|
|
list = list->next;
|
2003-12-17 22:09:31 +01:00
|
|
|
}
|
2004-03-02 06:00:50 +01:00
|
|
|
return 0;
|
2002-11-23 07:49:01 +01:00
|
|
|
}
|
|
|
|
|
2004-11-09 18:15:17 +01:00
|
|
|
/** Try assigning <b>list</b> to the global options. You do this by duping
|
2004-11-06 06:18:11 +01:00
|
|
|
* options, assigning list to the new one, then validating it. If it's
|
2004-11-10 01:11:37 +01:00
|
|
|
* ok, then throw out the old one and stick with the new one. Else,
|
2004-11-07 23:59:30 +01:00
|
|
|
* revert to old and return failure. Return 0 on success, -1 on bad
|
2005-09-14 04:36:29 +02:00
|
|
|
* keys, -2 on bad values, -3 on bad transition, and -4 on failed-to-set.
|
2004-11-06 06:18:11 +01:00
|
|
|
*/
|
|
|
|
int
|
2005-09-14 04:07:35 +02:00
|
|
|
options_trial_assign(config_line_t *list, int use_defaults, int clear_first)
|
2004-11-06 06:18:11 +01:00
|
|
|
{
|
2004-11-07 23:59:30 +01:00
|
|
|
int r;
|
2005-08-04 21:56:41 +02:00
|
|
|
or_options_t *trial_options = options_dup(&options_format, get_options());
|
2004-11-06 06:18:11 +01:00
|
|
|
|
2005-09-14 04:07:35 +02:00
|
|
|
if ((r=config_assign(&options_format, trial_options,
|
|
|
|
list, use_defaults, clear_first)) < 0) {
|
2005-08-04 21:56:41 +02:00
|
|
|
config_free(&options_format, trial_options);
|
2004-11-07 23:59:30 +01:00
|
|
|
return r;
|
2004-11-06 06:18:11 +01:00
|
|
|
}
|
|
|
|
|
2006-01-10 21:27:47 +01:00
|
|
|
if (options_validate(get_options(), trial_options, 1) < 0) {
|
2005-08-04 21:56:41 +02:00
|
|
|
config_free(&options_format, trial_options);
|
2004-11-07 23:59:30 +01:00
|
|
|
return -2;
|
2004-11-06 06:18:11 +01:00
|
|
|
}
|
|
|
|
|
2004-11-09 18:15:17 +01:00
|
|
|
if (options_transition_allowed(get_options(), trial_options) < 0) {
|
2005-08-04 21:56:41 +02:00
|
|
|
config_free(&options_format, trial_options);
|
2004-11-07 23:59:30 +01:00
|
|
|
return -3;
|
2004-11-06 06:18:11 +01:00
|
|
|
}
|
|
|
|
|
2005-09-14 04:36:29 +02:00
|
|
|
if (set_options(trial_options)<0) {
|
|
|
|
config_free(&options_format, trial_options);
|
|
|
|
return -4;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* we liked it. put it in place. */
|
2004-11-06 06:18:11 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-09-14 04:07:35 +02:00
|
|
|
/** Reset config option <b>var</b> to 0, 0.0, NULL, or the equivalent.
|
|
|
|
* Called from option_reset() and config_free(). */
|
2004-11-06 06:18:11 +01:00
|
|
|
static void
|
2005-09-08 08:55:53 +02:00
|
|
|
option_clear(config_format_t *fmt, or_options_t *options, config_var_t *var)
|
2004-11-06 06:18:11 +01:00
|
|
|
{
|
2006-02-12 23:28:30 +01:00
|
|
|
void *lvalue = STRUCT_VAR_P(options, var->var_offset);
|
2004-11-06 06:18:11 +01:00
|
|
|
switch (var->type) {
|
|
|
|
case CONFIG_TYPE_STRING:
|
|
|
|
tor_free(*(char**)lvalue);
|
|
|
|
break;
|
|
|
|
case CONFIG_TYPE_DOUBLE:
|
|
|
|
*(double*)lvalue = 0.0;
|
|
|
|
break;
|
2005-07-28 21:01:48 +02:00
|
|
|
case CONFIG_TYPE_ISOTIME:
|
|
|
|
*(time_t*)lvalue = 0;
|
2004-11-20 01:37:00 +01:00
|
|
|
case CONFIG_TYPE_INTERVAL:
|
2004-11-06 06:18:11 +01:00
|
|
|
case CONFIG_TYPE_UINT:
|
|
|
|
case CONFIG_TYPE_BOOL:
|
|
|
|
*(int*)lvalue = 0;
|
|
|
|
break;
|
2004-11-20 01:37:00 +01:00
|
|
|
case CONFIG_TYPE_MEMUNIT:
|
|
|
|
*(uint64_t*)lvalue = 0;
|
|
|
|
break;
|
2004-11-06 06:18:11 +01:00
|
|
|
case CONFIG_TYPE_CSV:
|
|
|
|
if (*(smartlist_t**)lvalue) {
|
|
|
|
SMARTLIST_FOREACH(*(smartlist_t **)lvalue, char *, cp, tor_free(cp));
|
|
|
|
smartlist_free(*(smartlist_t **)lvalue);
|
|
|
|
*(smartlist_t **)lvalue = NULL;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case CONFIG_TYPE_LINELIST:
|
|
|
|
case CONFIG_TYPE_LINELIST_S:
|
2005-07-22 23:12:10 +02:00
|
|
|
config_free_lines(*(config_line_t **)lvalue);
|
|
|
|
*(config_line_t **)lvalue = NULL;
|
2004-11-06 06:18:11 +01:00
|
|
|
break;
|
|
|
|
case CONFIG_TYPE_LINELIST_V:
|
|
|
|
/* handled by linelist_s. */
|
|
|
|
break;
|
|
|
|
case CONFIG_TYPE_OBSOLETE:
|
|
|
|
break;
|
|
|
|
}
|
2005-09-08 08:59:58 +02:00
|
|
|
}
|
2005-09-08 08:55:53 +02:00
|
|
|
|
2005-09-14 04:07:35 +02:00
|
|
|
/** Clear the option indexed by <b>var</b> in <b>options</b>. Then if
|
|
|
|
* <b>use_defaults</b>, set it to its default value.
|
|
|
|
* Called by config_init() and option_reset_line() and option_assign_line(). */
|
2005-09-08 08:55:53 +02:00
|
|
|
static void
|
2005-09-14 04:07:35 +02:00
|
|
|
option_reset(config_format_t *fmt, or_options_t *options,
|
|
|
|
config_var_t *var, int use_defaults)
|
2005-09-08 08:55:53 +02:00
|
|
|
{
|
|
|
|
config_line_t *c;
|
|
|
|
void *lvalue;
|
|
|
|
CHECK(fmt, options);
|
|
|
|
option_clear(fmt, options, var); /* clear it first */
|
2005-09-14 04:07:35 +02:00
|
|
|
if (!use_defaults)
|
|
|
|
return; /* all done */
|
2006-02-12 23:28:30 +01:00
|
|
|
lvalue = STRUCT_VAR_P(options, var->var_offset);
|
2004-11-06 06:18:11 +01:00
|
|
|
if (var->initvalue) {
|
2005-07-22 23:12:10 +02:00
|
|
|
c = tor_malloc_zero(sizeof(config_line_t));
|
2004-11-06 06:18:11 +01:00
|
|
|
c->key = tor_strdup(var->name);
|
|
|
|
c->value = tor_strdup(var->initvalue);
|
2005-09-10 04:42:32 +02:00
|
|
|
config_assign_value(fmt, options, c);
|
2004-11-06 06:18:11 +01:00
|
|
|
config_free_lines(c);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-05-10 06:48:13 +02:00
|
|
|
/** Print a usage message for tor. */
|
2004-10-14 04:47:09 +02:00
|
|
|
static void
|
|
|
|
print_usage(void)
|
|
|
|
{
|
2004-11-15 08:29:27 +01:00
|
|
|
printf(
|
2005-05-03 12:04:08 +02:00
|
|
|
"Copyright 2001-2005 Roger Dingledine, Nick Mathewson.\n\n"
|
2004-11-15 08:29:27 +01:00
|
|
|
"tor -f <torrc> [args]\n"
|
2005-01-04 00:21:32 +01:00
|
|
|
"See man page for options, or http://tor.eff.org/ for documentation.\n");
|
2003-10-20 03:19:54 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 06:48:13 +02:00
|
|
|
/**
|
2005-06-08 22:32:22 +02:00
|
|
|
* Based on <b>options-\>Address</b>, guess our public IP address and put it
|
2005-12-14 21:40:40 +01:00
|
|
|
* (in host order) into *<b>addr_out</b>. If <b>hostname_out</b> is provided,
|
|
|
|
* set *<b>hostname_out</b> to a new string holding the hostname we used to
|
|
|
|
* get the address. Return 0 if all is well, or -1 if we can't find a suitable
|
2005-08-25 22:33:17 +02:00
|
|
|
* public IP address.
|
2004-05-10 06:48:13 +02:00
|
|
|
*/
|
2004-10-14 04:47:09 +02:00
|
|
|
int
|
2005-12-14 21:40:40 +01:00
|
|
|
resolve_my_address(or_options_t *options, uint32_t *addr_out,
|
|
|
|
char **hostname_out)
|
2004-10-14 04:47:09 +02:00
|
|
|
{
|
2004-03-14 19:12:59 +01:00
|
|
|
struct in_addr in;
|
|
|
|
struct hostent *rent;
|
2004-08-16 13:43:18 +02:00
|
|
|
char hostname[256];
|
2004-03-15 05:57:24 +01:00
|
|
|
int explicit_ip=1;
|
2005-02-22 09:18:36 +01:00
|
|
|
char tmpbuf[INET_NTOA_BUF_LEN];
|
2005-02-27 10:47:01 +01:00
|
|
|
static uint32_t old_addr=0;
|
2005-05-09 06:31:00 +02:00
|
|
|
const char *address = options->Address;
|
2004-03-14 19:12:59 +01:00
|
|
|
|
2005-08-25 22:33:17 +02:00
|
|
|
tor_assert(addr_out);
|
2004-08-16 13:43:18 +02:00
|
|
|
|
2005-04-29 20:52:05 +02:00
|
|
|
if (address && *address) {
|
2004-10-14 04:47:09 +02:00
|
|
|
strlcpy(hostname, address, sizeof(hostname));
|
2004-08-16 13:43:18 +02:00
|
|
|
} else { /* then we need to guess our address */
|
2004-03-15 05:57:24 +01:00
|
|
|
explicit_ip = 0; /* it's implicit */
|
2004-03-14 19:12:59 +01:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (gethostname(hostname, sizeof(hostname)) < 0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_NET,"Error obtaining local hostname");
|
2004-03-14 19:12:59 +01:00
|
|
|
return -1;
|
|
|
|
}
|
2006-02-13 10:02:35 +01:00
|
|
|
log_debug(LD_CONFIG,"Guessed local host name as '%s'",hostname);
|
2004-03-14 19:12:59 +01:00
|
|
|
}
|
|
|
|
|
2004-08-16 13:43:18 +02:00
|
|
|
/* now we know hostname. resolve it and keep only the IP */
|
2004-03-14 19:12:59 +01:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (tor_inet_aton(hostname, &in) == 0) {
|
2004-03-15 05:57:24 +01:00
|
|
|
/* then we have to resolve it */
|
|
|
|
explicit_ip = 0;
|
2004-08-16 13:43:18 +02:00
|
|
|
rent = (struct hostent *)gethostbyname(hostname);
|
2004-03-15 05:57:24 +01:00
|
|
|
if (!rent) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,"Could not resolve local Address '%s'. Failing.",
|
|
|
|
hostname);
|
2004-03-15 05:57:24 +01:00
|
|
|
return -1;
|
|
|
|
}
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(rent->h_length == 4);
|
2004-10-14 04:47:09 +02:00
|
|
|
memcpy(&in.s_addr, rent->h_addr, rent->h_length);
|
2004-03-14 19:12:59 +01:00
|
|
|
}
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2005-02-22 09:18:36 +01:00
|
|
|
tor_inet_ntoa(&in,tmpbuf,sizeof(tmpbuf));
|
2005-12-09 03:46:46 +01:00
|
|
|
if (is_internal_IP(htonl(in.s_addr), 0) && !options->NoPublish) {
|
2005-06-08 22:32:22 +02:00
|
|
|
/* make sure we're ok with publishing an internal IP */
|
|
|
|
if (!options->DirServers) {
|
2005-12-14 21:40:40 +01:00
|
|
|
/* if they are using the default dirservers, disallow internal IPs
|
|
|
|
* always. */
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,"Address '%s' resolves to private IP '%s'. "
|
|
|
|
"Tor servers that use the default DirServers must have public "
|
|
|
|
"IP addresses.",
|
|
|
|
hostname, tmpbuf);
|
2005-05-09 06:31:00 +02:00
|
|
|
return -1;
|
2005-06-08 22:32:22 +02:00
|
|
|
}
|
|
|
|
if (!explicit_ip) {
|
|
|
|
/* even if they've set their own dirservers, require an explicit IP if
|
|
|
|
* they're using an internal address. */
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,"Address '%s' resolves to private IP '%s'. Please "
|
|
|
|
"set the Address config option to be the IP you want to use.",
|
|
|
|
hostname, tmpbuf);
|
2005-06-08 22:32:22 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2004-03-14 19:12:59 +01:00
|
|
|
}
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2006-02-13 10:02:35 +01:00
|
|
|
log_debug(LD_CONFIG, "Resolved Address to '%s'.", tmpbuf);
|
2005-08-25 22:33:17 +02:00
|
|
|
*addr_out = ntohl(in.s_addr);
|
|
|
|
if (old_addr && old_addr != *addr_out) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_notice(LD_NET, "Your IP seems to have changed. Updating.");
|
2005-02-27 10:47:01 +01:00
|
|
|
server_has_changed_ip();
|
|
|
|
}
|
2005-08-25 22:33:17 +02:00
|
|
|
old_addr = *addr_out;
|
|
|
|
if (hostname_out)
|
|
|
|
*hostname_out = tor_strdup(hostname);
|
2004-03-14 19:12:59 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-12-14 21:40:40 +01:00
|
|
|
/** Called when we don't have a nickname set. Try to guess a good nickname
|
|
|
|
* based on the hostname, and return it in a newly allocated string. */
|
2004-10-14 04:47:09 +02:00
|
|
|
static char *
|
|
|
|
get_default_nickname(void)
|
2004-07-13 20:23:40 +02:00
|
|
|
{
|
|
|
|
char localhostname[256];
|
|
|
|
char *cp, *out, *outp;
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (gethostname(localhostname, sizeof(localhostname)) < 0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_NET,"Error obtaining local hostname");
|
2004-07-13 20:23:40 +02:00
|
|
|
return NULL;
|
|
|
|
}
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2004-07-13 20:23:40 +02:00
|
|
|
/* Put it in lowercase; stop at the first dot. */
|
2004-10-14 04:47:09 +02:00
|
|
|
for (cp = localhostname; *cp; ++cp) {
|
2004-07-13 20:23:40 +02:00
|
|
|
if (*cp == '.') {
|
|
|
|
*cp = '\0';
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
*cp = tolower(*cp);
|
|
|
|
}
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2004-07-13 20:23:40 +02:00
|
|
|
/* Strip invalid characters. */
|
|
|
|
cp = localhostname;
|
2004-10-14 04:47:09 +02:00
|
|
|
out = outp = tor_malloc(strlen(localhostname) + 1);
|
2004-07-13 20:23:40 +02:00
|
|
|
while (*cp) {
|
|
|
|
if (strchr(LEGAL_NICKNAME_CHARACTERS, *cp))
|
|
|
|
*outp++ = *cp++;
|
|
|
|
else
|
|
|
|
cp++;
|
|
|
|
}
|
|
|
|
*outp = '\0';
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2004-07-13 20:23:40 +02:00
|
|
|
/* Enforce length. */
|
|
|
|
if (strlen(out) > MAX_NICKNAME_LEN)
|
|
|
|
out[MAX_NICKNAME_LEN]='\0';
|
|
|
|
|
|
|
|
return out;
|
|
|
|
}
|
|
|
|
|
2004-05-10 06:48:13 +02:00
|
|
|
/** Release storage held by <b>options</b> */
|
2004-10-14 04:47:09 +02:00
|
|
|
static void
|
2005-07-28 21:01:48 +02:00
|
|
|
config_free(config_format_t *fmt, void *options)
|
2004-10-14 04:47:09 +02:00
|
|
|
{
|
2004-11-04 09:26:34 +01:00
|
|
|
int i;
|
|
|
|
|
2004-12-07 10:11:38 +01:00
|
|
|
tor_assert(options);
|
|
|
|
|
2005-09-14 04:07:35 +02:00
|
|
|
for (i=0; fmt->vars[i].name; ++i)
|
|
|
|
option_clear(fmt, options, &(fmt->vars[i]));
|
2006-02-12 23:28:30 +01:00
|
|
|
if (fmt->extra) {
|
|
|
|
config_line_t **linep = STRUCT_VAR_P(options, fmt->extra->var_offset);
|
|
|
|
config_free_lines(*linep);
|
|
|
|
*linep = NULL;
|
|
|
|
}
|
2004-12-07 10:11:38 +01:00
|
|
|
tor_free(options);
|
2003-10-21 11:48:17 +02:00
|
|
|
}
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2005-09-14 04:07:35 +02:00
|
|
|
/** Return true iff a and b contain identical keys and values in identical
|
|
|
|
* order. */
|
|
|
|
static int
|
|
|
|
config_lines_eq(config_line_t *a, config_line_t *b)
|
|
|
|
{
|
|
|
|
while (a && b) {
|
|
|
|
if (strcasecmp(a->key, b->key) || strcmp(a->value, b->value))
|
|
|
|
return 0;
|
|
|
|
a = a->next;
|
|
|
|
b = b->next;
|
|
|
|
}
|
|
|
|
if (a || b)
|
|
|
|
return 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2004-11-12 21:09:54 +01:00
|
|
|
/** Return true iff the option <b>var</b> has the same value in <b>o1</b>
|
|
|
|
* and <b>o2</b>. Must not be called for LINELIST_S or OBSOLETE options.
|
|
|
|
*/
|
|
|
|
static int
|
2005-07-22 22:37:42 +02:00
|
|
|
option_is_same(config_format_t *fmt,
|
|
|
|
or_options_t *o1, or_options_t *o2, const char *name)
|
2004-11-12 21:09:54 +01:00
|
|
|
{
|
2005-07-22 23:12:10 +02:00
|
|
|
config_line_t *c1, *c2;
|
2004-11-14 21:51:28 +01:00
|
|
|
int r = 1;
|
2005-07-22 22:37:42 +02:00
|
|
|
CHECK(fmt, o1);
|
|
|
|
CHECK(fmt, o2);
|
|
|
|
|
|
|
|
c1 = get_assigned_option(fmt, o1, name);
|
|
|
|
c2 = get_assigned_option(fmt, o2, name);
|
2005-09-14 04:07:35 +02:00
|
|
|
r = config_lines_eq(c1, c2);
|
2004-11-14 21:51:28 +01:00
|
|
|
config_free_lines(c1);
|
|
|
|
config_free_lines(c2);
|
|
|
|
return r;
|
2004-11-12 21:09:54 +01:00
|
|
|
}
|
|
|
|
|
2004-11-06 06:18:11 +01:00
|
|
|
/** Copy storage held by <b>old</b> into a new or_options_t and return it. */
|
|
|
|
static or_options_t *
|
2005-07-22 22:37:42 +02:00
|
|
|
options_dup(config_format_t *fmt, or_options_t *old)
|
2004-11-04 23:31:50 +01:00
|
|
|
{
|
2004-11-09 06:59:22 +01:00
|
|
|
or_options_t *newopts;
|
2004-11-06 06:18:11 +01:00
|
|
|
int i;
|
2005-07-22 23:12:10 +02:00
|
|
|
config_line_t *line;
|
2004-11-04 23:31:50 +01:00
|
|
|
|
2005-07-22 22:37:42 +02:00
|
|
|
newopts = config_alloc(fmt);
|
|
|
|
for (i=0; fmt->vars[i].name; ++i) {
|
|
|
|
if (fmt->vars[i].type == CONFIG_TYPE_LINELIST_S)
|
2004-11-09 07:18:17 +01:00
|
|
|
continue;
|
2005-07-22 22:37:42 +02:00
|
|
|
if (fmt->vars[i].type == CONFIG_TYPE_OBSOLETE)
|
2004-11-09 07:18:17 +01:00
|
|
|
continue;
|
2005-07-22 22:37:42 +02:00
|
|
|
line = get_assigned_option(fmt, old, fmt->vars[i].name);
|
2004-11-06 06:18:11 +01:00
|
|
|
if (line) {
|
2005-09-14 04:07:35 +02:00
|
|
|
if (config_assign(fmt, newopts, line, 0, 0) < 0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_BUG, "Bug: config_get_assigned_option() generated "
|
|
|
|
"something we couldn't config_assign().");
|
2004-11-06 06:18:11 +01:00
|
|
|
tor_assert(0);
|
2004-11-04 23:31:50 +01:00
|
|
|
}
|
2004-11-06 06:18:11 +01:00
|
|
|
}
|
|
|
|
config_free_lines(line);
|
2004-11-04 23:31:50 +01:00
|
|
|
}
|
2004-11-09 06:59:22 +01:00
|
|
|
return newopts;
|
2004-11-04 23:31:50 +01:00
|
|
|
}
|
|
|
|
|
2005-08-09 20:49:43 +02:00
|
|
|
/** Return a new empty or_options_t. Used for testing. */
|
|
|
|
or_options_t *
|
|
|
|
options_new(void)
|
|
|
|
{
|
|
|
|
return config_alloc(&options_format);
|
|
|
|
}
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
/** Set <b>options</b> to hold reasonable defaults for most options.
|
|
|
|
* Each option defaults to zero. */
|
2004-11-06 06:18:11 +01:00
|
|
|
void
|
|
|
|
options_init(or_options_t *options)
|
2005-07-22 22:37:42 +02:00
|
|
|
{
|
2005-08-04 21:56:41 +02:00
|
|
|
config_init(&options_format, options);
|
2005-07-22 22:37:42 +02:00
|
|
|
}
|
|
|
|
|
2005-07-28 21:01:48 +02:00
|
|
|
/* DOCDOC */
|
2005-07-22 22:37:42 +02:00
|
|
|
static void
|
2005-07-28 21:01:48 +02:00
|
|
|
config_init(config_format_t *fmt, void *options)
|
2004-10-14 04:47:09 +02:00
|
|
|
{
|
2004-11-04 09:26:34 +01:00
|
|
|
int i;
|
|
|
|
config_var_t *var;
|
2005-07-22 22:37:42 +02:00
|
|
|
CHECK(fmt, options);
|
2004-11-04 09:26:34 +01:00
|
|
|
|
2005-07-22 22:37:42 +02:00
|
|
|
for (i=0; fmt->vars[i].name; ++i) {
|
|
|
|
var = &fmt->vars[i];
|
2004-11-28 10:05:49 +01:00
|
|
|
if (!var->initvalue)
|
2004-11-04 09:26:34 +01:00
|
|
|
continue; /* defaults to NULL or 0 */
|
2005-09-14 04:07:35 +02:00
|
|
|
option_reset(fmt, options, var, 1);
|
2004-11-04 09:26:34 +01:00
|
|
|
}
|
2003-10-21 11:48:17 +02:00
|
|
|
}
|
|
|
|
|
2005-07-28 21:01:48 +02:00
|
|
|
/* DOCDOC */
|
2005-07-22 22:37:42 +02:00
|
|
|
static char *
|
2005-07-28 21:01:48 +02:00
|
|
|
config_dump(config_format_t *fmt, void *options, int minimal)
|
2004-11-12 21:09:54 +01:00
|
|
|
{
|
|
|
|
smartlist_t *elements;
|
|
|
|
or_options_t *defaults;
|
2006-01-11 05:09:40 +01:00
|
|
|
config_line_t *line, *assigned;
|
2004-11-12 21:09:54 +01:00
|
|
|
char *result;
|
2005-08-04 21:56:41 +02:00
|
|
|
int i;
|
|
|
|
const char *desc;
|
2004-11-12 21:09:54 +01:00
|
|
|
|
2005-07-22 22:37:42 +02:00
|
|
|
defaults = config_alloc(fmt);
|
|
|
|
config_init(fmt, defaults);
|
2006-01-10 21:27:47 +01:00
|
|
|
fmt->validate_fn(NULL,defaults, 1);
|
|
|
|
/* XXX use a 1 here so we don't add a new log line while dumping */
|
2004-11-12 21:09:54 +01:00
|
|
|
|
|
|
|
elements = smartlist_create();
|
2005-07-22 22:37:42 +02:00
|
|
|
for (i=0; fmt->vars[i].name; ++i) {
|
|
|
|
if (fmt->vars[i].type == CONFIG_TYPE_OBSOLETE ||
|
|
|
|
fmt->vars[i].type == CONFIG_TYPE_LINELIST_S)
|
2004-11-12 21:09:54 +01:00
|
|
|
continue;
|
2005-03-12 05:22:01 +01:00
|
|
|
/* Don't save 'hidden' control variables. */
|
2005-07-22 22:37:42 +02:00
|
|
|
if (!strcmpstart(fmt->vars[i].name, "__"))
|
2005-03-12 05:22:01 +01:00
|
|
|
continue;
|
2005-07-22 22:37:42 +02:00
|
|
|
if (minimal && option_is_same(fmt, options, defaults, fmt->vars[i].name))
|
2004-11-12 21:09:54 +01:00
|
|
|
continue;
|
2005-07-28 21:01:48 +02:00
|
|
|
|
2005-08-04 21:56:41 +02:00
|
|
|
desc = config_find_description(fmt, fmt->vars[i].name);
|
2006-01-11 20:43:14 +01:00
|
|
|
line = assigned = get_assigned_option(fmt, options, fmt->vars[i].name);
|
|
|
|
|
|
|
|
if (line && desc) {
|
|
|
|
/* Only dump the description if there's something to describe. */
|
2005-08-04 21:56:41 +02:00
|
|
|
size_t len = strlen(desc)+8;
|
|
|
|
char *tmp = tor_malloc(len);
|
|
|
|
tor_snprintf(tmp, len, "# %s\n",desc);
|
|
|
|
smartlist_add(elements, tmp);
|
2005-07-28 21:01:48 +02:00
|
|
|
}
|
|
|
|
|
2004-11-12 21:09:54 +01:00
|
|
|
for (; line; line = line->next) {
|
|
|
|
size_t len = strlen(line->key) + strlen(line->value) + 3;
|
|
|
|
char *tmp;
|
|
|
|
tmp = tor_malloc(len);
|
|
|
|
if (tor_snprintf(tmp, len, "%s %s\n", line->key, line->value)<0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_err(LD_BUG,"Internal error writing option value");
|
2004-11-12 21:09:54 +01:00
|
|
|
tor_assert(0);
|
|
|
|
}
|
|
|
|
smartlist_add(elements, tmp);
|
|
|
|
}
|
2006-01-11 05:09:40 +01:00
|
|
|
config_free_lines(assigned);
|
2004-11-12 21:09:54 +01:00
|
|
|
}
|
|
|
|
|
2006-02-12 23:28:30 +01:00
|
|
|
if (fmt->extra) {
|
|
|
|
line = *(config_line_t**)STRUCT_VAR_P(options, fmt->extra->var_offset);
|
|
|
|
for (; line; line = line->next) {
|
|
|
|
size_t len = strlen(line->key) + strlen(line->value) + 3;
|
|
|
|
char *tmp;
|
|
|
|
tmp = tor_malloc(len);
|
|
|
|
if (tor_snprintf(tmp, len, "%s %s\n", line->key, line->value)<0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_err(LD_BUG,"Internal error writing option value");
|
2006-02-12 23:28:30 +01:00
|
|
|
tor_assert(0);
|
|
|
|
}
|
|
|
|
smartlist_add(elements, tmp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-11-12 21:09:54 +01:00
|
|
|
result = smartlist_join_strings(elements, "", 0, NULL);
|
|
|
|
SMARTLIST_FOREACH(elements, char *, cp, tor_free(cp));
|
|
|
|
smartlist_free(elements);
|
2006-01-11 04:20:53 +01:00
|
|
|
config_free(fmt, defaults);
|
2004-11-12 21:09:54 +01:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2005-07-22 22:37:42 +02:00
|
|
|
/** Return a string containing a possible configuration file that would give
|
|
|
|
* the configuration in <b>options</b>. If <b>minimal</b> is true, do not
|
|
|
|
* include options that are the same as Tor's defaults.
|
|
|
|
*/
|
|
|
|
char *
|
2005-07-23 03:58:05 +02:00
|
|
|
options_dump(or_options_t *options, int minimal)
|
2005-07-22 22:37:42 +02:00
|
|
|
{
|
2005-08-04 21:56:41 +02:00
|
|
|
return config_dump(&options_format, options, minimal);
|
2005-07-22 22:37:42 +02:00
|
|
|
}
|
|
|
|
|
2005-08-07 23:58:23 +02:00
|
|
|
/* Return 0 if every element of sl is a string holding a decimal
|
|
|
|
* representation of a port number, or if sl is NULL.
|
|
|
|
* Otherwise return -1. */
|
2005-01-12 05:58:23 +01:00
|
|
|
static int
|
2005-06-11 20:52:12 +02:00
|
|
|
validate_ports_csv(smartlist_t *sl, const char *name)
|
|
|
|
{
|
2005-01-12 05:58:23 +01:00
|
|
|
int i;
|
|
|
|
int result = 0;
|
|
|
|
tor_assert(name);
|
|
|
|
|
2005-02-05 22:42:46 +01:00
|
|
|
if (!sl)
|
2005-01-12 05:58:23 +01:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
SMARTLIST_FOREACH(sl, const char *, cp,
|
|
|
|
{
|
|
|
|
i = atoi(cp);
|
|
|
|
if (i < 1 || i > 65535) {
|
2005-10-25 09:05:03 +02:00
|
|
|
log(LOG_WARN, LD_CONFIG, "Port '%s' out of range in %s", cp, name);
|
2005-01-12 05:58:23 +01:00
|
|
|
result=-1;
|
|
|
|
}
|
|
|
|
});
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2005-08-08 23:58:48 +02:00
|
|
|
/** DOCDOC */
|
|
|
|
static void
|
|
|
|
parse_reachable_addresses(void)
|
2005-08-07 23:24:00 +02:00
|
|
|
{
|
2005-08-08 23:58:48 +02:00
|
|
|
or_options_t *options = get_options();
|
2005-08-07 23:24:00 +02:00
|
|
|
|
2006-02-13 23:29:37 +01:00
|
|
|
if (options->ReachableDirAddresses &&
|
|
|
|
options->ReachableORAddresses &&
|
|
|
|
options->ReachableAddresses)
|
|
|
|
log_warn(LD_CONFIG, "Both ReachableDirAddresses and ReachableORAddresses are set. "
|
|
|
|
"ReachableAddresses setting will be ignored.");
|
|
|
|
|
2006-02-13 22:17:20 +01:00
|
|
|
addr_policy_free(reachable_or_addr_policy);
|
|
|
|
reachable_or_addr_policy = NULL;
|
|
|
|
if (!options->ReachableORAddresses && options->ReachableAddresses)
|
|
|
|
log_notice(LD_CONFIG, "Using ReachableAddresses for "
|
|
|
|
"ReachableORAddresses");
|
|
|
|
if (config_parse_addr_policy(options->ReachableORAddresses ?
|
|
|
|
options->ReachableORAddresses :
|
|
|
|
options->ReachableAddresses,
|
|
|
|
&reachable_or_addr_policy,
|
|
|
|
ADDR_POLICY_ACCEPT)) {
|
|
|
|
log_warn(LD_CONFIG, "Error in ReachableORAddresses entry; ignoring.");
|
|
|
|
}
|
|
|
|
|
|
|
|
addr_policy_free(reachable_dir_addr_policy);
|
|
|
|
reachable_dir_addr_policy = NULL;
|
|
|
|
if (!options->ReachableDirAddresses && options->ReachableAddresses)
|
|
|
|
log_notice(LD_CONFIG, "Using ReachableAddresses for "
|
|
|
|
"ReachableDirAddresses");
|
|
|
|
if (config_parse_addr_policy(options->ReachableDirAddresses ?
|
|
|
|
options->ReachableDirAddresses :
|
|
|
|
options->ReachableAddresses,
|
|
|
|
&reachable_dir_addr_policy,
|
2005-08-08 23:58:48 +02:00
|
|
|
ADDR_POLICY_ACCEPT)) {
|
2006-02-13 22:17:20 +01:00
|
|
|
log_warn(LD_CONFIG, "Error in ReachableDirAddresses entry; ignoring.");
|
2005-08-08 23:58:48 +02:00
|
|
|
}
|
2005-08-07 23:24:00 +02:00
|
|
|
}
|
|
|
|
|
2005-08-08 23:58:48 +02:00
|
|
|
/** Return true iff the firewall options might block any address:port
|
2005-11-19 11:12:10 +01:00
|
|
|
* combination.
|
2005-08-08 23:58:48 +02:00
|
|
|
*/
|
2005-08-07 23:24:00 +02:00
|
|
|
int
|
2006-02-13 22:17:20 +01:00
|
|
|
firewall_is_fascist_or(void)
|
2005-08-07 23:24:00 +02:00
|
|
|
{
|
2006-02-13 22:17:20 +01:00
|
|
|
return !!reachable_or_addr_policy;
|
2005-08-08 23:58:48 +02:00
|
|
|
}
|
2005-08-07 23:24:00 +02:00
|
|
|
|
2005-08-08 23:58:48 +02:00
|
|
|
/** Return true iff we are configured to think that the local fascist
|
2006-02-13 22:17:20 +01:00
|
|
|
* firewall (if any) will allow a connection to <b>addr</b>:<b>port</b>.
|
|
|
|
*
|
|
|
|
* If dir_or_or is 1 then it consults ReachableDirAddresses,
|
|
|
|
* if it is 2, then ReachableORAddresses are consulted.
|
|
|
|
* */
|
2005-08-08 23:58:48 +02:00
|
|
|
int
|
2006-02-13 22:17:20 +01:00
|
|
|
_fascist_firewall_allows_address(uint32_t addr, uint16_t port, int dir_or_or)
|
2005-08-08 23:58:48 +02:00
|
|
|
{
|
2006-02-18 03:02:21 +01:00
|
|
|
addr_policy_result_t p;
|
|
|
|
|
2006-02-13 22:17:20 +01:00
|
|
|
assert(dir_or_or == 1 || dir_or_or == 2);
|
2006-02-18 03:02:21 +01:00
|
|
|
p = router_compare_addr_to_addr_policy(
|
2006-02-13 22:17:20 +01:00
|
|
|
addr, port, dir_or_or == 1 ?
|
|
|
|
reachable_dir_addr_policy :
|
|
|
|
reachable_or_addr_policy);
|
2005-08-08 23:58:48 +02:00
|
|
|
|
|
|
|
switch (p) {
|
|
|
|
case ADDR_POLICY_PROBABLY_ACCEPTED:
|
|
|
|
case ADDR_POLICY_ACCEPTED:
|
|
|
|
return 1;
|
|
|
|
case ADDR_POLICY_PROBABLY_REJECTED:
|
|
|
|
case ADDR_POLICY_REJECTED:
|
|
|
|
return 0;
|
|
|
|
default:
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_BUG, "Unexpected result: %d", (int)p);
|
2005-08-08 23:58:48 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2005-08-07 23:24:00 +02:00
|
|
|
}
|
|
|
|
|
2006-02-13 22:17:20 +01:00
|
|
|
int
|
|
|
|
fascist_firewall_allows_address_or(uint32_t addr, uint16_t port)
|
|
|
|
{
|
|
|
|
return _fascist_firewall_allows_address(addr, port, 2);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
fascist_firewall_allows_address_dir(uint32_t addr, uint16_t port)
|
|
|
|
{
|
|
|
|
return _fascist_firewall_allows_address(addr, port, 1);
|
|
|
|
}
|
|
|
|
|
2004-11-09 00:12:40 +01:00
|
|
|
/** Return 0 if every setting in <b>options</b> is reasonable. Else
|
|
|
|
* warn and return -1. Should have no side effects, except for
|
2005-12-08 19:56:32 +01:00
|
|
|
* normalizing the contents of <b>options</b>.
|
|
|
|
* DOCDOC old_options.
|
2006-01-10 21:27:47 +01:00
|
|
|
*
|
|
|
|
* XXX
|
|
|
|
* If <b>from_setconf</b>, we were called by the controller, and our
|
|
|
|
* Log line should stay empty. If it's 0, then give us a default log
|
|
|
|
* if there are no logs defined.
|
2005-12-08 19:56:32 +01:00
|
|
|
*/
|
2004-11-04 11:23:30 +01:00
|
|
|
static int
|
2006-01-10 21:27:47 +01:00
|
|
|
options_validate(or_options_t *old_options, or_options_t *options,
|
|
|
|
int from_setconf)
|
2004-11-04 11:23:30 +01:00
|
|
|
{
|
|
|
|
int result = 0;
|
2006-02-13 22:17:20 +01:00
|
|
|
int i;
|
2005-07-22 23:12:10 +02:00
|
|
|
config_line_t *cl;
|
2004-12-04 02:14:36 +01:00
|
|
|
addr_policy_t *addr_policy=NULL;
|
2006-02-11 22:26:40 +01:00
|
|
|
const char *uname;
|
2005-12-14 21:40:40 +01:00
|
|
|
#define REJECT(arg) \
|
|
|
|
do { log(LOG_WARN, LD_CONFIG, arg); result = -1; } while (0)
|
2005-12-09 06:20:02 +01:00
|
|
|
#define COMPLAIN(arg) do { log(LOG_WARN, LD_CONFIG, arg); } while (0)
|
2004-02-29 00:30:41 +01:00
|
|
|
|
2005-10-25 09:05:03 +02:00
|
|
|
if (options->ORPort < 0 || options->ORPort > 65535)
|
|
|
|
REJECT("ORPort option out of bounds.");
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2006-02-11 22:26:40 +01:00
|
|
|
uname = get_uname();
|
|
|
|
if (server_mode(options) &&
|
|
|
|
(!strcmpstart(uname, "Windows 95") ||
|
|
|
|
!strcmpstart(uname, "Windows 98") ||
|
|
|
|
!strcmpstart(uname, "Windows Me"))) {
|
|
|
|
log(LOG_WARN, LD_CONFIG, "Tor is running as a server, but you are "
|
2006-02-12 23:28:30 +01:00
|
|
|
"running %s; this probably won't work. See "
|
|
|
|
"http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#ServerOS "
|
|
|
|
"for details.", get_uname());
|
2006-02-11 22:26:40 +01:00
|
|
|
}
|
|
|
|
|
2005-10-25 09:05:03 +02:00
|
|
|
if (options->ORPort == 0 && options->ORListenAddress != NULL)
|
|
|
|
REJECT("ORPort must be defined if ORListenAddress is defined.");
|
2004-12-07 07:51:46 +01:00
|
|
|
|
2005-10-25 09:05:03 +02:00
|
|
|
if (options->DirPort == 0 && options->DirListenAddress != NULL)
|
|
|
|
REJECT("DirPort must be defined if DirListenAddress is defined.");
|
|
|
|
|
2006-02-13 07:25:16 +01:00
|
|
|
if (options->ControlPort == 0 && options->ControlListenAddress != NULL)
|
|
|
|
REJECT("ControlPort must be defined if ControlListenAddress is defined.");
|
|
|
|
|
2005-11-11 23:41:07 +01:00
|
|
|
#if 0 /* don't complain, since a standard configuration does this! */
|
2005-10-25 09:05:03 +02:00
|
|
|
if (options->SocksPort == 0 && options->SocksListenAddress != NULL)
|
|
|
|
REJECT("SocksPort must be defined if SocksListenAddress is defined.");
|
2005-11-11 23:41:07 +01:00
|
|
|
#endif
|
2005-10-25 09:05:03 +02:00
|
|
|
|
2005-12-08 19:56:32 +01:00
|
|
|
if (options->SocksListenAddress) {
|
|
|
|
config_line_t *line = NULL;
|
2005-12-09 03:46:46 +01:00
|
|
|
char *address = NULL;
|
2005-12-08 19:56:32 +01:00
|
|
|
for (line = options->SocksListenAddress; line; line = line->next) {
|
|
|
|
uint16_t port;
|
|
|
|
uint32_t addr;
|
2005-12-09 03:46:46 +01:00
|
|
|
if (parse_addr_port(line->value, &address, &addr, &port)<0)
|
2005-12-08 19:56:32 +01:00
|
|
|
continue; /* We'll warn about this later. */
|
2005-12-09 03:46:46 +01:00
|
|
|
if (!is_internal_IP(addr, 1) &&
|
|
|
|
(!old_options || !config_lines_eq(old_options->SocksListenAddress,
|
|
|
|
options->SocksListenAddress))) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,
|
2005-12-09 06:20:02 +01:00
|
|
|
"You specified a public address '%s' for a SOCKS listener. Other "
|
|
|
|
"people on the Internet might find your computer and use it as "
|
|
|
|
"an open SOCKS proxy. Please don't allow this unless you have "
|
|
|
|
"a good reason.", address);
|
2005-12-09 03:46:46 +01:00
|
|
|
}
|
|
|
|
tor_free(address);
|
2005-12-08 19:56:32 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-10-25 09:05:03 +02:00
|
|
|
if (validate_data_directory(options)<0)
|
|
|
|
REJECT("Invalid DataDirectory");
|
2004-11-09 06:26:49 +01:00
|
|
|
|
2004-07-18 23:47:04 +02:00
|
|
|
if (options->Nickname == NULL) {
|
2004-11-06 06:18:11 +01:00
|
|
|
if (server_mode(options)) {
|
2004-08-04 04:15:22 +02:00
|
|
|
if (!(options->Nickname = get_default_nickname()))
|
|
|
|
return -1;
|
2006-02-13 10:02:35 +01:00
|
|
|
log_notice(LD_CONFIG, "Choosing default nickname '%s'",
|
|
|
|
options->Nickname);
|
2004-08-04 04:15:22 +02:00
|
|
|
}
|
2004-07-18 23:47:04 +02:00
|
|
|
} else {
|
2005-08-15 10:51:20 +02:00
|
|
|
if (!is_legal_nickname(options->Nickname)) {
|
2005-12-14 21:40:40 +01:00
|
|
|
log(LOG_WARN, LD_CONFIG,
|
|
|
|
"Nickname '%s' is wrong length or contains illegal characters.",
|
|
|
|
options->Nickname);
|
2004-07-18 23:47:04 +02:00
|
|
|
result = -1;
|
2004-03-20 21:28:53 +01:00
|
|
|
}
|
2002-11-23 07:49:01 +01:00
|
|
|
}
|
|
|
|
|
2005-05-04 22:45:38 +02:00
|
|
|
if (server_mode(options) && !options->ContactInfo)
|
2005-12-09 06:37:26 +01:00
|
|
|
log(LOG_NOTICE, LD_CONFIG, "Your ContactInfo config option is not set. "
|
|
|
|
"Please consider setting it, so we can contact you if your server is "
|
|
|
|
"misconfigured or something else goes wrong.");
|
2005-05-04 22:45:38 +02:00
|
|
|
|
2004-11-09 00:12:40 +01:00
|
|
|
if (normalize_log_options(options))
|
|
|
|
return -1;
|
|
|
|
|
2005-12-11 11:01:21 +01:00
|
|
|
/* Special case on first boot if no Log options are given. */
|
2006-01-10 21:27:47 +01:00
|
|
|
if (!options->Logs && !from_setconf) {
|
2005-01-05 07:05:37 +01:00
|
|
|
config_line_append(&options->Logs, "Log", "notice stdout");
|
2004-11-09 00:12:40 +01:00
|
|
|
}
|
|
|
|
|
2005-07-23 03:58:05 +02:00
|
|
|
if (options_init_logs(options, 1)<0) /* Validate the log(s) */
|
2004-11-10 04:40:30 +01:00
|
|
|
return -1;
|
|
|
|
|
2004-11-06 06:18:11 +01:00
|
|
|
if (server_mode(options)) {
|
2004-08-16 13:43:18 +02:00
|
|
|
/* confirm that our address isn't broken, so we can complain now */
|
|
|
|
uint32_t tmp;
|
2005-08-25 22:33:17 +02:00
|
|
|
if (resolve_my_address(options, &tmp, NULL) < 0)
|
2004-03-14 19:12:59 +01:00
|
|
|
result = -1;
|
2004-03-04 02:53:56 +01:00
|
|
|
}
|
|
|
|
|
2006-01-10 21:00:20 +01:00
|
|
|
#ifndef MS_WINDOWS
|
|
|
|
if (options->RunAsDaemon && torrc_fname && path_is_relative(torrc_fname))
|
|
|
|
REJECT("Can't use a relative path to torrc when RunAsDaemon is set.");
|
|
|
|
#endif
|
|
|
|
|
2005-10-25 09:05:03 +02:00
|
|
|
if (options->SocksPort < 0 || options->SocksPort > 65535)
|
|
|
|
REJECT("SocksPort option out of bounds.");
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2005-10-25 09:05:03 +02:00
|
|
|
if (options->SocksPort == 0 && options->ORPort == 0)
|
|
|
|
REJECT("SocksPort and ORPort are both undefined? Quitting.");
|
2003-11-10 09:06:55 +01:00
|
|
|
|
2005-10-25 09:05:03 +02:00
|
|
|
if (options->ControlPort < 0 || options->ControlPort > 65535)
|
|
|
|
REJECT("ControlPort option out of bounds.");
|
2004-11-04 07:41:49 +01:00
|
|
|
|
2005-10-25 09:05:03 +02:00
|
|
|
if (options->DirPort < 0 || options->DirPort > 65535)
|
|
|
|
REJECT("DirPort option out of bounds.");
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2004-11-03 11:08:44 +01:00
|
|
|
if (options->StrictExitNodes &&
|
2005-12-08 19:56:32 +01:00
|
|
|
(!options->ExitNodes || !strlen(options->ExitNodes)) &&
|
|
|
|
(!old_options ||
|
|
|
|
(old_options->StrictExitNodes != options->StrictExitNodes) ||
|
|
|
|
(!opt_streq(old_options->ExitNodes, options->ExitNodes))))
|
2005-10-25 09:05:03 +02:00
|
|
|
COMPLAIN("StrictExitNodes set, but no ExitNodes listed.");
|
2004-08-15 22:14:44 +02:00
|
|
|
|
2004-11-03 11:08:44 +01:00
|
|
|
if (options->StrictEntryNodes &&
|
2005-12-08 19:56:32 +01:00
|
|
|
(!options->EntryNodes || !strlen(options->EntryNodes)) &&
|
|
|
|
(!old_options ||
|
|
|
|
(old_options->StrictEntryNodes != options->StrictEntryNodes) ||
|
|
|
|
(!opt_streq(old_options->EntryNodes, options->EntryNodes))))
|
2005-10-25 09:05:03 +02:00
|
|
|
COMPLAIN("StrictEntryNodes set, but no EntryNodes listed.");
|
2004-08-15 22:14:44 +02:00
|
|
|
|
2005-08-25 22:33:17 +02:00
|
|
|
if (options->AuthoritativeDir) {
|
2005-10-25 09:05:03 +02:00
|
|
|
if (!options->ContactInfo)
|
|
|
|
REJECT("Authoritative directory servers must set ContactInfo");
|
|
|
|
if (!options->RecommendedVersions)
|
2005-12-14 21:40:40 +01:00
|
|
|
REJECT("Authoritative directory servers must set RecommendedVersions.");
|
2005-08-25 22:33:17 +02:00
|
|
|
if (!options->RecommendedClientVersions)
|
|
|
|
options->RecommendedClientVersions =
|
|
|
|
config_lines_dup(options->RecommendedVersions);
|
|
|
|
if (!options->RecommendedServerVersions)
|
|
|
|
options->RecommendedServerVersions =
|
|
|
|
config_lines_dup(options->RecommendedVersions);
|
2006-01-10 23:42:44 +01:00
|
|
|
if (options->UseEntryGuards) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_notice(LD_CONFIG, "Authoritative directory servers can't set "
|
|
|
|
"UseEntryGuards. Disabling.");
|
2006-01-10 23:42:44 +01:00
|
|
|
options->UseEntryGuards = 0;
|
2006-01-02 09:40:58 +01:00
|
|
|
}
|
2004-03-10 08:44:31 +01:00
|
|
|
}
|
|
|
|
|
2005-10-25 09:05:03 +02:00
|
|
|
if (options->AuthoritativeDir && !options->DirPort)
|
|
|
|
REJECT("Running as authoritative directory, but no DirPort set.");
|
2004-06-21 06:37:27 +02:00
|
|
|
|
2005-10-25 09:05:03 +02:00
|
|
|
if (options->AuthoritativeDir && !options->ORPort)
|
|
|
|
REJECT("Running as authoritative directory, but no ORPort set.");
|
2004-07-13 09:42:20 +02:00
|
|
|
|
2006-01-10 21:06:24 +01:00
|
|
|
if (options->AuthoritativeDir && options->ClientOnly)
|
2005-10-25 09:05:03 +02:00
|
|
|
REJECT("Running as authoritative directory, but ClientOnly also set.");
|
2004-07-13 09:42:20 +02:00
|
|
|
|
2005-10-25 09:05:03 +02:00
|
|
|
if (options->AuthoritativeDir && options->NoPublish)
|
|
|
|
REJECT("You cannot set both AuthoritativeDir and NoPublish.");
|
2005-04-21 12:40:48 +02:00
|
|
|
|
2005-03-14 04:28:46 +01:00
|
|
|
if (options->ConnLimit <= 0) {
|
2005-12-14 21:40:40 +01:00
|
|
|
log(LOG_WARN, LD_CONFIG,
|
|
|
|
"ConnLimit must be greater than 0, but was set to %d",
|
2005-03-14 04:28:46 +01:00
|
|
|
options->ConnLimit);
|
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2004-11-20 01:37:00 +01:00
|
|
|
if (options->_AccountingMaxKB) {
|
2005-12-14 21:40:40 +01:00
|
|
|
log(LOG_WARN, LD_CONFIG, "AccountingMaxKB is deprecated. "
|
|
|
|
"Say 'AccountingMax %d KB' instead.", options->_AccountingMaxKB);
|
2004-11-20 01:37:00 +01:00
|
|
|
options->AccountingMax = U64_LITERAL(1024)*options->_AccountingMaxKB;
|
|
|
|
options->_AccountingMaxKB = 0;
|
|
|
|
}
|
|
|
|
|
2006-01-10 21:06:24 +01:00
|
|
|
if (validate_ports_csv(options->FirewallPorts, "FirewallPorts") < 0)
|
2005-01-12 05:58:23 +01:00
|
|
|
result = -1;
|
|
|
|
|
2006-01-10 21:06:24 +01:00
|
|
|
if (validate_ports_csv(options->LongLivedPorts, "LongLivedPorts") < 0)
|
2005-08-07 23:24:00 +02:00
|
|
|
result = -1;
|
|
|
|
|
2005-12-11 10:18:25 +01:00
|
|
|
if (options->FascistFirewall && !options->ReachableAddresses) {
|
2006-02-13 22:17:20 +01:00
|
|
|
if (smartlist_len(options->FirewallPorts)) {
|
|
|
|
/* We already have firewall ports set, so migrate them to
|
|
|
|
* ReachableAddresses, which will set ReachableOR and ReachableDir-
|
|
|
|
* Addresses if they aren't set otherwise*/
|
|
|
|
smartlist_t *instead = smartlist_create();
|
|
|
|
config_line_t *new_line = tor_malloc_zero(sizeof(config_line_t));
|
|
|
|
new_line->key = tor_strdup("ReachableAddresses");
|
|
|
|
/* If we're configured with the old format, we need to prepend some
|
|
|
|
* open ports. */
|
|
|
|
SMARTLIST_FOREACH(options->FirewallPorts, const char *, portno,
|
2005-08-08 23:58:48 +02:00
|
|
|
{
|
|
|
|
int p = atoi(portno);
|
|
|
|
char *s;
|
|
|
|
if (p<0) continue;
|
|
|
|
s = tor_malloc(16);
|
|
|
|
tor_snprintf(s, 16, "*:%d", p);
|
|
|
|
smartlist_add(instead, s);
|
|
|
|
});
|
2006-02-13 22:17:20 +01:00
|
|
|
new_line->value = smartlist_join_strings(instead,",",0,NULL);
|
|
|
|
/* These have been deprecated since 0.1.1.5-alpha-cvs */
|
|
|
|
log(LOG_NOTICE, LD_CONFIG, "Converting FascistFirewall and FirewallPorts "
|
|
|
|
"config options to new format: \"ReachableAddresses %s\"",
|
|
|
|
new_line->value);
|
|
|
|
options->ReachableAddresses = new_line;
|
|
|
|
SMARTLIST_FOREACH(instead, char *, cp, tor_free(cp));
|
|
|
|
smartlist_free(instead);
|
|
|
|
} else {
|
|
|
|
/* We do not have FirewallPorts set, so add 80 to ReachableDir-,
|
|
|
|
* and 443 to ReachableORAddresses */
|
|
|
|
if (!options->ReachableDirAddresses) {
|
|
|
|
config_line_t *new_line = tor_malloc_zero(sizeof(config_line_t));
|
|
|
|
new_line->key = tor_strdup("ReachableDirAddresses");
|
|
|
|
new_line->value = tor_strdup("*:80");
|
|
|
|
options->ReachableDirAddresses = new_line;
|
|
|
|
log(LOG_NOTICE, LD_CONFIG, "Converting FascistFirewall config option "
|
|
|
|
"to new format: \"ReachableDirAddresses *:80\"");
|
|
|
|
}
|
|
|
|
if (!options->ReachableORAddresses) {
|
|
|
|
config_line_t *new_line = tor_malloc_zero(sizeof(config_line_t));
|
|
|
|
new_line->key = tor_strdup("ReachableORAddresses");
|
|
|
|
new_line->value = tor_strdup("*:443");
|
|
|
|
options->ReachableORAddresses = new_line;
|
|
|
|
log(LOG_NOTICE, LD_CONFIG, "Converting FascistFirewall config option "
|
|
|
|
"to new format: \"ReachableORAddresses *:443\"");
|
|
|
|
}
|
|
|
|
}
|
2005-08-07 23:24:00 +02:00
|
|
|
}
|
|
|
|
|
2006-02-13 22:17:20 +01:00
|
|
|
for (i=0; i<3; i++){
|
|
|
|
config_line_t **linep =
|
|
|
|
(i==0) ? &options->ReachableAddresses :
|
|
|
|
(i==1) ? &options->ReachableORAddresses :
|
|
|
|
&options->ReachableDirAddresses;
|
|
|
|
if (!*linep)
|
|
|
|
continue;
|
2005-08-08 23:58:48 +02:00
|
|
|
/* We need to end with a reject *:*, not an implicit accept *:* */
|
2005-12-14 21:40:40 +01:00
|
|
|
for (;;) {
|
2005-12-11 10:18:25 +01:00
|
|
|
if (!strcmp((*linep)->value, "reject *:*")) /* already there */
|
|
|
|
break;
|
2005-08-08 23:58:48 +02:00
|
|
|
linep = &((*linep)->next);
|
2005-12-11 10:18:25 +01:00
|
|
|
if (!*linep) {
|
|
|
|
*linep = tor_malloc_zero(sizeof(config_line_t));
|
|
|
|
(*linep)->key = tor_strdup("ReachableAddresses");
|
|
|
|
(*linep)->value = tor_strdup("reject *:*");
|
|
|
|
break;
|
|
|
|
}
|
2005-08-08 23:58:48 +02:00
|
|
|
}
|
|
|
|
}
|
2005-01-12 05:58:23 +01:00
|
|
|
|
2006-02-13 22:17:20 +01:00
|
|
|
if ((options->ReachableAddresses ||
|
|
|
|
options->ReachableORAddresses ||
|
|
|
|
options->ReachableDirAddresses) &&
|
|
|
|
server_mode(options))
|
2006-01-10 21:06:24 +01:00
|
|
|
REJECT("Servers must be able to freely connect to the rest "
|
2006-02-13 22:17:20 +01:00
|
|
|
"of the Internet, so they must not set Reachable*Addresses "
|
2006-01-10 21:06:24 +01:00
|
|
|
"or FascistFirewall.");
|
|
|
|
|
2004-08-17 07:13:58 +02:00
|
|
|
options->_AllowUnverified = 0;
|
2004-10-14 04:47:09 +02:00
|
|
|
if (options->AllowUnverifiedNodes) {
|
|
|
|
SMARTLIST_FOREACH(options->AllowUnverifiedNodes, const char *, cp, {
|
|
|
|
if (!strcasecmp(cp, "entry"))
|
|
|
|
options->_AllowUnverified |= ALLOW_UNVERIFIED_ENTRY;
|
|
|
|
else if (!strcasecmp(cp, "exit"))
|
|
|
|
options->_AllowUnverified |= ALLOW_UNVERIFIED_EXIT;
|
|
|
|
else if (!strcasecmp(cp, "middle"))
|
|
|
|
options->_AllowUnverified |= ALLOW_UNVERIFIED_MIDDLE;
|
|
|
|
else if (!strcasecmp(cp, "introduction"))
|
|
|
|
options->_AllowUnverified |= ALLOW_UNVERIFIED_INTRODUCTION;
|
|
|
|
else if (!strcasecmp(cp, "rendezvous"))
|
|
|
|
options->_AllowUnverified |= ALLOW_UNVERIFIED_RENDEZVOUS;
|
|
|
|
else {
|
2005-10-25 09:05:03 +02:00
|
|
|
log(LOG_WARN, LD_CONFIG,
|
|
|
|
"Unrecognized value '%s' in AllowUnverifiedNodes", cp);
|
2005-01-12 05:58:23 +01:00
|
|
|
result = -1;
|
2004-10-14 04:47:09 +02:00
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
if (options->SocksPort >= 1 &&
|
2005-10-25 09:05:03 +02:00
|
|
|
(options->PathlenCoinWeight < 0.0 || options->PathlenCoinWeight >= 1.0))
|
|
|
|
REJECT("PathlenCoinWeight option must be >=0.0 and <1.0.");
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2004-11-30 03:23:51 +01:00
|
|
|
#define MIN_DIR_FETCH_PERIOD 600
|
|
|
|
#define MIN_REND_POST_PERIOD 300
|
|
|
|
#define MIN_STATUS_FETCH_PERIOD 60
|
|
|
|
|
2005-01-13 21:22:38 +01:00
|
|
|
#define MAX_DIR_PERIOD (MIN_ONION_KEY_LIFETIME/2)
|
2004-11-30 03:23:51 +01:00
|
|
|
#define MAX_CACHE_DIR_FETCH_PERIOD 3600
|
|
|
|
#define MAX_CACHE_STATUS_FETCH_PERIOD 900
|
|
|
|
|
2005-03-17 13:38:37 +01:00
|
|
|
if (options->DirFetchPeriod &&
|
|
|
|
options->DirFetchPeriod < MIN_DIR_FETCH_PERIOD) {
|
2005-12-14 21:40:40 +01:00
|
|
|
log(LOG_WARN, LD_CONFIG,
|
|
|
|
"DirFetchPeriod option must be at least %d seconds. Clipping.",
|
|
|
|
MIN_DIR_FETCH_PERIOD);
|
2004-11-30 03:23:51 +01:00
|
|
|
options->DirFetchPeriod = MIN_DIR_FETCH_PERIOD;
|
2002-11-23 07:49:01 +01:00
|
|
|
}
|
2005-03-17 13:38:37 +01:00
|
|
|
if (options->StatusFetchPeriod &&
|
|
|
|
options->StatusFetchPeriod < MIN_STATUS_FETCH_PERIOD) {
|
2005-12-14 21:40:40 +01:00
|
|
|
log(LOG_WARN, LD_CONFIG,
|
|
|
|
"StatusFetchPeriod option must be at least %d seconds. Clipping.",
|
|
|
|
MIN_STATUS_FETCH_PERIOD);
|
2004-11-30 03:23:51 +01:00
|
|
|
options->StatusFetchPeriod = MIN_STATUS_FETCH_PERIOD;
|
2004-11-15 10:05:54 +01:00
|
|
|
}
|
2004-11-30 03:23:51 +01:00
|
|
|
if (options->RendPostPeriod < MIN_REND_POST_PERIOD) {
|
2005-12-14 21:40:40 +01:00
|
|
|
log(LOG_WARN,LD_CONFIG,"RendPostPeriod option must be at least %d seconds."
|
|
|
|
" Clipping.", MIN_REND_POST_PERIOD);
|
2004-11-30 03:23:51 +01:00
|
|
|
options->RendPostPeriod = MIN_REND_POST_PERIOD;
|
2004-11-15 10:05:54 +01:00
|
|
|
}
|
2004-11-30 03:23:51 +01:00
|
|
|
|
|
|
|
if (options->DirPort && ! options->AuthoritativeDir) {
|
|
|
|
if (options->DirFetchPeriod > MAX_CACHE_DIR_FETCH_PERIOD) {
|
2005-12-14 21:40:40 +01:00
|
|
|
log(LOG_WARN, LD_CONFIG, "Caching directory servers must have "
|
|
|
|
"DirFetchPeriod less than %d seconds. Clipping.",
|
|
|
|
MAX_CACHE_DIR_FETCH_PERIOD);
|
2004-11-30 03:23:51 +01:00
|
|
|
options->DirFetchPeriod = MAX_CACHE_DIR_FETCH_PERIOD;
|
|
|
|
}
|
|
|
|
if (options->StatusFetchPeriod > MAX_CACHE_STATUS_FETCH_PERIOD) {
|
2005-12-14 21:40:40 +01:00
|
|
|
log(LOG_WARN, LD_CONFIG, "Caching directory servers must have "
|
|
|
|
"StatusFetchPeriod less than %d seconds. Clipping.",
|
2005-12-10 09:27:01 +01:00
|
|
|
MAX_CACHE_STATUS_FETCH_PERIOD);
|
2004-11-30 03:23:51 +01:00
|
|
|
options->StatusFetchPeriod = MAX_CACHE_STATUS_FETCH_PERIOD;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (options->DirFetchPeriod > MAX_DIR_PERIOD) {
|
2005-12-14 21:40:40 +01:00
|
|
|
log(LOG_WARN, LD_CONFIG, "DirFetchPeriod is too large; clipping to %ds.",
|
|
|
|
MAX_DIR_PERIOD);
|
2004-11-30 03:23:51 +01:00
|
|
|
options->DirFetchPeriod = MAX_DIR_PERIOD;
|
2004-11-15 10:05:54 +01:00
|
|
|
}
|
2004-11-30 03:23:51 +01:00
|
|
|
if (options->StatusFetchPeriod > MAX_DIR_PERIOD) {
|
2005-12-14 21:40:40 +01:00
|
|
|
log(LOG_WARN, LD_CONFIG,"StatusFetchPeriod is too large; clipping to %ds.",
|
|
|
|
MAX_DIR_PERIOD);
|
2004-11-30 03:23:51 +01:00
|
|
|
options->StatusFetchPeriod = MAX_DIR_PERIOD;
|
|
|
|
}
|
|
|
|
if (options->RendPostPeriod > MAX_DIR_PERIOD) {
|
2005-12-14 21:40:40 +01:00
|
|
|
log(LOG_WARN, LD_CONFIG, "RendPostPeriod is too large; clipping to %ds.",
|
|
|
|
MAX_DIR_PERIOD);
|
2004-11-30 03:23:51 +01:00
|
|
|
options->RendPostPeriod = MAX_DIR_PERIOD;
|
2004-04-25 00:17:50 +02:00
|
|
|
}
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2005-10-25 09:05:03 +02:00
|
|
|
if (options->KeepalivePeriod < 1)
|
|
|
|
REJECT("KeepalivePeriod option must be positive.");
|
2002-11-23 07:49:01 +01:00
|
|
|
|
2004-11-22 23:24:10 +01:00
|
|
|
if (options->BandwidthRate > INT_MAX) {
|
2005-10-25 09:05:03 +02:00
|
|
|
log(LOG_WARN,LD_CONFIG,"BandwidthRate must be less than %d",INT_MAX);
|
2004-11-22 23:24:10 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
if (options->BandwidthBurst > INT_MAX) {
|
2005-10-25 09:05:03 +02:00
|
|
|
log(LOG_WARN,LD_CONFIG,"BandwidthBurst must be less than %d",INT_MAX);
|
2004-11-22 23:24:10 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
2004-12-31 22:49:20 +01:00
|
|
|
if (server_mode(options) &&
|
2005-01-04 04:46:50 +01:00
|
|
|
options->BandwidthRate < ROUTER_REQUIRED_MIN_BANDWIDTH*2) {
|
2005-12-09 06:37:26 +01:00
|
|
|
log(LOG_WARN,LD_CONFIG,"BandwidthRate is set to %d bytes/second. "
|
|
|
|
"For servers, it must be at least %d.",
|
|
|
|
(int)options->BandwidthRate, ROUTER_REQUIRED_MIN_BANDWIDTH*2);
|
2005-01-18 20:34:22 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
2005-10-25 09:05:03 +02:00
|
|
|
if (options->BandwidthRate > options->BandwidthBurst)
|
|
|
|
REJECT("BandwidthBurst must be at least equal to BandwidthRate.");
|
2004-11-09 02:24:10 +01:00
|
|
|
|
2004-11-22 22:56:51 +01:00
|
|
|
if (accounting_parse_options(options, 1)<0) {
|
2004-11-03 00:47:32 +01:00
|
|
|
result = -1;
|
|
|
|
}
|
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if (options->HttpProxy) { /* parse it now */
|
|
|
|
if (parse_addr_port(options->HttpProxy, NULL,
|
2005-10-25 09:05:03 +02:00
|
|
|
&options->HttpProxyAddr, &options->HttpProxyPort) < 0)
|
|
|
|
REJECT("HttpProxy failed to parse or resolve. Please fix.");
|
2004-10-14 04:47:09 +02:00
|
|
|
if (options->HttpProxyPort == 0) { /* give it a default */
|
2004-10-12 22:22:09 +02:00
|
|
|
options->HttpProxyPort = 80;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-05-20 10:51:45 +02:00
|
|
|
if (options->HttpProxyAuthenticator) {
|
2005-10-25 09:05:03 +02:00
|
|
|
if (strlen(options->HttpProxyAuthenticator) >= 48)
|
|
|
|
REJECT("HttpProxyAuthenticator is too long (>= 48 chars).");
|
2005-05-20 10:51:45 +02:00
|
|
|
}
|
|
|
|
|
2005-02-24 11:56:55 +01:00
|
|
|
if (options->HttpsProxy) { /* parse it now */
|
|
|
|
if (parse_addr_port(options->HttpsProxy, NULL,
|
2005-12-14 21:40:40 +01:00
|
|
|
&options->HttpsProxyAddr, &options->HttpsProxyPort) <0)
|
2005-10-25 09:05:03 +02:00
|
|
|
REJECT("HttpsProxy failed to parse or resolve. Please fix.");
|
2005-02-24 11:56:55 +01:00
|
|
|
if (options->HttpsProxyPort == 0) { /* give it a default */
|
|
|
|
options->HttpsProxyPort = 443;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-04-26 20:33:33 +02:00
|
|
|
if (options->HttpsProxyAuthenticator) {
|
2005-10-25 09:05:03 +02:00
|
|
|
if (strlen(options->HttpsProxyAuthenticator) >= 48)
|
|
|
|
REJECT("HttpsProxyAuthenticator is too long (>= 48 chars).");
|
2005-04-26 20:33:33 +02:00
|
|
|
}
|
|
|
|
|
2004-11-12 17:39:03 +01:00
|
|
|
if (options->HashedControlPassword) {
|
2005-10-25 09:05:03 +02:00
|
|
|
if (decode_hashed_password(NULL, options->HashedControlPassword)<0)
|
|
|
|
REJECT("Bad HashedControlPassword: wrong length or bad encoding");
|
2004-11-13 18:17:04 +01:00
|
|
|
}
|
2005-10-25 09:05:03 +02:00
|
|
|
if (options->HashedControlPassword && options->CookieAuthentication)
|
2005-12-14 21:40:40 +01:00
|
|
|
REJECT("Cannot set both HashedControlPassword and CookieAuthentication");
|
2004-11-13 18:17:04 +01:00
|
|
|
|
2006-01-10 23:42:44 +01:00
|
|
|
if (options->UseEntryGuards && ! options->NumEntryGuards)
|
|
|
|
REJECT("Cannot enable UseEntryGuards with NumEntryGuards set to 0");
|
2005-07-22 16:55:09 +02:00
|
|
|
|
2004-10-15 03:58:11 +02:00
|
|
|
if (check_nickname_list(options->ExitNodes, "ExitNodes"))
|
2004-11-04 11:23:30 +01:00
|
|
|
result = -1;
|
2004-10-15 03:58:11 +02:00
|
|
|
if (check_nickname_list(options->EntryNodes, "EntryNodes"))
|
2004-11-04 11:23:30 +01:00
|
|
|
result = -1;
|
2004-10-15 03:58:11 +02:00
|
|
|
if (check_nickname_list(options->ExcludeNodes, "ExcludeNodes"))
|
2004-11-04 11:23:30 +01:00
|
|
|
result = -1;
|
2004-10-15 03:58:11 +02:00
|
|
|
if (check_nickname_list(options->RendNodes, "RendNodes"))
|
2004-11-04 11:23:30 +01:00
|
|
|
result = -1;
|
2004-10-15 03:58:11 +02:00
|
|
|
if (check_nickname_list(options->RendNodes, "RendExcludeNodes"))
|
2004-11-04 11:23:30 +01:00
|
|
|
result = -1;
|
2004-10-15 03:58:11 +02:00
|
|
|
if (check_nickname_list(options->MyFamily, "MyFamily"))
|
2004-11-04 11:23:30 +01:00
|
|
|
result = -1;
|
2004-10-15 22:52:09 +02:00
|
|
|
for (cl = options->NodeFamilies; cl; cl = cl->next) {
|
|
|
|
if (check_nickname_list(cl->value, "NodeFamily"))
|
2004-11-04 11:23:30 +01:00
|
|
|
result = -1;
|
2004-10-15 22:52:09 +02:00
|
|
|
}
|
|
|
|
|
2006-02-01 04:53:52 +01:00
|
|
|
if (config_parse_exit_policy(options->ExitPolicy, &addr_policy,
|
|
|
|
options->ExitPolicyRejectPrivate))
|
|
|
|
REJECT("Error in ExitPolicy entry.");
|
2005-10-25 09:05:03 +02:00
|
|
|
|
2005-02-02 02:59:16 +01:00
|
|
|
/* The rest of these calls *append* to addr_policy. So don't actually
|
|
|
|
* use the results for anything other than checking if they parse! */
|
2005-10-25 09:05:03 +02:00
|
|
|
if (config_parse_addr_policy(options->DirPolicy, &addr_policy, -1))
|
|
|
|
REJECT("Error in DirPolicy entry.");
|
|
|
|
if (config_parse_addr_policy(options->SocksPolicy, &addr_policy, -1))
|
|
|
|
REJECT("Error in SocksPolicy entry.");
|
2005-08-08 23:58:48 +02:00
|
|
|
if (config_parse_addr_policy(options->ReachableAddresses, &addr_policy,
|
2005-10-25 09:05:03 +02:00
|
|
|
ADDR_POLICY_ACCEPT))
|
|
|
|
REJECT("Error in ReachableAddresses entry.");
|
2006-02-13 22:17:20 +01:00
|
|
|
if (config_parse_addr_policy(options->ReachableORAddresses, &addr_policy,
|
|
|
|
ADDR_POLICY_ACCEPT))
|
|
|
|
REJECT("Error in ReachableORAddresses entry.");
|
|
|
|
if (config_parse_addr_policy(options->ReachableDirAddresses, &addr_policy,
|
|
|
|
ADDR_POLICY_ACCEPT))
|
|
|
|
REJECT("Error in ReachableDirAddresses entry.");
|
2005-09-15 16:39:05 +02:00
|
|
|
if (config_parse_addr_policy(options->AuthDirReject, &addr_policy,
|
2005-10-25 09:05:03 +02:00
|
|
|
ADDR_POLICY_REJECT))
|
2006-02-13 22:17:20 +01:00
|
|
|
REJECT("Error in AuthDirReject entry.");
|
2005-09-15 16:39:05 +02:00
|
|
|
if (config_parse_addr_policy(options->AuthDirInvalid, &addr_policy,
|
2005-10-25 09:05:03 +02:00
|
|
|
ADDR_POLICY_REJECT))
|
2006-02-13 22:17:20 +01:00
|
|
|
REJECT("Error in AuthDirInvalid entry.");
|
2005-10-25 09:05:03 +02:00
|
|
|
|
2004-11-12 20:39:13 +01:00
|
|
|
addr_policy_free(addr_policy);
|
|
|
|
|
2004-10-17 00:37:08 +02:00
|
|
|
for (cl = options->RedirectExit; cl; cl = cl->next) {
|
2004-11-09 19:22:17 +01:00
|
|
|
if (parse_redirect_line(NULL, cl)<0)
|
2004-11-04 11:23:30 +01:00
|
|
|
result = -1;
|
2004-10-17 00:37:08 +02:00
|
|
|
}
|
|
|
|
|
2005-11-18 03:47:09 +01:00
|
|
|
if (options->DirServers) {
|
2005-12-08 19:56:32 +01:00
|
|
|
if (!old_options ||
|
|
|
|
!config_lines_eq(options->DirServers, old_options->DirServers))
|
2005-12-09 06:37:26 +01:00
|
|
|
COMPLAIN("You have used DirServer to specify directory authorities in "
|
|
|
|
"your configuration. This is potentially dangerous: it can "
|
|
|
|
"make you look different from all other Tor users, and hurt "
|
|
|
|
"your anonymity. Even if you've specified the same "
|
|
|
|
"authorities as Tor uses by default, the defaults could "
|
|
|
|
"change in the future. Be sure you know what you're doing.");
|
2004-10-13 21:55:40 +02:00
|
|
|
for (cl = options->DirServers; cl; cl = cl->next) {
|
2004-11-09 00:12:40 +01:00
|
|
|
if (parse_dir_server_line(cl->value, 1)<0)
|
2004-11-04 11:23:30 +01:00
|
|
|
result = -1;
|
2004-10-13 21:55:40 +02:00
|
|
|
}
|
2004-10-12 17:55:20 +02:00
|
|
|
}
|
|
|
|
|
2004-11-09 00:12:40 +01:00
|
|
|
if (rend_config_services(options, 1) < 0)
|
|
|
|
result = -1;
|
|
|
|
|
2004-11-04 11:23:30 +01:00
|
|
|
return result;
|
2005-10-25 09:05:03 +02:00
|
|
|
#undef REJECT
|
|
|
|
#undef COMPLAIN
|
2004-11-04 11:23:30 +01:00
|
|
|
}
|
|
|
|
|
2004-11-10 04:40:30 +01:00
|
|
|
/** Helper: return true iff s1 and s2 are both NULL, or both non-NULL
|
|
|
|
* equal strings. */
|
|
|
|
static int
|
|
|
|
opt_streq(const char *s1, const char *s2)
|
|
|
|
{
|
|
|
|
if (!s1 && !s2)
|
|
|
|
return 1;
|
|
|
|
else if (s1 && s2 && !strcmp(s1,s2))
|
|
|
|
return 1;
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-11-06 06:18:11 +01:00
|
|
|
/** Check if any of the previous options have changed but aren't allowed to. */
|
|
|
|
static int
|
2005-06-11 20:52:12 +02:00
|
|
|
options_transition_allowed(or_options_t *old, or_options_t *new_val)
|
|
|
|
{
|
2004-11-28 10:05:49 +01:00
|
|
|
if (!old)
|
2004-11-06 06:18:11 +01:00
|
|
|
return 0;
|
|
|
|
|
2004-11-10 04:40:30 +01:00
|
|
|
if (!opt_streq(old->PidFile, new_val->PidFile)) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,"PidFile is not allowed to change. Failing.");
|
2004-11-06 06:18:11 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2005-05-03 12:04:08 +02:00
|
|
|
if (old->RunAsDaemon != new_val->RunAsDaemon) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,
|
|
|
|
"While Tor is running, changing RunAsDaemon is not allowed."
|
|
|
|
" Failing.");
|
2004-11-06 06:18:11 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-11-09 08:20:21 +01:00
|
|
|
if (strcmp(old->DataDirectory,new_val->DataDirectory)!=0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,"While Tor is running, changing DataDirectory "
|
|
|
|
"(\"%s\"->\"%s\") is not allowed. Failing.",
|
|
|
|
old->DataDirectory, new_val->DataDirectory);
|
2004-11-09 05:46:24 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-11-10 04:40:30 +01:00
|
|
|
if (!opt_streq(old->User, new_val->User)) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,"While Tor is running, changing User is not allowed. "
|
|
|
|
"Failing.");
|
2004-11-10 04:40:30 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!opt_streq(old->Group, new_val->Group)) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,"While Tor is running, changing Group is not allowed. "
|
|
|
|
"Failing.");
|
2004-11-10 04:40:30 +01:00
|
|
|
return -1;
|
|
|
|
}
|
2004-11-10 01:11:37 +01:00
|
|
|
|
2005-06-20 20:56:35 +02:00
|
|
|
if (old->HardwareAccel != new_val->HardwareAccel) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,"While Tor is running, changing HardwareAccel is not "
|
|
|
|
"allowed. Failing.");
|
2005-06-20 20:56:35 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-11-06 06:18:11 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-08-22 08:45:18 +02:00
|
|
|
/** Return 1 if any change from <b>old_options</b> to <b>new_options</b>
|
|
|
|
* will require us to rotate the cpu and dns workers; else return 0. */
|
2005-08-22 02:18:45 +02:00
|
|
|
static int
|
|
|
|
options_transition_affects_workers(or_options_t *old_options,
|
|
|
|
or_options_t *new_options)
|
2005-08-16 01:46:18 +02:00
|
|
|
{
|
2005-08-22 02:18:45 +02:00
|
|
|
if (!opt_streq(old_options->DataDirectory, new_options->DataDirectory) ||
|
|
|
|
old_options->NumCpus != new_options->NumCpus ||
|
|
|
|
old_options->ORPort != new_options->ORPort ||
|
|
|
|
old_options->SafeLogging != new_options->SafeLogging ||
|
|
|
|
!config_lines_eq(old_options->Logs, new_options->Logs))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
/* Check whether log options match. */
|
|
|
|
|
|
|
|
/* Nothing that changed matters. */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-08-22 08:45:18 +02:00
|
|
|
/** Return 1 if any change from <b>old_options</b> to <b>new_options</b>
|
|
|
|
* will require us to generate a new descriptor; else return 0. */
|
2005-08-22 02:18:45 +02:00
|
|
|
static int
|
|
|
|
options_transition_affects_descriptor(or_options_t *old_options,
|
|
|
|
or_options_t *new_options)
|
|
|
|
{
|
|
|
|
if (!opt_streq(old_options->DataDirectory, new_options->DataDirectory) ||
|
|
|
|
!opt_streq(old_options->Nickname,new_options->Nickname) ||
|
|
|
|
!opt_streq(old_options->Address,new_options->Address) ||
|
|
|
|
!config_lines_eq(old_options->ExitPolicy,new_options->ExitPolicy) ||
|
|
|
|
old_options->ORPort != new_options->ORPort ||
|
|
|
|
old_options->DirPort != new_options->DirPort ||
|
|
|
|
old_options->ClientOnly != new_options->ClientOnly ||
|
|
|
|
old_options->NoPublish != new_options->NoPublish ||
|
|
|
|
old_options->BandwidthRate != new_options->BandwidthRate ||
|
|
|
|
old_options->BandwidthBurst != new_options->BandwidthBurst ||
|
|
|
|
!opt_streq(old_options->ContactInfo, new_options->ContactInfo) ||
|
|
|
|
!opt_streq(old_options->MyFamily, new_options->MyFamily) ||
|
|
|
|
!opt_streq(old_options->AccountingStart, new_options->AccountingStart) ||
|
|
|
|
old_options->AccountingMax != new_options->AccountingMax)
|
|
|
|
return 1;
|
|
|
|
|
2005-08-16 01:46:18 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-11-06 06:18:11 +01:00
|
|
|
#ifdef MS_WINDOWS
|
2004-11-09 00:12:40 +01:00
|
|
|
/** Return the directory on windows where we expect to find our application
|
|
|
|
* data. */
|
2005-06-11 20:52:12 +02:00
|
|
|
static char *
|
|
|
|
get_windows_conf_root(void)
|
2004-11-06 06:18:11 +01:00
|
|
|
{
|
|
|
|
static int is_set = 0;
|
|
|
|
static char path[MAX_PATH+1];
|
|
|
|
|
|
|
|
LPITEMIDLIST idl;
|
|
|
|
IMalloc *m;
|
|
|
|
HRESULT result;
|
|
|
|
|
|
|
|
if (is_set)
|
|
|
|
return path;
|
|
|
|
|
2004-12-01 04:48:14 +01:00
|
|
|
/* Find X:\documents and settings\username\application data\ .
|
2004-11-06 06:18:11 +01:00
|
|
|
* We would use SHGetSpecialFolder path, but that wasn't added until IE4.
|
|
|
|
*/
|
|
|
|
if (!SUCCEEDED(SHGetSpecialFolderLocation(NULL, CSIDL_APPDATA,
|
|
|
|
&idl))) {
|
|
|
|
GetCurrentDirectory(MAX_PATH, path);
|
|
|
|
is_set = 1;
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,
|
|
|
|
"I couldn't find your application data folder: are you "
|
|
|
|
"running an ancient version of Windows 95? Defaulting to \"%s\"",
|
|
|
|
path);
|
2004-11-06 06:18:11 +01:00
|
|
|
return path;
|
|
|
|
}
|
|
|
|
/* Convert the path from an "ID List" (whatever that is!) to a path. */
|
|
|
|
result = SHGetPathFromIDList(idl, path);
|
|
|
|
/* Now we need to free the */
|
|
|
|
SHGetMalloc(&m);
|
|
|
|
if (m) {
|
|
|
|
m->lpVtbl->Free(m, idl);
|
|
|
|
m->lpVtbl->Release(m);
|
|
|
|
}
|
|
|
|
if (!SUCCEEDED(result)) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
strlcat(path,"\\tor",MAX_PATH);
|
|
|
|
is_set = 1;
|
|
|
|
return path;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2004-11-09 00:12:40 +01:00
|
|
|
/** Return the default location for our torrc file. */
|
2005-08-10 20:05:20 +02:00
|
|
|
static const char *
|
2004-11-06 06:18:11 +01:00
|
|
|
get_default_conf_file(void)
|
|
|
|
{
|
|
|
|
#ifdef MS_WINDOWS
|
2005-08-10 20:05:20 +02:00
|
|
|
static char path[MAX_PATH+1];
|
2004-11-06 06:18:11 +01:00
|
|
|
strlcpy(path, get_windows_conf_root(), MAX_PATH);
|
|
|
|
strlcat(path,"\\torrc",MAX_PATH);
|
|
|
|
return path;
|
|
|
|
#else
|
2005-08-10 20:05:20 +02:00
|
|
|
return (CONFDIR "/torrc");
|
2004-11-06 06:18:11 +01:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Verify whether lst is a string containing valid-looking space-separated
|
|
|
|
* nicknames, or NULL. Return 0 on success. Warn and return -1 on failure.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static int
|
|
|
|
check_nickname_list(const char *lst, const char *name)
|
2004-11-06 06:18:11 +01:00
|
|
|
{
|
|
|
|
int r = 0;
|
|
|
|
smartlist_t *sl;
|
|
|
|
|
|
|
|
if (!lst)
|
|
|
|
return 0;
|
|
|
|
sl = smartlist_create();
|
|
|
|
smartlist_split_string(sl, lst, ",", SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
|
|
|
|
SMARTLIST_FOREACH(sl, const char *, s,
|
|
|
|
{
|
|
|
|
if (!is_legal_nickname_or_hexdigest(s)) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Invalid nickname '%s' in %s line", s, name);
|
2004-11-06 06:18:11 +01:00
|
|
|
r = -1;
|
|
|
|
}
|
|
|
|
});
|
|
|
|
SMARTLIST_FOREACH(sl, char *, s, tor_free(s));
|
|
|
|
smartlist_free(sl);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2004-11-04 11:23:30 +01:00
|
|
|
/** Read a configuration file into <b>options</b>, finding the configuration
|
|
|
|
* file location based on the command line. After loading the options,
|
2004-11-09 05:28:18 +01:00
|
|
|
* validate them for consistency, then take actions based on them.
|
|
|
|
* Return 0 if success, -1 if failure. */
|
2004-11-04 11:23:30 +01:00
|
|
|
int
|
2005-07-23 03:58:05 +02:00
|
|
|
options_init_from_torrc(int argc, char **argv)
|
2004-11-04 11:23:30 +01:00
|
|
|
{
|
2004-11-06 06:18:11 +01:00
|
|
|
or_options_t *oldoptions, *newoptions;
|
2005-07-22 23:12:10 +02:00
|
|
|
config_line_t *cl;
|
2004-11-06 06:18:11 +01:00
|
|
|
char *cf=NULL, *fname=NULL;
|
|
|
|
int i, retval;
|
2004-11-04 11:23:30 +01:00
|
|
|
int using_default_torrc;
|
|
|
|
static char **backup_argv;
|
|
|
|
static int backup_argc;
|
2004-11-06 06:18:11 +01:00
|
|
|
|
2004-11-04 11:23:30 +01:00
|
|
|
if (argv) { /* first time we're called. save commandline args */
|
|
|
|
backup_argv = argv;
|
|
|
|
backup_argc = argc;
|
2004-11-09 03:12:55 +01:00
|
|
|
oldoptions = NULL;
|
2004-11-04 11:23:30 +01:00
|
|
|
} else { /* we're reloading. need to clean up old options first. */
|
|
|
|
argv = backup_argv;
|
|
|
|
argc = backup_argc;
|
2004-11-09 03:12:55 +01:00
|
|
|
oldoptions = get_options();
|
2004-11-04 11:23:30 +01:00
|
|
|
}
|
|
|
|
if (argc > 1 && (!strcmp(argv[1], "-h") || !strcmp(argv[1],"--help"))) {
|
|
|
|
print_usage();
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (argc > 1 && (!strcmp(argv[1],"--version"))) {
|
|
|
|
printf("Tor version %s.\n",VERSION);
|
2004-11-29 23:25:31 +01:00
|
|
|
if (argc > 2 && (!strcmp(argv[2],"--version"))) {
|
|
|
|
print_cvs_version();
|
|
|
|
}
|
2004-11-04 11:23:30 +01:00
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
|
2004-11-06 06:18:11 +01:00
|
|
|
newoptions = tor_malloc_zero(sizeof(or_options_t));
|
2005-07-22 22:37:42 +02:00
|
|
|
newoptions->_magic = OR_OPTIONS_MAGIC;
|
2004-11-06 06:18:11 +01:00
|
|
|
options_init(newoptions);
|
|
|
|
|
2005-09-10 06:40:27 +02:00
|
|
|
/* learn config file name */
|
2004-11-04 11:23:30 +01:00
|
|
|
fname = NULL;
|
|
|
|
using_default_torrc = 1;
|
2004-11-06 06:18:11 +01:00
|
|
|
newoptions->command = CMD_RUN_TOR;
|
2004-11-04 11:23:30 +01:00
|
|
|
for (i = 1; i < argc; ++i) {
|
|
|
|
if (i < argc-1 && !strcmp(argv[i],"-f")) {
|
|
|
|
if (fname) {
|
2005-10-25 09:05:03 +02:00
|
|
|
log(LOG_WARN, LD_CONFIG, "Duplicate -f options on command line.");
|
2004-11-04 11:23:30 +01:00
|
|
|
tor_free(fname);
|
|
|
|
}
|
|
|
|
fname = tor_strdup(argv[i+1]);
|
|
|
|
using_default_torrc = 0;
|
|
|
|
++i;
|
|
|
|
} else if (!strcmp(argv[i],"--list-fingerprint")) {
|
2004-11-06 06:18:11 +01:00
|
|
|
newoptions->command = CMD_LIST_FINGERPRINT;
|
2004-11-04 11:23:30 +01:00
|
|
|
} else if (!strcmp(argv[i],"--hash-password")) {
|
2004-11-06 06:18:11 +01:00
|
|
|
newoptions->command = CMD_HASH_PASSWORD;
|
|
|
|
newoptions->command_arg = tor_strdup( (i < argc-1) ? argv[i+1] : "");
|
2004-11-04 11:23:30 +01:00
|
|
|
++i;
|
2005-05-07 06:49:09 +02:00
|
|
|
} else if (!strcmp(argv[i],"--verify-config")) {
|
|
|
|
newoptions->command = CMD_VERIFY_CONFIG;
|
2004-11-04 11:23:30 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (using_default_torrc) {
|
|
|
|
/* didn't find one, try CONFDIR */
|
2005-08-10 20:05:20 +02:00
|
|
|
const char *dflt = get_default_conf_file();
|
|
|
|
char *fn = NULL;
|
|
|
|
if (dflt && file_status(dflt) == FN_FILE) {
|
|
|
|
fname = tor_strdup(dflt);
|
2004-11-04 11:23:30 +01:00
|
|
|
} else {
|
2005-01-04 03:25:36 +01:00
|
|
|
#ifndef MS_WINDOWS
|
2004-11-04 11:23:30 +01:00
|
|
|
fn = expand_filename("~/.torrc");
|
|
|
|
if (fn && file_status(fn) == FN_FILE) {
|
|
|
|
fname = fn;
|
|
|
|
} else {
|
|
|
|
tor_free(fn);
|
2005-08-10 20:05:20 +02:00
|
|
|
fname = tor_strdup(dflt);
|
2004-11-04 11:23:30 +01:00
|
|
|
}
|
2005-01-04 03:25:36 +01:00
|
|
|
#else
|
2005-08-10 20:05:20 +02:00
|
|
|
fname = tor_strdup(dflt);
|
2005-01-04 03:25:36 +01:00
|
|
|
#endif
|
2004-11-04 11:23:30 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
tor_assert(fname);
|
2005-10-25 09:05:03 +02:00
|
|
|
log(LOG_DEBUG, LD_CONFIG, "Opening config file \"%s\"", fname);
|
2004-11-04 11:23:30 +01:00
|
|
|
|
2006-01-10 21:00:20 +01:00
|
|
|
tor_free(torrc_fname);
|
|
|
|
torrc_fname = fname;
|
|
|
|
|
2005-09-10 06:40:27 +02:00
|
|
|
/* get config lines, assign them */
|
2005-01-04 03:25:36 +01:00
|
|
|
if (file_status(fname) != FN_FILE ||
|
|
|
|
!(cf = read_file_to_str(fname,0))) {
|
2004-11-04 11:23:30 +01:00
|
|
|
if (using_default_torrc == 1) {
|
2005-10-25 09:05:03 +02:00
|
|
|
log(LOG_NOTICE, LD_CONFIG, "Configuration file \"%s\" not present, "
|
2004-11-04 11:23:30 +01:00
|
|
|
"using reasonable defaults.", fname);
|
2004-11-14 21:51:28 +01:00
|
|
|
tor_free(fname); /* sets fname to NULL */
|
2006-01-11 21:01:47 +01:00
|
|
|
torrc_fname = NULL;
|
2004-11-04 11:23:30 +01:00
|
|
|
} else {
|
2005-10-25 09:05:03 +02:00
|
|
|
log(LOG_WARN, LD_CONFIG,
|
|
|
|
"Unable to open configuration file \"%s\".", fname);
|
2004-11-06 06:18:11 +01:00
|
|
|
goto err;
|
2004-11-04 11:23:30 +01:00
|
|
|
}
|
|
|
|
} else { /* it opened successfully. use it. */
|
2004-11-06 06:18:11 +01:00
|
|
|
retval = config_get_lines(cf, &cl);
|
|
|
|
tor_free(cf);
|
|
|
|
if (retval < 0)
|
|
|
|
goto err;
|
2005-09-14 04:07:35 +02:00
|
|
|
retval = config_assign(&options_format, newoptions, cl, 0, 0);
|
2004-11-04 11:23:30 +01:00
|
|
|
config_free_lines(cl);
|
2004-11-06 06:18:11 +01:00
|
|
|
if (retval < 0)
|
|
|
|
goto err;
|
2004-11-04 11:23:30 +01:00
|
|
|
}
|
|
|
|
|
2004-11-09 05:28:18 +01:00
|
|
|
/* Go through command-line variables too */
|
2005-09-10 06:40:27 +02:00
|
|
|
if (config_get_commandlines(argc, argv, &cl) < 0)
|
|
|
|
goto err;
|
2005-09-14 04:07:35 +02:00
|
|
|
retval = config_assign(&options_format, newoptions, cl, 0, 0);
|
2004-11-04 11:23:30 +01:00
|
|
|
config_free_lines(cl);
|
2004-11-06 06:18:11 +01:00
|
|
|
if (retval < 0)
|
|
|
|
goto err;
|
2004-11-04 11:23:30 +01:00
|
|
|
|
2004-11-09 05:28:18 +01:00
|
|
|
/* Validate newoptions */
|
2006-01-10 21:27:47 +01:00
|
|
|
if (options_validate(oldoptions, newoptions, 0) < 0)
|
2004-11-06 06:18:11 +01:00
|
|
|
goto err;
|
2004-11-04 11:23:30 +01:00
|
|
|
|
2004-11-06 06:18:11 +01:00
|
|
|
if (options_transition_allowed(oldoptions, newoptions) < 0)
|
|
|
|
goto err;
|
2004-11-04 11:23:30 +01:00
|
|
|
|
2005-09-14 04:36:29 +02:00
|
|
|
if (set_options(newoptions))
|
|
|
|
goto err; /* frees and replaces old options */
|
2004-11-06 06:18:11 +01:00
|
|
|
return 0;
|
|
|
|
err:
|
2004-11-14 21:51:28 +01:00
|
|
|
tor_free(fname);
|
2006-01-11 21:01:47 +01:00
|
|
|
torrc_fname = NULL;
|
2005-08-04 21:56:41 +02:00
|
|
|
config_free(&options_format, newoptions);
|
2004-11-06 06:18:11 +01:00
|
|
|
return -1;
|
2002-07-03 18:31:22 +02:00
|
|
|
}
|
|
|
|
|
2005-08-10 20:05:20 +02:00
|
|
|
/** Return the location for our configuration file.
|
|
|
|
*/
|
|
|
|
const char *
|
|
|
|
get_torrc_fname(void)
|
|
|
|
{
|
|
|
|
if (torrc_fname)
|
|
|
|
return torrc_fname;
|
|
|
|
else
|
|
|
|
return get_default_conf_file();
|
|
|
|
}
|
|
|
|
|
2005-06-11 20:52:12 +02:00
|
|
|
/** Adjust the address map mased on the MapAddress elements in the
|
|
|
|
* configuration <b>options</b>
|
|
|
|
*/
|
2005-02-22 01:53:08 +01:00
|
|
|
static void
|
2005-06-11 20:52:12 +02:00
|
|
|
config_register_addressmaps(or_options_t *options)
|
|
|
|
{
|
2005-02-22 01:53:08 +01:00
|
|
|
smartlist_t *elts;
|
2005-07-22 23:12:10 +02:00
|
|
|
config_line_t *opt;
|
2005-02-22 01:53:08 +01:00
|
|
|
char *from, *to;
|
|
|
|
|
2005-03-11 22:39:39 +01:00
|
|
|
addressmap_clear_configured();
|
2005-02-22 01:53:08 +01:00
|
|
|
elts = smartlist_create();
|
|
|
|
for (opt = options->AddressMap; opt; opt = opt->next) {
|
|
|
|
smartlist_split_string(elts, opt->value, NULL,
|
|
|
|
SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 2);
|
|
|
|
if (smartlist_len(elts) >= 2) {
|
|
|
|
from = smartlist_get(elts,0);
|
|
|
|
to = smartlist_get(elts,1);
|
2005-02-25 21:46:13 +01:00
|
|
|
if (!is_plausible_address(from)) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,
|
|
|
|
"Skipping invalid argument '%s' to MapAddress", from);
|
2005-02-25 21:46:13 +01:00
|
|
|
} else if (!is_plausible_address(to)) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,
|
|
|
|
"Skipping invalid argument '%s' to MapAddress", to);
|
2005-02-25 21:46:13 +01:00
|
|
|
} else {
|
|
|
|
addressmap_register(from, tor_strdup(to), 0);
|
|
|
|
if (smartlist_len(elts)>2) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,"Ignoring extra arguments to MapAddress.");
|
2005-02-25 21:46:13 +01:00
|
|
|
}
|
|
|
|
}
|
2005-02-22 01:53:08 +01:00
|
|
|
} else {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,"MapAddress '%s' has too few arguments. Ignoring.",
|
|
|
|
opt->value);
|
2005-02-22 01:53:08 +01:00
|
|
|
}
|
|
|
|
SMARTLIST_FOREACH(elts, char*, cp, tor_free(cp));
|
|
|
|
smartlist_clear(elts);
|
|
|
|
}
|
|
|
|
smartlist_free(elts);
|
|
|
|
}
|
|
|
|
|
2004-11-09 00:12:40 +01:00
|
|
|
/** If <b>range</b> is of the form MIN-MAX, for MIN and MAX both
|
|
|
|
* recognized log severity levels, set *<b>min_out</b> to MIN and
|
2005-05-17 19:01:36 +02:00
|
|
|
* *<b>max_out</b> to MAX and return 0. Else, if <b>range</b> is of
|
2004-11-09 00:12:40 +01:00
|
|
|
* the form MIN, act as if MIN-err had been specified. Else, warn and
|
|
|
|
* return -1.
|
|
|
|
*/
|
2004-10-14 04:47:09 +02:00
|
|
|
static int
|
2004-11-05 06:50:35 +01:00
|
|
|
parse_log_severity_range(const char *range, int *min_out, int *max_out)
|
2004-05-19 22:07:08 +02:00
|
|
|
{
|
2004-11-05 06:50:35 +01:00
|
|
|
int levelMin, levelMax;
|
|
|
|
const char *cp;
|
|
|
|
cp = strchr(range, '-');
|
|
|
|
if (cp) {
|
|
|
|
if (cp == range) {
|
|
|
|
levelMin = LOG_DEBUG;
|
|
|
|
} else {
|
|
|
|
char *tmp_sev = tor_strndup(range, cp - range);
|
2004-05-19 22:07:08 +02:00
|
|
|
levelMin = parse_log_level(tmp_sev);
|
2004-10-14 04:47:09 +02:00
|
|
|
if (levelMin < 0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Unrecognized log severity '%s': must be one of "
|
|
|
|
"err|warn|notice|info|debug", tmp_sev);
|
2004-11-05 06:50:35 +01:00
|
|
|
tor_free(tmp_sev);
|
2004-05-20 21:47:28 +02:00
|
|
|
return -1;
|
2004-05-19 22:07:08 +02:00
|
|
|
}
|
|
|
|
tor_free(tmp_sev);
|
2004-11-05 06:50:35 +01:00
|
|
|
}
|
|
|
|
if (!*(cp+1)) {
|
|
|
|
levelMax = LOG_ERR;
|
|
|
|
} else {
|
2004-05-19 22:07:08 +02:00
|
|
|
levelMax = parse_log_level(cp+1);
|
2004-10-14 04:47:09 +02:00
|
|
|
if (levelMax < 0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Unrecognized log severity '%s': must be one of "
|
|
|
|
"err|warn|notice|info|debug", cp+1);
|
2004-05-20 21:47:28 +02:00
|
|
|
return -1;
|
2004-05-19 22:07:08 +02:00
|
|
|
}
|
|
|
|
}
|
2004-11-05 06:50:35 +01:00
|
|
|
} else {
|
|
|
|
levelMin = parse_log_level(range);
|
|
|
|
if (levelMin < 0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Unrecognized log severity '%s': must be one of "
|
|
|
|
"err|warn|notice|info|debug", range);
|
2004-11-05 06:50:35 +01:00
|
|
|
return -1;
|
|
|
|
}
|
2004-11-05 22:22:38 +01:00
|
|
|
levelMax = LOG_ERR;
|
2004-11-05 06:50:35 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
*min_out = levelMin;
|
|
|
|
*max_out = levelMax;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-11-09 00:12:40 +01:00
|
|
|
/** Try to convert a pair of old-style logging options [LogLevel, and
|
|
|
|
* (LogFile/Syslog)] to a new-style option, and add the new option to
|
|
|
|
* options->Logs. */
|
2004-11-05 06:50:35 +01:00
|
|
|
static int
|
2005-07-22 23:12:10 +02:00
|
|
|
convert_log_option(or_options_t *options, config_line_t *level_opt,
|
|
|
|
config_line_t *file_opt, int isDaemon)
|
2004-11-05 06:50:35 +01:00
|
|
|
{
|
|
|
|
int levelMin = -1, levelMax = -1;
|
|
|
|
|
|
|
|
if (level_opt) {
|
|
|
|
if (parse_log_severity_range(level_opt->value, &levelMin, &levelMax))
|
|
|
|
return -1;
|
2004-05-19 22:07:08 +02:00
|
|
|
}
|
|
|
|
if (levelMin < 0 && levelMax < 0) {
|
|
|
|
levelMin = LOG_NOTICE;
|
|
|
|
levelMax = LOG_ERR;
|
|
|
|
} else if (levelMin < 0) {
|
|
|
|
levelMin = levelMax;
|
|
|
|
} else {
|
|
|
|
levelMax = LOG_ERR;
|
|
|
|
}
|
2004-10-26 23:48:41 +02:00
|
|
|
|
|
|
|
if (file_opt && !strcasecmp(file_opt->key, "LogFile")) {
|
2005-12-14 21:40:40 +01:00
|
|
|
if (add_single_log_option(options, levelMin, levelMax, "file",
|
|
|
|
file_opt->value) < 0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_FS, "Cannot write to LogFile \"%s\": %s.", file_opt->value,
|
|
|
|
strerror(errno));
|
2004-05-20 21:47:28 +02:00
|
|
|
return -1;
|
2004-05-19 22:07:08 +02:00
|
|
|
}
|
2004-10-26 23:48:41 +02:00
|
|
|
} else if (file_opt && !strcasecmp(file_opt->key, "SysLog")) {
|
2004-11-05 06:50:35 +01:00
|
|
|
if (add_single_log_option(options, levelMin, levelMax, "syslog", NULL) < 0)
|
2004-10-26 23:48:41 +02:00
|
|
|
return -1;
|
2004-05-19 22:07:08 +02:00
|
|
|
} else if (!isDaemon) {
|
2004-11-05 06:50:35 +01:00
|
|
|
add_single_log_option(options, levelMin, levelMax, "stdout", NULL);
|
2004-05-19 22:07:08 +02:00
|
|
|
}
|
2004-05-20 21:47:28 +02:00
|
|
|
return 0;
|
2004-05-19 22:07:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Initialize the logs based on the configuration file.
|
|
|
|
*/
|
2004-10-14 04:47:09 +02:00
|
|
|
int
|
2005-07-23 03:58:05 +02:00
|
|
|
options_init_logs(or_options_t *options, int validate_only)
|
2004-05-19 22:07:08 +02:00
|
|
|
{
|
2005-07-22 23:12:10 +02:00
|
|
|
config_line_t *opt;
|
2004-11-05 06:50:35 +01:00
|
|
|
int ok;
|
2004-11-06 06:18:11 +01:00
|
|
|
smartlist_t *elts;
|
2006-01-11 20:40:14 +01:00
|
|
|
int daemon = options->RunAsDaemon;
|
2004-11-05 06:50:35 +01:00
|
|
|
|
|
|
|
ok = 1;
|
2004-11-06 06:18:11 +01:00
|
|
|
elts = smartlist_create();
|
2006-01-11 20:40:14 +01:00
|
|
|
|
2004-11-05 06:50:35 +01:00
|
|
|
for (opt = options->Logs; opt; opt = opt->next) {
|
|
|
|
int levelMin=LOG_DEBUG, levelMax=LOG_ERR;
|
2004-12-16 22:10:51 +01:00
|
|
|
smartlist_split_string(elts, opt->value, NULL,
|
2004-11-05 06:50:35 +01:00
|
|
|
SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 3);
|
|
|
|
if (smartlist_len(elts) == 0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Bad syntax on Log option 'Log %s'", opt->value);
|
2004-11-05 06:50:35 +01:00
|
|
|
ok = 0; goto cleanup;
|
|
|
|
}
|
2005-12-14 21:40:40 +01:00
|
|
|
if (parse_log_severity_range(smartlist_get(elts,0), &levelMin,
|
|
|
|
&levelMax)) {
|
2004-11-05 06:50:35 +01:00
|
|
|
ok = 0; goto cleanup;
|
|
|
|
}
|
2004-11-06 08:40:20 +01:00
|
|
|
if (smartlist_len(elts) < 2) { /* only loglevels were provided */
|
2006-01-11 20:40:14 +01:00
|
|
|
if (!validate_only) {
|
|
|
|
if (daemon) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,
|
|
|
|
"Can't log to stdout with RunAsDaemon set; skipping stdout");
|
2006-02-11 22:56:03 +01:00
|
|
|
} else {
|
|
|
|
add_stream_log(levelMin, levelMax, "<stdout>", stdout);
|
2006-01-11 20:40:14 +01:00
|
|
|
}
|
|
|
|
}
|
2004-11-05 06:50:35 +01:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
if (!strcasecmp(smartlist_get(elts,1), "file")) {
|
|
|
|
if (smartlist_len(elts) != 3) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Bad syntax on Log option 'Log %s'", opt->value);
|
2004-11-05 06:50:35 +01:00
|
|
|
ok = 0; goto cleanup;
|
|
|
|
}
|
2006-01-11 20:40:14 +01:00
|
|
|
if (!validate_only) {
|
2006-01-11 21:09:37 +01:00
|
|
|
if (add_file_log(levelMin, levelMax, smartlist_get(elts, 2)) < 0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Couldn't open file for 'Log %s'", opt->value);
|
2006-01-11 20:40:14 +01:00
|
|
|
ok = 0;
|
2006-01-11 21:09:37 +01:00
|
|
|
}
|
2006-01-11 20:40:14 +01:00
|
|
|
}
|
2004-11-05 06:50:35 +01:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
if (smartlist_len(elts) != 2) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Bad syntax on Log option 'Log %s'", opt->value);
|
2004-11-05 06:50:35 +01:00
|
|
|
ok = 0; goto cleanup;
|
|
|
|
}
|
|
|
|
if (!strcasecmp(smartlist_get(elts,1), "stdout")) {
|
2006-01-11 20:40:14 +01:00
|
|
|
if (daemon) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Can't log to stdout with RunAsDaemon set.");
|
2006-01-11 20:40:14 +01:00
|
|
|
ok = 0; goto cleanup;
|
|
|
|
}
|
2004-11-22 21:08:07 +01:00
|
|
|
if (!validate_only) {
|
2004-11-10 04:40:30 +01:00
|
|
|
add_stream_log(levelMin, levelMax, "<stdout>", stdout);
|
2004-11-22 21:08:07 +01:00
|
|
|
}
|
2004-11-05 06:50:35 +01:00
|
|
|
} else if (!strcasecmp(smartlist_get(elts,1), "stderr")) {
|
2006-01-11 20:40:14 +01:00
|
|
|
if (daemon) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Can't log to stdout with RunAsDaemon set.");
|
2006-01-11 20:40:14 +01:00
|
|
|
ok = 0; goto cleanup;
|
|
|
|
}
|
2004-11-22 21:08:07 +01:00
|
|
|
if (!validate_only) {
|
2004-11-10 04:40:30 +01:00
|
|
|
add_stream_log(levelMin, levelMax, "<stderr>", stderr);
|
2004-11-22 21:08:07 +01:00
|
|
|
}
|
2004-11-05 06:50:35 +01:00
|
|
|
} else if (!strcasecmp(smartlist_get(elts,1), "syslog")) {
|
|
|
|
#ifdef HAVE_SYSLOG_H
|
2004-11-10 04:40:30 +01:00
|
|
|
if (!validate_only)
|
|
|
|
add_syslog_log(levelMin, levelMax);
|
2004-11-05 06:50:35 +01:00
|
|
|
#else
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Syslog is not supported in this compilation.");
|
2004-11-05 06:50:35 +01:00
|
|
|
#endif
|
2004-11-10 04:40:30 +01:00
|
|
|
} else {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Unrecognized log type %s",
|
|
|
|
(const char*)smartlist_get(elts,1));
|
2005-10-25 09:05:03 +02:00
|
|
|
if (strchr(smartlist_get(elts,1), '/') ||
|
|
|
|
strchr(smartlist_get(elts,1), '\\')) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Did you mean to say 'Log file %s' ?",
|
|
|
|
(const char *)smartlist_get(elts,1));
|
2004-11-10 04:40:30 +01:00
|
|
|
}
|
|
|
|
ok = 0; goto cleanup;
|
2004-11-05 06:50:35 +01:00
|
|
|
}
|
|
|
|
cleanup:
|
|
|
|
SMARTLIST_FOREACH(elts, char*, cp, tor_free(cp));
|
|
|
|
smartlist_clear(elts);
|
|
|
|
}
|
|
|
|
smartlist_free(elts);
|
|
|
|
|
|
|
|
return ok?0:-1;
|
|
|
|
}
|
|
|
|
|
2005-05-17 19:01:36 +02:00
|
|
|
/** Add a single option of the form Log min-max \<type\> [fname] to options. */
|
2004-11-05 06:50:35 +01:00
|
|
|
static int
|
|
|
|
add_single_log_option(or_options_t *options, int minSeverity, int maxSeverity,
|
|
|
|
const char *type, const char *fname)
|
|
|
|
{
|
2005-10-25 09:05:03 +02:00
|
|
|
char *buf;
|
|
|
|
size_t len;
|
2004-11-05 06:50:35 +01:00
|
|
|
|
2005-10-25 09:05:03 +02:00
|
|
|
len = 256 + fname?strlen(fname):0;
|
|
|
|
buf = tor_malloc(len);
|
|
|
|
|
|
|
|
if (tor_snprintf(buf, len, "%s%s%s %s%s%s",
|
2005-12-14 21:40:40 +01:00
|
|
|
log_level_to_string(minSeverity),
|
|
|
|
maxSeverity == LOG_ERR ? "" : "-",
|
|
|
|
maxSeverity == LOG_ERR ? "" : log_level_to_string(maxSeverity),
|
|
|
|
type, fname?" ":"", fname?fname:"")<0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_BUG, "Normalized log option too long.");
|
2005-10-25 09:05:03 +02:00
|
|
|
tor_free(buf);
|
2004-11-05 06:50:35 +01:00
|
|
|
return -1;
|
2004-05-20 10:41:54 +02:00
|
|
|
}
|
2004-05-20 10:15:28 +02:00
|
|
|
|
2005-12-09 06:37:26 +01:00
|
|
|
log(LOG_WARN, LD_CONFIG, "The old LogLevel/LogFile/DebugLogFile/SysLog "
|
|
|
|
"options are deprecated, and will go away soon. Your new torrc line "
|
|
|
|
"should be: 'Log %s'", buf);
|
2005-01-05 07:05:37 +01:00
|
|
|
config_line_append(&options->Logs, "Log", buf);
|
2005-10-25 09:05:03 +02:00
|
|
|
tor_free(buf);
|
2004-11-05 06:50:35 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-11-09 00:12:40 +01:00
|
|
|
/** Convert all old-style logging options to new-style Log options. Return 0
|
2004-12-01 04:48:14 +01:00
|
|
|
* on success, -1 on failure. */
|
2004-11-05 06:50:35 +01:00
|
|
|
static int
|
|
|
|
normalize_log_options(or_options_t *options)
|
|
|
|
{
|
|
|
|
/* The order of options is: Level? (File Level?)+
|
|
|
|
*/
|
2005-07-22 23:12:10 +02:00
|
|
|
config_line_t *opt = options->OldLogOptions;
|
2004-11-05 06:50:35 +01:00
|
|
|
|
2004-05-19 22:07:08 +02:00
|
|
|
/* Special case for if first option is LogLevel. */
|
|
|
|
if (opt && !strcasecmp(opt->key, "LogLevel")) {
|
2004-10-26 23:48:41 +02:00
|
|
|
if (opt->next && (!strcasecmp(opt->next->key, "LogFile") ||
|
|
|
|
!strcasecmp(opt->next->key, "SysLog"))) {
|
2005-12-14 21:40:40 +01:00
|
|
|
if (convert_log_option(options, opt, opt->next, options->RunAsDaemon)< 0)
|
2004-05-20 21:47:28 +02:00
|
|
|
return -1;
|
2004-05-19 22:07:08 +02:00
|
|
|
opt = opt->next->next;
|
|
|
|
} else if (!opt->next) {
|
2004-11-05 06:50:35 +01:00
|
|
|
if (convert_log_option(options, opt, NULL, options->RunAsDaemon) < 0)
|
2004-05-20 21:47:28 +02:00
|
|
|
return -1;
|
2004-05-19 22:07:08 +02:00
|
|
|
opt = opt->next;
|
2004-05-20 21:47:28 +02:00
|
|
|
} else {
|
|
|
|
; /* give warning below */
|
2004-05-19 22:07:08 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
while (opt) {
|
|
|
|
if (!strcasecmp(opt->key, "LogLevel")) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Two LogLevel options in a row without "
|
|
|
|
"intervening LogFile or SysLog");
|
2004-05-19 22:07:08 +02:00
|
|
|
opt = opt->next;
|
|
|
|
} else {
|
2004-10-26 23:48:41 +02:00
|
|
|
tor_assert(!strcasecmp(opt->key, "LogFile") ||
|
|
|
|
!strcasecmp(opt->key, "SysLog"));
|
2004-05-19 22:07:08 +02:00
|
|
|
if (opt->next && !strcasecmp(opt->next->key, "LogLevel")) {
|
2004-10-26 23:48:41 +02:00
|
|
|
/* LogFile/SysLog followed by LogLevel */
|
2005-12-14 21:40:40 +01:00
|
|
|
if (convert_log_option(options,opt->next,opt, options->RunAsDaemon) <0)
|
2004-05-20 21:47:28 +02:00
|
|
|
return -1;
|
2004-05-19 22:07:08 +02:00
|
|
|
opt = opt->next->next;
|
|
|
|
} else {
|
2004-10-26 23:48:41 +02:00
|
|
|
/* LogFile/SysLog followed by LogFile/SysLog or end of list. */
|
2004-11-05 06:50:35 +01:00
|
|
|
if (convert_log_option(options,NULL, opt, options->RunAsDaemon) < 0)
|
2004-05-20 21:47:28 +02:00
|
|
|
return -1;
|
2004-05-19 22:07:08 +02:00
|
|
|
opt = opt->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (options->DebugLogFile) {
|
2005-12-09 06:37:26 +01:00
|
|
|
if (add_single_log_option(options, LOG_DEBUG, LOG_ERR, "file",
|
|
|
|
options->DebugLogFile) < 0)
|
2004-05-20 21:47:28 +02:00
|
|
|
return -1;
|
2004-05-19 22:07:08 +02:00
|
|
|
}
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2004-11-05 06:50:35 +01:00
|
|
|
tor_free(options->DebugLogFile);
|
|
|
|
config_free_lines(options->OldLogOptions);
|
|
|
|
options->OldLogOptions = NULL;
|
|
|
|
|
2004-05-20 21:47:28 +02:00
|
|
|
return 0;
|
2004-05-19 22:07:08 +02:00
|
|
|
}
|
|
|
|
|
2006-02-01 04:53:52 +01:00
|
|
|
/** Add the exit policy described by <b>more</b> to <b>policy</b>.
|
2005-06-11 20:52:12 +02:00
|
|
|
*/
|
2006-02-01 04:53:52 +01:00
|
|
|
static void
|
2006-02-06 05:55:27 +01:00
|
|
|
options_append_exit_policy_string(addr_policy_t **policy, const char *more)
|
2005-05-14 02:13:17 +02:00
|
|
|
{
|
2005-07-22 23:12:10 +02:00
|
|
|
config_line_t tmp;
|
2005-05-14 02:13:17 +02:00
|
|
|
|
|
|
|
tmp.key = NULL;
|
2006-02-06 05:55:27 +01:00
|
|
|
tmp.value = (char*) more;
|
2005-05-14 02:13:17 +02:00
|
|
|
tmp.next = NULL;
|
2005-08-08 23:58:48 +02:00
|
|
|
config_parse_addr_policy(&tmp, policy, -1);
|
2005-05-14 02:13:17 +02:00
|
|
|
}
|
|
|
|
|
2005-12-08 20:40:24 +01:00
|
|
|
static int
|
2005-12-09 00:58:23 +01:00
|
|
|
config_expand_exit_policy_aliases(smartlist_t *entries, int assume_action)
|
2005-12-08 20:40:24 +01:00
|
|
|
{
|
|
|
|
static const char *prefixes[] = {
|
2005-12-08 20:58:14 +01:00
|
|
|
"0.0.0.0/8", "169.254.0.0/16",
|
2005-12-08 20:40:24 +01:00
|
|
|
"127.0.0.0/8", "192.168.0.0/16", "10.0.0.0/8", "172.16.0.0/12",NULL };
|
|
|
|
int i;
|
|
|
|
char *pre=NULL, *post=NULL;
|
|
|
|
int expanded_any = 0;
|
|
|
|
pre = smartlist_join_strings(entries,",",0,NULL);
|
|
|
|
for (i = 0; i < smartlist_len(entries); ++i) {
|
|
|
|
char *v = smartlist_get(entries, i);
|
|
|
|
const char *cp, *ports;
|
2005-12-09 00:58:23 +01:00
|
|
|
const char *action;
|
2005-12-08 20:40:24 +01:00
|
|
|
int prefix_idx;
|
2005-12-09 00:58:23 +01:00
|
|
|
if (!strcasecmpstart(v, "accept")) {
|
|
|
|
action = "accept ";
|
|
|
|
cp = v+strlen("accept");
|
|
|
|
} else if (!strcasecmpstart(v, "reject")) {
|
|
|
|
action = "reject ";
|
|
|
|
cp = v+strlen("reject");
|
|
|
|
} else if (assume_action >= 0) {
|
|
|
|
action = "";
|
|
|
|
cp = v;
|
|
|
|
} else {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,"Policy '%s' didn't start with accept or reject.", v);
|
2005-12-08 20:40:24 +01:00
|
|
|
tor_free(pre);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
cp = eat_whitespace(cp);
|
|
|
|
if (strcmpstart(cp, "private"))
|
|
|
|
continue; /* No need to expand. */
|
|
|
|
cp += strlen("private");
|
|
|
|
cp = eat_whitespace(cp);
|
|
|
|
if (*cp && *cp != ':')
|
|
|
|
continue; /* It wasn't "private" after all. */
|
|
|
|
ports = cp;
|
|
|
|
/* Okay. We're going to replace entries[i] with a bunch of new entries,
|
|
|
|
* in order. */
|
|
|
|
smartlist_del_keeporder(entries, i);
|
|
|
|
for (prefix_idx = 0; prefixes[prefix_idx]; ++prefix_idx) {
|
|
|
|
size_t replacement_len = 16+strlen(prefixes[prefix_idx])+strlen(ports);
|
|
|
|
char *replacement = tor_malloc(replacement_len);
|
2005-12-09 00:58:23 +01:00
|
|
|
tor_snprintf(replacement, replacement_len, "%s%s%s",
|
|
|
|
action, prefixes[prefix_idx], ports);
|
2005-12-08 20:40:24 +01:00
|
|
|
smartlist_insert(entries, i++, replacement);
|
|
|
|
}
|
|
|
|
tor_free(v);
|
|
|
|
expanded_any = 1;
|
|
|
|
--i;
|
|
|
|
}
|
|
|
|
post = smartlist_join_strings(entries,",",0,NULL);
|
|
|
|
if (expanded_any)
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_CONFIG, "Expanded '%s' to '%s'", pre, post);
|
2005-12-08 20:40:24 +01:00
|
|
|
tor_free(pre);
|
|
|
|
tor_free(post);
|
|
|
|
return expanded_any;
|
|
|
|
}
|
|
|
|
|
2006-02-01 04:53:52 +01:00
|
|
|
/** Detect and excise "dead code" from the policy *<b>dest</b>. */
|
|
|
|
static void
|
|
|
|
config_exit_policy_remove_redundancies(addr_policy_t **dest)
|
|
|
|
{
|
2006-02-13 02:54:31 +01:00
|
|
|
addr_policy_t *ap, *tmp, *victim, *previous;
|
2006-02-01 04:53:52 +01:00
|
|
|
|
2006-02-12 01:03:06 +01:00
|
|
|
/* Step one: find a *:* entry and cut off everything after it. */
|
2006-02-01 04:53:52 +01:00
|
|
|
for (ap=*dest; ap; ap=ap->next) {
|
|
|
|
if (ap->msk == 0 && ap->prt_min <= 1 && ap->prt_max >= 65535) {
|
|
|
|
/* This is a catch-all line -- later lines are unreachable. */
|
|
|
|
if (ap->next) {
|
|
|
|
addr_policy_free(ap->next);
|
|
|
|
ap->next = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2006-02-12 01:03:06 +01:00
|
|
|
|
2006-02-12 23:59:38 +01:00
|
|
|
/* Step two: for every entry, see if there's a redundant entry
|
2006-02-12 01:03:06 +01:00
|
|
|
* later on, and remove it. */
|
|
|
|
for (ap=*dest; ap; ap=ap->next) {
|
|
|
|
tmp=ap;
|
|
|
|
while (tmp) {
|
2006-02-12 23:59:38 +01:00
|
|
|
if (tmp->next && config_addr_policy_covers(ap, tmp->next)) {
|
2006-02-13 02:54:31 +01:00
|
|
|
log(LOG_INFO, LD_CONFIG, "Removing exit policy %s. It is made "
|
|
|
|
"redundant by %s.", tmp->next->string, ap->string);
|
2006-02-12 01:03:06 +01:00
|
|
|
victim = tmp->next;
|
|
|
|
tmp->next = victim->next;
|
|
|
|
victim->next = NULL;
|
|
|
|
addr_policy_free(victim);
|
|
|
|
} else {
|
|
|
|
tmp=tmp->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2006-02-13 02:54:31 +01:00
|
|
|
|
|
|
|
/* Step three: for every entry A, see if there's an entry B making this one
|
|
|
|
* redundant later on. This is the case if A and B are of the same type
|
|
|
|
* (accept/reject), A is a subset of B, and there is no other entry of
|
|
|
|
* different type in between those two that intersects with A.
|
|
|
|
*
|
|
|
|
* Anybody want to doublecheck the logic here? XXX
|
|
|
|
*/
|
|
|
|
ap = *dest;
|
|
|
|
previous = NULL;
|
|
|
|
while (ap) {
|
|
|
|
for (tmp=ap->next; tmp; tmp=tmp->next) {
|
|
|
|
if (ap->policy_type != tmp->policy_type &&
|
|
|
|
config_addr_policy_intersects(ap, tmp)) {
|
|
|
|
tmp = NULL; /* so that we advance previous and ap */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (ap->policy_type == tmp->policy_type &&
|
|
|
|
config_addr_policy_covers(tmp, ap)) {
|
|
|
|
log(LOG_INFO, LD_CONFIG, "Removing exit policy %s. It is made "
|
|
|
|
"redundant by %s.", ap->string, tmp->string);
|
|
|
|
victim = ap;
|
|
|
|
ap = ap->next;
|
|
|
|
|
|
|
|
if (previous) {
|
|
|
|
assert(previous->next == victim);
|
|
|
|
previous->next = victim->next;
|
|
|
|
} else {
|
|
|
|
assert(*dest == victim);
|
|
|
|
*dest = victim->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
victim->next = NULL;
|
|
|
|
addr_policy_free(victim);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!tmp) {
|
|
|
|
previous = ap;
|
|
|
|
ap = ap->next;
|
|
|
|
}
|
|
|
|
}
|
2006-02-01 04:53:52 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#define DEFAULT_EXIT_POLICY \
|
|
|
|
"reject *:25,reject *:119,reject *:135-139,reject *:445," \
|
|
|
|
"reject *:465,reject *:587,reject *:1214,reject *:4661-4666," \
|
|
|
|
"reject *:6346-6429,reject *:6699,reject *:6881-6999,accept *:*"
|
|
|
|
|
|
|
|
/** Parse the exit policy <b>cfg</b> into the linked list *<b>dest</b>. If
|
|
|
|
* cfg doesn't end in an absolute accept or reject, add the default exit
|
|
|
|
* policy afterwards. If <b>rejectprivate</b> is true, prepend
|
|
|
|
* "reject private:*" to the policy. Return -1 if we can't parse cfg,
|
|
|
|
* else return 0.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
config_parse_exit_policy(config_line_t *cfg, addr_policy_t **dest,
|
|
|
|
int rejectprivate)
|
|
|
|
{
|
|
|
|
if (rejectprivate)
|
|
|
|
options_append_exit_policy_string(dest, "reject private:*");
|
|
|
|
if (config_parse_addr_policy(cfg, dest, -1))
|
|
|
|
return -1;
|
|
|
|
options_append_exit_policy_string(dest, DEFAULT_EXIT_POLICY);
|
|
|
|
|
|
|
|
config_exit_policy_remove_redundancies(dest);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-08-18 23:56:45 +02:00
|
|
|
/**
|
|
|
|
* Given a linked list of config lines containing "allow" and "deny" tokens,
|
2004-11-12 20:39:13 +01:00
|
|
|
* parse them and append the result to <b>dest</b>. Return -1 if any tokens
|
|
|
|
* are malformed, else return 0.
|
2004-08-18 23:56:45 +02:00
|
|
|
*/
|
2004-11-12 20:39:13 +01:00
|
|
|
int
|
2005-07-22 23:12:10 +02:00
|
|
|
config_parse_addr_policy(config_line_t *cfg,
|
2005-08-08 23:58:48 +02:00
|
|
|
addr_policy_t **dest,
|
|
|
|
int assume_action)
|
2004-05-20 04:42:50 +02:00
|
|
|
{
|
2004-12-04 02:14:36 +01:00
|
|
|
addr_policy_t **nextp;
|
2004-09-02 20:39:59 +02:00
|
|
|
smartlist_t *entries;
|
2004-11-12 20:39:13 +01:00
|
|
|
int r = 0;
|
2004-05-20 04:42:50 +02:00
|
|
|
|
|
|
|
if (!cfg)
|
2004-11-12 20:39:13 +01:00
|
|
|
return 0;
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2004-05-20 04:42:50 +02:00
|
|
|
nextp = dest;
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2004-05-20 04:42:50 +02:00
|
|
|
while (*nextp)
|
|
|
|
nextp = &((*nextp)->next);
|
|
|
|
|
2004-09-02 20:39:59 +02:00
|
|
|
entries = smartlist_create();
|
2004-05-20 04:42:50 +02:00
|
|
|
for (; cfg; cfg = cfg->next) {
|
2005-12-14 21:40:40 +01:00
|
|
|
smartlist_split_string(entries, cfg->value, ",",
|
|
|
|
SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
|
2005-12-09 00:58:23 +01:00
|
|
|
if (config_expand_exit_policy_aliases(entries,assume_action)<0) {
|
2005-12-08 20:40:24 +01:00
|
|
|
r = -1;
|
|
|
|
continue;
|
|
|
|
}
|
2004-10-14 04:47:09 +02:00
|
|
|
SMARTLIST_FOREACH(entries, const char *, ent,
|
|
|
|
{
|
2006-02-13 10:02:35 +01:00
|
|
|
log_debug(LD_CONFIG,"Adding new entry '%s'",ent);
|
2005-08-08 23:58:48 +02:00
|
|
|
*nextp = router_parse_addr_policy_from_string(ent, assume_action);
|
2004-10-14 04:47:09 +02:00
|
|
|
if (*nextp) {
|
2006-02-13 00:58:22 +01:00
|
|
|
if (addr_mask_get_bits((*nextp)->msk)<0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Address policy element '%s' can't be expressed "
|
|
|
|
"as a bit prefix.", ent);
|
2006-02-13 00:58:22 +01:00
|
|
|
}
|
2004-05-20 04:42:50 +02:00
|
|
|
nextp = &((*nextp)->next);
|
|
|
|
} else {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,"Malformed policy '%s'.", ent);
|
2004-11-12 20:39:13 +01:00
|
|
|
r = -1;
|
2004-05-20 04:42:50 +02:00
|
|
|
}
|
2004-09-02 20:39:59 +02:00
|
|
|
});
|
|
|
|
SMARTLIST_FOREACH(entries, char *, ent, tor_free(ent));
|
|
|
|
smartlist_clear(entries);
|
2004-05-20 04:42:50 +02:00
|
|
|
}
|
2004-09-02 20:39:59 +02:00
|
|
|
smartlist_free(entries);
|
2004-11-12 20:39:13 +01:00
|
|
|
return r;
|
2004-05-20 04:42:50 +02:00
|
|
|
}
|
|
|
|
|
2006-02-12 01:03:06 +01:00
|
|
|
/** Compare two provided address policy items, and return -1, 0, or 1
|
|
|
|
* if the first is less than, equal to, or greater than the second. */
|
|
|
|
static int
|
|
|
|
config_cmp_single_addr_policy(addr_policy_t *a, addr_policy_t *b)
|
|
|
|
{
|
|
|
|
int r;
|
|
|
|
if ((r=((int)a->policy_type - (int)b->policy_type)))
|
|
|
|
return r;
|
|
|
|
if ((r=((int)a->addr - (int)b->addr)))
|
|
|
|
return r;
|
|
|
|
if ((r=((int)a->msk - (int)b->msk)))
|
|
|
|
return r;
|
|
|
|
if ((r=((int)a->prt_min - (int)b->prt_min)))
|
|
|
|
return r;
|
|
|
|
if ((r=((int)a->prt_max - (int)b->prt_max)))
|
|
|
|
return r;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-02-12 23:59:38 +01:00
|
|
|
/** Return true iff the address policy <b>a</b> covers every case that would be
|
|
|
|
* covered by <b>b</b>, so that a,b is redundant. */
|
|
|
|
static int
|
|
|
|
config_addr_policy_covers(addr_policy_t *a, addr_policy_t *b)
|
|
|
|
{
|
|
|
|
|
|
|
|
/* We can ignore accept/reject, since "accept *:80, reject *:80" reduces to
|
|
|
|
* "accept *:80". */
|
2006-02-13 09:22:57 +01:00
|
|
|
if (a->msk & ~b->msk) {
|
|
|
|
/* There's a wildcard bit in b->msk that's not a wildcard in a. */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if ((a->addr & a->msk) != (b->addr & a->msk)) {
|
|
|
|
/* There's a fixed bit in a that's set differently in b. */
|
|
|
|
return 0;
|
|
|
|
}
|
2006-02-12 23:59:38 +01:00
|
|
|
return (a->prt_min <= b->prt_min && a->prt_max >= b->prt_max);
|
|
|
|
}
|
|
|
|
|
2006-02-13 02:54:31 +01:00
|
|
|
/** Return true iff the address policies <b>a</b> and <b>b</b> intersect, that
|
|
|
|
* is, there exists an address/port that is covered by <b>a</b> that is also
|
|
|
|
* covered by <b>b</b>.
|
2006-02-13 08:16:32 +01:00
|
|
|
*/
|
2006-02-13 02:54:31 +01:00
|
|
|
static int
|
|
|
|
config_addr_policy_intersects(addr_policy_t *a, addr_policy_t *b)
|
|
|
|
{
|
|
|
|
/* All the bits we care about are those that are set in both
|
|
|
|
* netmasks. If they are equal in a and b's networkaddresses
|
|
|
|
* then the networks intersect. If there is a difference,
|
2006-02-13 08:16:32 +01:00
|
|
|
* then they do not. */
|
|
|
|
if (((a->addr ^ b->addr) & a->msk & b->msk) != 0)
|
2006-02-13 02:54:31 +01:00
|
|
|
return 0;
|
2006-02-13 08:16:32 +01:00
|
|
|
if (a->prt_max < b->prt_min || b->prt_max < a->prt_min)
|
2006-02-13 02:54:31 +01:00
|
|
|
return 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2006-02-12 01:03:06 +01:00
|
|
|
/** Like config_cmp_single_addr_policy() above, but looks at the
|
|
|
|
* whole set of policies in each case. */
|
2005-10-12 15:49:13 +02:00
|
|
|
int
|
|
|
|
config_cmp_addr_policies(addr_policy_t *a, addr_policy_t *b)
|
|
|
|
{
|
|
|
|
int r;
|
|
|
|
while (a && b) {
|
2006-02-12 01:03:06 +01:00
|
|
|
if ((r=config_cmp_single_addr_policy(a,b)))
|
2005-10-12 15:49:13 +02:00
|
|
|
return r;
|
|
|
|
a = a->next;
|
|
|
|
b = b->next;
|
|
|
|
}
|
|
|
|
if (!a && !b)
|
|
|
|
return 0;
|
|
|
|
if (a)
|
|
|
|
return -1;
|
2005-10-12 20:43:03 +02:00
|
|
|
else
|
2005-10-12 15:49:13 +02:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2004-11-09 00:12:40 +01:00
|
|
|
/** Release all storage held by <b>p</b> */
|
|
|
|
void
|
2005-06-11 20:52:12 +02:00
|
|
|
addr_policy_free(addr_policy_t *p)
|
|
|
|
{
|
2004-12-04 02:14:36 +01:00
|
|
|
addr_policy_t *e;
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2004-05-20 04:42:50 +02:00
|
|
|
while (p) {
|
|
|
|
e = p;
|
|
|
|
p = p->next;
|
|
|
|
tor_free(e->string);
|
|
|
|
tor_free(e);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-11-09 19:22:17 +01:00
|
|
|
/** Parse a single RedirectExit line's contents from <b>line</b>. If
|
|
|
|
* they are valid, and <b>result</b> is not NULL, add an element to
|
|
|
|
* <b>result</b> and return 0. Else if they are valid, return 0.
|
2004-11-09 00:12:40 +01:00
|
|
|
* Else return -1. */
|
|
|
|
static int
|
2005-07-22 23:12:10 +02:00
|
|
|
parse_redirect_line(smartlist_t *result, config_line_t *line)
|
2004-10-17 00:37:08 +02:00
|
|
|
{
|
|
|
|
smartlist_t *elements = NULL;
|
|
|
|
exit_redirect_t *r;
|
|
|
|
|
|
|
|
tor_assert(line);
|
|
|
|
|
|
|
|
r = tor_malloc_zero(sizeof(exit_redirect_t));
|
2004-10-17 06:44:02 +02:00
|
|
|
elements = smartlist_create();
|
2004-12-16 22:10:51 +01:00
|
|
|
smartlist_split_string(elements, line->value, NULL,
|
2004-10-17 00:37:08 +02:00
|
|
|
SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
|
|
|
|
if (smartlist_len(elements) != 2) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Wrong number of elements in RedirectExit line");
|
2004-10-17 00:37:08 +02:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (parse_addr_and_port_range(smartlist_get(elements,0),&r->addr,&r->mask,
|
|
|
|
&r->port_min,&r->port_max)) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Error parsing source address in RedirectExit line");
|
2004-10-17 00:37:08 +02:00
|
|
|
goto err;
|
|
|
|
}
|
2004-10-19 19:46:06 +02:00
|
|
|
if (0==strcasecmp(smartlist_get(elements,1), "pass")) {
|
|
|
|
r->is_redirect = 0;
|
|
|
|
} else {
|
|
|
|
if (parse_addr_port(smartlist_get(elements,1),NULL,&r->addr_dest,
|
|
|
|
&r->port_dest)) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Error parsing dest address in RedirectExit line");
|
2004-10-19 19:46:06 +02:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
r->is_redirect = 1;
|
2004-10-17 00:37:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
goto done;
|
|
|
|
err:
|
|
|
|
tor_free(r);
|
|
|
|
done:
|
|
|
|
SMARTLIST_FOREACH(elements, char *, cp, tor_free(cp));
|
|
|
|
smartlist_free(elements);
|
|
|
|
if (r) {
|
2004-11-09 19:22:17 +01:00
|
|
|
if (result)
|
|
|
|
smartlist_add(result, r);
|
|
|
|
else
|
|
|
|
tor_free(r);
|
2004-10-17 00:37:08 +02:00
|
|
|
return 0;
|
|
|
|
} else {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-11-09 00:12:40 +01:00
|
|
|
/** Read the contents of a DirServer line from <b>line</b>. Return 0
|
2005-05-17 03:55:53 +02:00
|
|
|
* if the line is well-formed, and -1 if it isn't. If
|
2004-11-09 00:12:40 +01:00
|
|
|
* <b>validate_only</b> is 0, and the line is well-formed, then add
|
2004-12-01 04:48:14 +01:00
|
|
|
* the dirserver described in the line as a valid server. */
|
2004-11-09 00:12:40 +01:00
|
|
|
static int
|
|
|
|
parse_dir_server_line(const char *line, int validate_only)
|
2004-10-12 17:55:20 +02:00
|
|
|
{
|
|
|
|
smartlist_t *items = NULL;
|
2005-10-04 23:21:09 +02:00
|
|
|
int r, idx;
|
2005-10-25 20:06:29 +02:00
|
|
|
char *addrport=NULL, *address=NULL, *nickname=NULL, *fingerprint=NULL;
|
2004-10-12 17:55:20 +02:00
|
|
|
uint16_t port;
|
|
|
|
char digest[DIGEST_LEN];
|
2005-09-07 18:42:53 +02:00
|
|
|
int supports_v1 = 1; /*XXXX011 change default when clients support v2. */
|
|
|
|
|
2005-10-04 23:21:09 +02:00
|
|
|
items = smartlist_create();
|
|
|
|
smartlist_split_string(items, line, NULL,
|
|
|
|
SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1);
|
|
|
|
if (smartlist_len(items) < 2) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Too few arguments to DirServer line.");
|
2005-10-25 09:05:03 +02:00
|
|
|
goto err;
|
2005-10-04 23:21:09 +02:00
|
|
|
}
|
2005-09-07 18:42:53 +02:00
|
|
|
|
2005-10-04 23:21:09 +02:00
|
|
|
idx = 0;
|
|
|
|
if (is_legal_nickname(smartlist_get(items, 0))) {
|
|
|
|
nickname = smartlist_get(items, 0);
|
|
|
|
smartlist_del_keeporder(items, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcmp(smartlist_get(items, 0), "v1")) {
|
|
|
|
char *v1 = smartlist_get(items, 0);
|
|
|
|
tor_free(v1);
|
2005-09-07 18:42:53 +02:00
|
|
|
supports_v1 = 1;
|
2005-10-04 23:21:09 +02:00
|
|
|
smartlist_del_keeporder(items, 0);
|
2005-09-07 18:42:53 +02:00
|
|
|
}
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2004-10-12 17:55:20 +02:00
|
|
|
if (smartlist_len(items) < 2) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Too few arguments to DirServer line.");
|
2004-10-14 04:47:09 +02:00
|
|
|
goto err;
|
2004-10-12 17:55:20 +02:00
|
|
|
}
|
|
|
|
addrport = smartlist_get(items, 0);
|
|
|
|
if (parse_addr_port(addrport, &address, NULL, &port)<0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Error parsing DirServer address '%s'", addrport);
|
2004-10-14 04:47:09 +02:00
|
|
|
goto err;
|
2004-10-12 17:55:20 +02:00
|
|
|
}
|
|
|
|
if (!port) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Missing port in DirServer address '%s'",addrport);
|
2004-10-14 04:47:09 +02:00
|
|
|
goto err;
|
2004-10-12 17:55:20 +02:00
|
|
|
}
|
2005-10-04 23:21:09 +02:00
|
|
|
smartlist_del_keeporder(items, 0);
|
2004-10-12 17:55:20 +02:00
|
|
|
|
2005-10-04 23:21:09 +02:00
|
|
|
fingerprint = smartlist_join_strings(items, "", 0, NULL);
|
|
|
|
if (strlen(fingerprint) != HEX_DIGEST_LEN) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Key digest for DirServer is wrong length.");
|
2004-10-14 04:47:09 +02:00
|
|
|
goto err;
|
2004-10-12 17:55:20 +02:00
|
|
|
}
|
2005-10-04 23:21:09 +02:00
|
|
|
if (base16_decode(digest, DIGEST_LEN, fingerprint, HEX_DIGEST_LEN)<0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Unable to decode DirServer key digest.");
|
2004-10-14 04:47:09 +02:00
|
|
|
goto err;
|
2004-10-12 17:55:20 +02:00
|
|
|
}
|
|
|
|
|
2004-11-09 00:12:40 +01:00
|
|
|
if (!validate_only) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_debug(LD_DIR, "Trusted dirserver at %s:%d (%s)", address, (int)port,
|
|
|
|
(char*)smartlist_get(items,1));
|
2005-10-04 23:21:09 +02:00
|
|
|
add_trusted_dir_server(nickname, address, port, digest, supports_v1);
|
2004-11-09 00:12:40 +01:00
|
|
|
}
|
2004-10-12 17:55:20 +02:00
|
|
|
|
|
|
|
r = 0;
|
|
|
|
goto done;
|
2004-10-14 04:47:09 +02:00
|
|
|
|
|
|
|
err:
|
2004-10-12 17:55:20 +02:00
|
|
|
r = -1;
|
2004-10-14 04:47:09 +02:00
|
|
|
|
|
|
|
done:
|
2004-10-12 17:55:20 +02:00
|
|
|
SMARTLIST_FOREACH(items, char*, s, tor_free(s));
|
|
|
|
smartlist_free(items);
|
2005-10-25 20:06:29 +02:00
|
|
|
tor_free(addrport);
|
2004-11-06 06:18:11 +01:00
|
|
|
tor_free(address);
|
2005-10-04 23:21:09 +02:00
|
|
|
tor_free(nickname);
|
|
|
|
tor_free(fingerprint);
|
2004-10-12 17:55:20 +02:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2004-11-10 01:11:37 +01:00
|
|
|
/** Adjust the value of options->DataDirectory, or fill it in if it's
|
2004-11-09 19:22:17 +01:00
|
|
|
* absent. Return 0 on success, -1 on failure. */
|
2004-11-09 06:26:49 +01:00
|
|
|
static int
|
2005-06-11 20:52:12 +02:00
|
|
|
normalize_data_directory(or_options_t *options)
|
|
|
|
{
|
2004-08-18 05:42:55 +02:00
|
|
|
#ifdef MS_WINDOWS
|
2004-11-09 08:05:53 +01:00
|
|
|
char *p;
|
|
|
|
if (options->DataDirectory)
|
|
|
|
return 0; /* all set */
|
|
|
|
p = tor_malloc(MAX_PATH);
|
|
|
|
strlcpy(p,get_windows_conf_root(),MAX_PATH);
|
|
|
|
options->DataDirectory = p;
|
|
|
|
return 0;
|
2004-08-18 05:42:55 +02:00
|
|
|
#else
|
2004-11-09 08:05:53 +01:00
|
|
|
const char *d = options->DataDirectory;
|
2004-11-28 10:05:49 +01:00
|
|
|
if (!d)
|
2004-06-21 06:37:27 +02:00
|
|
|
d = "~/.tor";
|
2004-10-14 04:47:09 +02:00
|
|
|
|
2004-11-09 08:05:53 +01:00
|
|
|
if (strncmp(d,"~/",2) == 0) {
|
2004-11-09 06:26:49 +01:00
|
|
|
char *fn = expand_filename(d);
|
|
|
|
if (!fn) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_err(LD_CONFIG,"Failed to expand filename \"%s\".", d);
|
2004-11-09 08:05:53 +01:00
|
|
|
return -1;
|
2004-11-09 06:26:49 +01:00
|
|
|
}
|
2004-11-09 19:22:17 +01:00
|
|
|
if (!options->DataDirectory && !strcmp(fn,"/.tor")) {
|
|
|
|
/* If our homedir is /, we probably don't want to use it. */
|
|
|
|
/* XXXX Default to /var/lib/tor? */
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,
|
|
|
|
"Default DataDirectory is \"~/.tor\". This expands to "
|
|
|
|
"\"%s\", which is probably not what you want. Using \"%s/tor\" "
|
|
|
|
"instead", fn, LOCALSTATEDIR);
|
2005-05-03 02:36:57 +02:00
|
|
|
tor_free(fn);
|
|
|
|
fn = tor_strdup(LOCALSTATEDIR"/tor");
|
|
|
|
|
2004-11-09 19:22:17 +01:00
|
|
|
}
|
2004-11-09 06:26:49 +01:00
|
|
|
tor_free(options->DataDirectory);
|
|
|
|
options->DataDirectory = fn;
|
|
|
|
}
|
|
|
|
return 0;
|
2004-11-09 08:05:53 +01:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2004-11-09 19:22:17 +01:00
|
|
|
/** Check and normalize the value of options->DataDirectory; return 0 if it
|
|
|
|
* sane, -1 otherwise. */
|
2004-11-09 08:05:53 +01:00
|
|
|
static int
|
2005-06-11 20:52:12 +02:00
|
|
|
validate_data_directory(or_options_t *options)
|
|
|
|
{
|
2004-11-09 08:20:21 +01:00
|
|
|
if (normalize_data_directory(options) < 0)
|
2004-11-09 08:05:53 +01:00
|
|
|
return -1;
|
|
|
|
tor_assert(options->DataDirectory);
|
|
|
|
if (strlen(options->DataDirectory) > (512-128)) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_err(LD_CONFIG, "DataDirectory is too long.");
|
2004-11-09 08:05:53 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
2004-06-21 06:37:27 +02:00
|
|
|
}
|
|
|
|
|
2005-12-27 03:48:02 +01:00
|
|
|
/** This string must remain the same forevermore. It is how we
|
|
|
|
* recognize that the torrc file doesn't need to be backed up. */
|
2005-12-14 21:40:40 +01:00
|
|
|
#define GENERATED_FILE_PREFIX "# This file was generated by Tor; " \
|
|
|
|
"if you edit it, comments will not be preserved"
|
2005-12-27 03:48:02 +01:00
|
|
|
/** This string can change; it tries to give the reader an idea
|
|
|
|
* that editing this file by hand is not a good plan. */
|
2005-12-27 03:46:53 +01:00
|
|
|
#define GENERATED_FILE_COMMENT "# If you want a config file with " \
|
|
|
|
"comments, look for torrc.orig.1 or similar"
|
2004-11-14 21:51:28 +01:00
|
|
|
|
|
|
|
/** Save a configuration file for the configuration in <b>options</b>
|
|
|
|
* into the file <b>fname</b>. If the file already exists, and
|
|
|
|
* doesn't begin with GENERATED_FILE_PREFIX, rename it. Otherwise
|
|
|
|
* replace it. Return 0 on success, -1 on failure. */
|
|
|
|
static int
|
|
|
|
write_configuration_file(const char *fname, or_options_t *options)
|
|
|
|
{
|
2004-11-15 04:53:03 +01:00
|
|
|
char *old_val=NULL, *new_val=NULL, *new_conf=NULL;
|
2004-11-14 21:51:28 +01:00
|
|
|
int rename_old = 0, r;
|
|
|
|
size_t len;
|
|
|
|
|
2004-11-15 04:53:03 +01:00
|
|
|
if (fname) {
|
|
|
|
switch (file_status(fname)) {
|
|
|
|
case FN_FILE:
|
|
|
|
old_val = read_file_to_str(fname, 0);
|
|
|
|
if (strcmpstart(old_val, GENERATED_FILE_PREFIX)) {
|
|
|
|
rename_old = 1;
|
|
|
|
}
|
|
|
|
tor_free(old_val);
|
|
|
|
break;
|
|
|
|
case FN_NOENT:
|
|
|
|
break;
|
|
|
|
default:
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG,
|
|
|
|
"Config file \"%s\" is not a file? Failing.", fname);
|
2004-11-15 04:53:03 +01:00
|
|
|
return -1;
|
2004-11-14 21:51:28 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-07-23 03:58:05 +02:00
|
|
|
if (!(new_conf = options_dump(options, 1))) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_BUG, "Couldn't get configuration string");
|
2004-11-14 21:51:28 +01:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2005-12-27 03:46:53 +01:00
|
|
|
len = strlen(new_conf)+256;
|
2004-11-14 21:51:28 +01:00
|
|
|
new_val = tor_malloc(len);
|
2005-12-27 03:46:53 +01:00
|
|
|
tor_snprintf(new_val, len, "%s\n%s\n\n%s",
|
2005-12-27 03:48:35 +01:00
|
|
|
GENERATED_FILE_PREFIX, GENERATED_FILE_COMMENT, new_conf);
|
2004-11-14 21:51:28 +01:00
|
|
|
|
|
|
|
if (rename_old) {
|
|
|
|
int i = 1;
|
2005-02-22 07:38:39 +01:00
|
|
|
size_t fn_tmp_len = strlen(fname)+32;
|
|
|
|
char *fn_tmp;
|
|
|
|
tor_assert(fn_tmp_len > strlen(fname)); /*check for overflow*/
|
|
|
|
fn_tmp = tor_malloc(fn_tmp_len);
|
2004-11-14 21:51:28 +01:00
|
|
|
while (1) {
|
2005-02-22 07:38:39 +01:00
|
|
|
if (tor_snprintf(fn_tmp, fn_tmp_len, "%s.orig.%d", fname, i)<0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_BUG, "tor_snprintf failed inexplicably");
|
2005-02-22 07:38:39 +01:00
|
|
|
tor_free(fn_tmp);
|
2004-11-14 21:51:28 +01:00
|
|
|
goto err;
|
|
|
|
}
|
2004-11-15 04:53:03 +01:00
|
|
|
if (file_status(fn_tmp) == FN_NOENT)
|
2004-11-14 21:51:28 +01:00
|
|
|
break;
|
|
|
|
++i;
|
|
|
|
}
|
2006-02-13 10:02:35 +01:00
|
|
|
log_notice(LD_CONFIG, "Renaming old configuration file to \"%s\"", fn_tmp);
|
2004-11-14 21:51:28 +01:00
|
|
|
rename(fname, fn_tmp);
|
2005-02-22 07:38:39 +01:00
|
|
|
tor_free(fn_tmp);
|
2004-11-14 21:51:28 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
write_str_to_file(fname, new_val, 0);
|
|
|
|
|
|
|
|
r = 0;
|
|
|
|
goto done;
|
|
|
|
err:
|
|
|
|
r = -1;
|
|
|
|
done:
|
|
|
|
tor_free(new_val);
|
|
|
|
tor_free(new_conf);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Save the current configuration file value to disk. Return 0 on
|
|
|
|
* success, -1 on failure.
|
|
|
|
**/
|
|
|
|
int
|
2005-07-23 03:58:05 +02:00
|
|
|
options_save_current(void)
|
2004-11-14 21:51:28 +01:00
|
|
|
{
|
2005-08-10 20:05:20 +02:00
|
|
|
if (torrc_fname) {
|
2004-11-14 21:51:28 +01:00
|
|
|
/* XXX This fails if we can't write to our configuration file.
|
|
|
|
* Arguably, we should try falling back to datadirectory or something.
|
|
|
|
* But just as arguably, we shouldn't. */
|
2005-08-10 20:05:20 +02:00
|
|
|
return write_configuration_file(torrc_fname, get_options());
|
2004-11-14 21:51:28 +01:00
|
|
|
}
|
2005-08-10 20:05:20 +02:00
|
|
|
return write_configuration_file(get_default_conf_file(), get_options());
|
2004-11-14 21:51:28 +01:00
|
|
|
}
|
|
|
|
|
2005-10-06 06:33:40 +02:00
|
|
|
/** Mapping from a unit name to a multiplier for converting that unit into a
|
|
|
|
* base unit. */
|
2004-11-20 01:37:00 +01:00
|
|
|
struct unit_table_t {
|
|
|
|
const char *unit;
|
|
|
|
uint64_t multiplier;
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct unit_table_t memory_units[] = {
|
2004-11-23 11:52:27 +01:00
|
|
|
{ "", 1 },
|
2004-11-22 22:56:51 +01:00
|
|
|
{ "b", 1<< 0 },
|
2004-11-20 01:37:00 +01:00
|
|
|
{ "byte", 1<< 0 },
|
|
|
|
{ "bytes", 1<< 0 },
|
|
|
|
{ "kb", 1<<10 },
|
|
|
|
{ "kilobyte", 1<<10 },
|
|
|
|
{ "kilobytes", 1<<10 },
|
|
|
|
{ "m", 1<<20 },
|
|
|
|
{ "mb", 1<<20 },
|
|
|
|
{ "megabyte", 1<<20 },
|
|
|
|
{ "megabytes", 1<<20 },
|
|
|
|
{ "gb", 1<<30 },
|
|
|
|
{ "gigabyte", 1<<30 },
|
|
|
|
{ "gigabytes", 1<<30 },
|
|
|
|
{ "tb", U64_LITERAL(1)<<40 },
|
|
|
|
{ "terabyte", U64_LITERAL(1)<<40 },
|
|
|
|
{ "terabytes", U64_LITERAL(1)<<40 },
|
|
|
|
{ NULL, 0 },
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct unit_table_t time_units[] = {
|
2004-11-23 11:52:27 +01:00
|
|
|
{ "", 1 },
|
2004-11-23 08:37:25 +01:00
|
|
|
{ "second", 1 },
|
2004-11-20 01:37:00 +01:00
|
|
|
{ "seconds", 1 },
|
|
|
|
{ "minute", 60 },
|
|
|
|
{ "minutes", 60 },
|
|
|
|
{ "hour", 60*60 },
|
|
|
|
{ "hours", 60*60 },
|
|
|
|
{ "day", 24*60*60 },
|
|
|
|
{ "days", 24*60*60 },
|
|
|
|
{ "week", 7*24*60*60 },
|
|
|
|
{ "weeks", 7*24*60*60 },
|
|
|
|
{ NULL, 0 },
|
|
|
|
};
|
|
|
|
|
|
|
|
/** Parse a string <b>val</b> containing a number, zero or more
|
|
|
|
* spaces, and an optional unit string. If the unit appears in the
|
|
|
|
* table <b>u</b>, then multiply the number by the unit multiplier.
|
|
|
|
* On success, set *<b>ok</b> to 1 and return this product.
|
|
|
|
* Otherwise, set *<b>ok</b> to 0.
|
|
|
|
*/
|
|
|
|
static uint64_t
|
|
|
|
config_parse_units(const char *val, struct unit_table_t *u, int *ok)
|
|
|
|
{
|
|
|
|
uint64_t v;
|
|
|
|
char *cp;
|
|
|
|
|
|
|
|
tor_assert(ok);
|
|
|
|
|
|
|
|
v = tor_parse_uint64(val, 10, 0, UINT64_MAX, ok, &cp);
|
|
|
|
if (!*ok)
|
|
|
|
return 0;
|
|
|
|
if (!cp) {
|
|
|
|
*ok = 1;
|
|
|
|
return v;
|
|
|
|
}
|
2004-12-08 01:42:50 +01:00
|
|
|
while (TOR_ISSPACE(*cp))
|
2004-11-20 01:37:00 +01:00
|
|
|
++cp;
|
|
|
|
for ( ;u->unit;++u) {
|
|
|
|
if (!strcasecmp(u->unit, cp)) {
|
|
|
|
v *= u->multiplier;
|
|
|
|
*ok = 1;
|
|
|
|
return v;
|
|
|
|
}
|
|
|
|
}
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Unknown unit '%s'.", cp);
|
2004-11-20 01:37:00 +01:00
|
|
|
*ok = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Parse a string in the format "number unit", where unit is a unit of
|
|
|
|
* information (byte, KB, M, etc). On success, set *<b>ok</b> to true
|
|
|
|
* and return the number of bytes specified. Otherwise, set
|
|
|
|
* *<b>ok</b> to false and return 0. */
|
|
|
|
static uint64_t
|
2005-09-30 03:09:52 +02:00
|
|
|
config_parse_memunit(const char *s, int *ok)
|
|
|
|
{
|
2004-11-20 01:37:00 +01:00
|
|
|
return config_parse_units(s, memory_units, ok);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Parse a string in the format "number unit", where unit is a unit of time.
|
|
|
|
* On success, set *<b>ok</b> to true and return the number of seconds in
|
|
|
|
* the provided interval. Otherwise, set *<b>ok</b> to 0 and return -1.
|
|
|
|
*/
|
|
|
|
static int
|
2005-09-30 03:09:52 +02:00
|
|
|
config_parse_interval(const char *s, int *ok)
|
|
|
|
{
|
2004-11-20 01:37:00 +01:00
|
|
|
uint64_t r;
|
|
|
|
r = config_parse_units(s, time_units, ok);
|
|
|
|
if (!ok)
|
|
|
|
return -1;
|
|
|
|
if (r > INT_MAX) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_CONFIG, "Interval '%s' is too long", s);
|
2004-11-20 01:37:00 +01:00
|
|
|
*ok = 0;
|
|
|
|
return -1;
|
|
|
|
}
|
2004-11-22 23:24:10 +01:00
|
|
|
return (int)r;
|
2004-11-20 01:37:00 +01:00
|
|
|
}
|
|
|
|
|
2005-06-08 15:53:19 +02:00
|
|
|
/**
|
|
|
|
* Initialize the libevent library.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
init_libevent(void)
|
|
|
|
{
|
|
|
|
configure_libevent_logging();
|
|
|
|
/* If the kernel complains that some method (say, epoll) doesn't
|
|
|
|
* exist, we don't care about it, since libevent will cope.
|
|
|
|
*/
|
|
|
|
suppress_libevent_log_msg("Function not implemented");
|
|
|
|
#ifdef __APPLE__
|
2005-09-14 22:59:25 +02:00
|
|
|
setenv("EVENT_NOKQUEUE","1",1);
|
2005-06-08 15:53:19 +02:00
|
|
|
#endif
|
|
|
|
event_init();
|
|
|
|
suppress_libevent_log_msg(NULL);
|
|
|
|
#if defined(HAVE_EVENT_GET_VERSION) && defined(HAVE_EVENT_GET_METHOD)
|
|
|
|
/* Making this a NOTICE for now so we can link bugs to a libevent versions
|
|
|
|
* or methods better. */
|
2005-12-14 21:40:40 +01:00
|
|
|
log(LOG_NOTICE, LD_GENERAL,
|
|
|
|
"Initialized libevent version %s using method %s. Good.",
|
2005-06-08 15:53:19 +02:00
|
|
|
event_get_version(), event_get_method());
|
|
|
|
check_libevent_version(event_get_method(), event_get_version(),
|
|
|
|
get_options()->ORPort != 0);
|
|
|
|
#else
|
2005-12-14 21:40:40 +01:00
|
|
|
log(LOG_NOTICE, LD_GENERAL,
|
|
|
|
"Initialized old libevent (version 1.0b or earlier).");
|
2005-12-10 09:27:01 +01:00
|
|
|
log(LOG_WARN, LD_GENERAL,
|
|
|
|
"You have a very old version of libevent. It is likely to be buggy; "
|
|
|
|
"please consider building Tor with a more recent version.");
|
2005-06-08 15:53:19 +02:00
|
|
|
#endif
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-06-08 22:35:28 +02:00
|
|
|
#if defined(HAVE_EVENT_GET_VERSION) && defined(HAVE_EVENT_GET_METHOD)
|
2005-06-08 15:53:19 +02:00
|
|
|
/**
|
|
|
|
* Compare the given libevent method and version to a list of versions
|
|
|
|
* which are known not to work. Warn the user as appropriate.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
check_libevent_version(const char *m, const char *v, int server)
|
|
|
|
{
|
|
|
|
int buggy = 0, iffy = 0, slow = 0;
|
|
|
|
|
|
|
|
tor_assert(m && v);
|
|
|
|
|
|
|
|
if (!strcmp(m, "kqueue")) {
|
2005-06-13 02:35:19 +02:00
|
|
|
if (!strcmp(v, "1.0c") || !strcmp(v, "1.0d") || !strcmp(v, "1.0e") ||
|
|
|
|
!strcmp(v, "1.1")) {
|
2005-06-08 15:53:19 +02:00
|
|
|
buggy = 1;
|
|
|
|
}
|
|
|
|
} else if (!strcmp(m, "epoll")) {
|
|
|
|
if (!strcmp(v, "1.0c") || !strcmp(v, "1.0d") || !strcmp(v, "1.0e"))
|
|
|
|
iffy = 1;
|
|
|
|
} else if (!strcmp(m, "poll")) {
|
|
|
|
if (!strcmp(v, "1.0c") || !strcmp(v, "1.0d"))
|
|
|
|
buggy = 1;
|
2005-06-11 20:56:16 +02:00
|
|
|
else if (!strcmp(v, "1.0e"))
|
2005-06-08 15:53:19 +02:00
|
|
|
slow = 1;
|
|
|
|
} else if (!strcmp(m, "poll")) {
|
|
|
|
if (!strcmp(v, "1.0c") || !strcmp(v, "1.0d") || !strcmp(v, "1.0e"))
|
|
|
|
slow = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (buggy) {
|
2005-10-25 09:05:03 +02:00
|
|
|
log(LOG_WARN, LD_GENERAL,
|
2005-06-08 15:53:19 +02:00
|
|
|
"There are known bugs in using %s with libevent %s. "
|
|
|
|
"Please use the latest version of libevent.", m, v);
|
|
|
|
} else if (iffy) {
|
2005-10-25 09:05:03 +02:00
|
|
|
log(LOG_WARN, LD_GENERAL,
|
2005-06-08 15:53:19 +02:00
|
|
|
"There are minor bugs in using %s with libevent %s. "
|
|
|
|
"You may want to use the latest version of libevent.", m, v);
|
|
|
|
} else if (slow && server) {
|
2005-10-25 09:05:03 +02:00
|
|
|
log(LOG_WARN, LD_GENERAL,
|
2005-06-08 18:26:44 +02:00
|
|
|
"libevent %s can be very slow with %s. "
|
2005-12-14 21:40:40 +01:00
|
|
|
"When running a server, please use the latest version of libevent.",
|
|
|
|
v,m);
|
2005-06-08 15:53:19 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
2005-06-08 22:35:28 +02:00
|
|
|
#endif
|
2005-06-08 15:53:19 +02:00
|
|
|
|
2005-07-28 21:01:48 +02:00
|
|
|
/* Versioning issues and state: we want to be able to understand old state
|
|
|
|
* files, and not choke on new ones.
|
|
|
|
*
|
2005-12-14 21:40:40 +01:00
|
|
|
* We could preserve all unrecognized variables across invocations, but we
|
|
|
|
* could screw up order, if their order is significant with respect to
|
|
|
|
* existing options.
|
2005-07-28 21:01:48 +02:00
|
|
|
*
|
|
|
|
* We could just dump unrecognized variables if you downgrade.
|
|
|
|
*
|
|
|
|
* This needs thought. XXXX NM
|
|
|
|
*/
|
|
|
|
|
|
|
|
/** DOCDOC */
|
|
|
|
or_state_t *
|
|
|
|
get_or_state(void)
|
|
|
|
{
|
|
|
|
return global_state;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** DOCDOC */
|
|
|
|
static char *
|
|
|
|
get_or_state_fname(void)
|
|
|
|
{
|
|
|
|
char *fname = NULL;
|
|
|
|
or_options_t *options = get_options();
|
|
|
|
size_t len = strlen(options->DataDirectory) + 16;
|
|
|
|
fname = tor_malloc(len);
|
|
|
|
tor_snprintf(fname, len, "%s/state", options->DataDirectory);
|
|
|
|
return fname;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** DOCDOC */
|
2006-01-10 21:38:33 +01:00
|
|
|
/* XXX from_setconf is here because of bug 238 */
|
2005-07-28 21:01:48 +02:00
|
|
|
static int
|
2006-01-10 21:38:33 +01:00
|
|
|
or_state_validate(or_state_t *old_state, or_state_t *state, int from_setconf)
|
2005-07-28 21:01:48 +02:00
|
|
|
{
|
|
|
|
const char *err;
|
2006-01-02 05:14:52 +01:00
|
|
|
tor_version_t v;
|
2006-01-10 23:42:44 +01:00
|
|
|
if (entry_guards_parse_state(state, 0, &err)<0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_GENERAL, "Unable to parse entry nodes: %s", err);
|
2006-01-02 05:14:52 +01:00
|
|
|
return -1;
|
|
|
|
}
|
2006-01-02 05:58:12 +01:00
|
|
|
if (state->TorVersion && tor_version_parse(state->TorVersion, &v)) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_GENERAL, "Can't parse Tor version '%s' from your state file. "
|
|
|
|
"Proceeding anyway.", state->TorVersion);
|
2005-07-28 21:01:48 +02:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** DOCDOC */
|
|
|
|
static void
|
|
|
|
or_state_set(or_state_t *new_state)
|
|
|
|
{
|
|
|
|
const char *err;
|
|
|
|
tor_assert(new_state);
|
|
|
|
if (global_state)
|
|
|
|
config_free(&state_format, global_state);
|
|
|
|
global_state = new_state;
|
2006-01-10 23:42:44 +01:00
|
|
|
if (entry_guards_parse_state(global_state, 1, &err)<0)
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_GENERAL,"Unparseable helper nodes state: %s",err);
|
2005-12-24 00:56:42 +01:00
|
|
|
if (rep_hist_load_state(global_state, &err)<0)
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_GENERAL,"Unparseable bandwidth history state: %s",err);
|
2005-07-28 21:01:48 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* DOCDOC */
|
|
|
|
int
|
|
|
|
or_state_load(void)
|
|
|
|
{
|
|
|
|
or_state_t *new_state = NULL;
|
|
|
|
char *contents = NULL, *fname;
|
|
|
|
int r = -1;
|
|
|
|
|
|
|
|
fname = get_or_state_fname();
|
|
|
|
switch (file_status(fname)) {
|
|
|
|
case FN_FILE:
|
|
|
|
if (!(contents = read_file_to_str(fname, 0))) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_FS, "Unable to read state file \"%s\"", fname);
|
2005-07-28 21:01:48 +02:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case FN_NOENT:
|
|
|
|
break;
|
|
|
|
default:
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_GENERAL,"State file \"%s\" is not a file? Failing.", fname);
|
2005-07-28 21:01:48 +02:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
new_state = tor_malloc_zero(sizeof(or_state_t));
|
|
|
|
new_state->_magic = OR_STATE_MAGIC;
|
|
|
|
config_init(&state_format, new_state);
|
|
|
|
if (contents) {
|
|
|
|
config_line_t *lines=NULL;
|
|
|
|
int assign_retval;
|
|
|
|
if (config_get_lines(contents, &lines)<0)
|
|
|
|
goto done;
|
2005-09-14 04:07:35 +02:00
|
|
|
assign_retval = config_assign(&state_format, new_state, lines, 0, 0);
|
2005-07-28 21:01:48 +02:00
|
|
|
config_free_lines(lines);
|
|
|
|
if (assign_retval<0)
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
2006-01-10 21:38:33 +01:00
|
|
|
if (or_state_validate(NULL, new_state, 1) < 0)
|
2005-07-28 21:01:48 +02:00
|
|
|
goto done;
|
|
|
|
|
|
|
|
if (contents)
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_GENERAL, "Loaded state from \"%s\"", fname);
|
2005-07-28 21:01:48 +02:00
|
|
|
else
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_GENERAL, "Initialized state");
|
2005-07-28 21:01:48 +02:00
|
|
|
or_state_set(new_state);
|
|
|
|
new_state = NULL;
|
|
|
|
if (!contents) {
|
|
|
|
global_state->dirty = 1;
|
|
|
|
or_state_save();
|
|
|
|
}
|
|
|
|
|
|
|
|
r = 0;
|
|
|
|
done:
|
|
|
|
tor_free(fname);
|
|
|
|
tor_free(contents);
|
|
|
|
if (new_state)
|
|
|
|
config_free(&state_format, new_state);
|
|
|
|
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** DOCDOC */
|
|
|
|
int
|
|
|
|
or_state_save(void)
|
|
|
|
{
|
|
|
|
char *state, *contents;
|
|
|
|
char tbuf[ISO_TIME_LEN+1];
|
|
|
|
size_t len;
|
|
|
|
char *fname;
|
|
|
|
|
2006-01-02 05:14:52 +01:00
|
|
|
tor_assert(global_state);
|
|
|
|
|
2006-01-10 23:42:44 +01:00
|
|
|
entry_guards_update_state(global_state);
|
2005-12-24 00:56:42 +01:00
|
|
|
rep_hist_update_state(global_state);
|
2005-07-28 21:01:48 +02:00
|
|
|
|
|
|
|
if (!global_state->dirty)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
global_state->LastWritten = time(NULL);
|
2006-01-02 05:14:52 +01:00
|
|
|
tor_free(global_state->TorVersion);
|
|
|
|
global_state->TorVersion = tor_strdup("Tor " VERSION);
|
2005-07-28 21:01:48 +02:00
|
|
|
state = config_dump(&state_format, global_state, 0);
|
|
|
|
len = strlen(state)+128;
|
|
|
|
contents = tor_malloc(len);
|
|
|
|
format_local_iso_time(tbuf, time(NULL));
|
|
|
|
tor_snprintf(contents, len,
|
|
|
|
"# Tor state file last generated on %s\n"
|
|
|
|
"# You *do not* need to edit this file.\n\n%s",
|
|
|
|
tbuf, state);
|
|
|
|
tor_free(state);
|
|
|
|
fname = get_or_state_fname();
|
|
|
|
if (write_str_to_file(fname, contents, 0)<0) {
|
2006-02-13 10:02:35 +01:00
|
|
|
log_warn(LD_FS, "Unable to write state to file \"%s\"", fname);
|
2005-07-28 21:01:48 +02:00
|
|
|
tor_free(fname);
|
|
|
|
tor_free(contents);
|
|
|
|
return -1;
|
|
|
|
}
|
2006-02-13 10:02:35 +01:00
|
|
|
log_info(LD_GENERAL, "Saved state to \"%s\"", fname);
|
2005-07-28 21:01:48 +02:00
|
|
|
tor_free(fname);
|
|
|
|
tor_free(contents);
|
|
|
|
|
|
|
|
global_state->dirty = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-08-04 21:56:41 +02:00
|
|
|
/** DOCDOC */
|
|
|
|
int
|
|
|
|
config_getinfo_helper(const char *question, char **answer)
|
|
|
|
{
|
|
|
|
if (!strcmp(question, "config/names")) {
|
|
|
|
smartlist_t *sl = smartlist_create();
|
|
|
|
int i;
|
|
|
|
for (i = 0; _option_vars[i].name; ++i) {
|
|
|
|
config_var_t *var = &_option_vars[i];
|
|
|
|
const char *type, *desc;
|
|
|
|
char *line;
|
|
|
|
size_t len;
|
|
|
|
desc = config_find_description(&options_format, var->name);
|
|
|
|
switch (var->type) {
|
2005-08-08 23:58:48 +02:00
|
|
|
case CONFIG_TYPE_STRING: type = "String"; break;
|
2005-08-04 21:56:41 +02:00
|
|
|
case CONFIG_TYPE_UINT: type = "Integer"; break;
|
2005-08-08 23:58:48 +02:00
|
|
|
case CONFIG_TYPE_INTERVAL: type = "TimeInterval"; break;
|
2005-08-04 21:56:41 +02:00
|
|
|
case CONFIG_TYPE_MEMUNIT: type = "DataSize"; break;
|
|
|
|
case CONFIG_TYPE_DOUBLE: type = "Float"; break;
|
|
|
|
case CONFIG_TYPE_BOOL: type = "Boolean"; break;
|
|
|
|
case CONFIG_TYPE_ISOTIME: type = "Time"; break;
|
|
|
|
case CONFIG_TYPE_CSV: type = "CommaList"; break;
|
|
|
|
case CONFIG_TYPE_LINELIST: type = "LineList"; break;
|
|
|
|
case CONFIG_TYPE_LINELIST_S: type = "Dependant"; break;
|
|
|
|
case CONFIG_TYPE_LINELIST_V: type = "Virtual"; break;
|
|
|
|
default:
|
|
|
|
case CONFIG_TYPE_OBSOLETE:
|
|
|
|
type = NULL; break;
|
|
|
|
}
|
|
|
|
if (!type)
|
|
|
|
continue;
|
|
|
|
len = strlen(var->name)+strlen(type)+16;
|
|
|
|
if (desc)
|
|
|
|
len += strlen(desc);
|
|
|
|
line = tor_malloc(len);
|
|
|
|
if (desc)
|
|
|
|
tor_snprintf(line, len, "%s %s %s\n",var->name,type,desc);
|
|
|
|
else
|
|
|
|
tor_snprintf(line, len, "%s %s\n",var->name,type);
|
|
|
|
smartlist_add(sl, line);
|
|
|
|
}
|
|
|
|
*answer = smartlist_join_strings(sl, "", 0, NULL);
|
|
|
|
SMARTLIST_FOREACH(sl, char *, c, tor_free(c));
|
|
|
|
smartlist_free(sl);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-06-11 20:52:12 +02:00
|
|
|
/** Dump the version of every file to the log. */
|
2004-11-29 23:25:31 +01:00
|
|
|
static void
|
|
|
|
print_cvs_version(void)
|
|
|
|
{
|
|
|
|
extern const char aes_c_id[];
|
|
|
|
extern const char compat_c_id[];
|
|
|
|
extern const char container_c_id[];
|
|
|
|
extern const char crypto_c_id[];
|
|
|
|
extern const char log_c_id[];
|
|
|
|
extern const char torgzip_c_id[];
|
|
|
|
extern const char tortls_c_id[];
|
|
|
|
extern const char util_c_id[];
|
|
|
|
|
|
|
|
extern const char buffers_c_id[];
|
|
|
|
extern const char circuitbuild_c_id[];
|
|
|
|
extern const char circuitlist_c_id[];
|
|
|
|
extern const char circuituse_c_id[];
|
|
|
|
extern const char command_c_id[];
|
2004-12-01 03:54:13 +01:00
|
|
|
// extern const char config_c_id[];
|
2004-11-29 23:25:31 +01:00
|
|
|
extern const char connection_c_id[];
|
|
|
|
extern const char connection_edge_c_id[];
|
|
|
|
extern const char connection_or_c_id[];
|
|
|
|
extern const char control_c_id[];
|
|
|
|
extern const char cpuworker_c_id[];
|
|
|
|
extern const char directory_c_id[];
|
|
|
|
extern const char dirserv_c_id[];
|
|
|
|
extern const char dns_c_id[];
|
|
|
|
extern const char hibernate_c_id[];
|
|
|
|
extern const char main_c_id[];
|
|
|
|
extern const char onion_c_id[];
|
|
|
|
extern const char relay_c_id[];
|
|
|
|
extern const char rendclient_c_id[];
|
|
|
|
extern const char rendcommon_c_id[];
|
|
|
|
extern const char rendmid_c_id[];
|
|
|
|
extern const char rendservice_c_id[];
|
|
|
|
extern const char rephist_c_id[];
|
|
|
|
extern const char router_c_id[];
|
|
|
|
extern const char routerlist_c_id[];
|
|
|
|
extern const char routerparse_c_id[];
|
|
|
|
|
|
|
|
puts(AES_H_ID);
|
|
|
|
puts(COMPAT_H_ID);
|
|
|
|
puts(CONTAINER_H_ID);
|
|
|
|
puts(CRYPTO_H_ID);
|
|
|
|
puts(LOG_H_ID);
|
|
|
|
puts(TORGZIP_H_ID);
|
|
|
|
puts(TORINT_H_ID);
|
|
|
|
puts(TORTLS_H_ID);
|
|
|
|
puts(UTIL_H_ID);
|
|
|
|
puts(aes_c_id);
|
|
|
|
puts(compat_c_id);
|
|
|
|
puts(container_c_id);
|
|
|
|
puts(crypto_c_id);
|
|
|
|
puts(log_c_id);
|
|
|
|
puts(torgzip_c_id);
|
|
|
|
puts(tortls_c_id);
|
|
|
|
puts(util_c_id);
|
|
|
|
|
|
|
|
puts(OR_H_ID);
|
|
|
|
puts(buffers_c_id);
|
|
|
|
puts(circuitbuild_c_id);
|
|
|
|
puts(circuitlist_c_id);
|
|
|
|
puts(circuituse_c_id);
|
|
|
|
puts(command_c_id);
|
|
|
|
puts(config_c_id);
|
|
|
|
puts(connection_c_id);
|
|
|
|
puts(connection_edge_c_id);
|
|
|
|
puts(connection_or_c_id);
|
|
|
|
puts(control_c_id);
|
|
|
|
puts(cpuworker_c_id);
|
|
|
|
puts(directory_c_id);
|
|
|
|
puts(dirserv_c_id);
|
|
|
|
puts(dns_c_id);
|
|
|
|
puts(hibernate_c_id);
|
|
|
|
puts(main_c_id);
|
|
|
|
puts(onion_c_id);
|
|
|
|
puts(relay_c_id);
|
|
|
|
puts(rendclient_c_id);
|
|
|
|
puts(rendcommon_c_id);
|
|
|
|
puts(rendmid_c_id);
|
|
|
|
puts(rendservice_c_id);
|
|
|
|
puts(rephist_c_id);
|
|
|
|
puts(router_c_id);
|
|
|
|
puts(routerlist_c_id);
|
|
|
|
puts(routerparse_c_id);
|
|
|
|
}
|
2005-06-09 21:03:31 +02:00
|
|
|
|