summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c587
1 files changed, 327 insertions, 260 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 342f3f67e4..31298cbc3f 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -16,14 +16,14 @@
/** Enumeration of types which option values can take */
typedef enum config_type_t {
- CONFIG_TYPE_STRING = 0, /**< An arbitrary string. */
- CONFIG_TYPE_UINT, /**< A non-negative integer less than MAX_INT */
- CONFIG_TYPE_DOUBLE, /**< A floating-point value */
- CONFIG_TYPE_BOOL, /**< A boolean value, expressed as 0 or 1. */
- CONFIG_TYPE_CSV, /**< A list of strings, separated by commas and optional
- * whitespace. */
- CONFIG_TYPE_LINELIST, /**< Uninterpreted config lines */
- CONFIG_TYPE_OBSOLETE, /**< Obsolete (ignored) option. */
+ CONFIG_TYPE_STRING = 0, /**< An arbitrary string. */
+ CONFIG_TYPE_UINT, /**< A non-negative integer less than MAX_INT */
+ CONFIG_TYPE_DOUBLE, /**< A floating-point value */
+ CONFIG_TYPE_BOOL, /**< A boolean value, expressed as 0 or 1. */
+ CONFIG_TYPE_CSV, /**< A list of strings, separated by commas and optional
+ * whitespace. */
+ CONFIG_TYPE_LINELIST, /**< Uninterpreted config lines */
+ CONFIG_TYPE_OBSOLETE, /**< Obsolete (ignored) option. */
} config_type_t;
/** Largest allowed config line */
@@ -37,28 +37,32 @@ static int config_assign(or_options_t *options, struct config_line_t *list);
static int parse_dir_server_line(const char *line);
/** Helper: Read a list of configuration options from the command line. */
-static struct config_line_t *config_get_commandlines(int argc, char **argv) {
+static struct config_line_t *
+config_get_commandlines(int argc, char **argv)
+{
struct config_line_t *new;
struct config_line_t *front = NULL;
char *s;
int i = 1;
- while(i < argc-1) {
- if(!strcmp(argv[i],"-f")) {
+ while (i < argc-1) {
+ if (!strcmp(argv[i],"-f")) {
// log(LOG_DEBUG,"Commandline: skipping over -f.");
- i+=2; /* this is the config file option. ignore it. */
+ i += 2; /* this is the config file option. ignore it. */
continue;
}
new = tor_malloc(sizeof(struct config_line_t));
s = argv[i];
+
while(*s == '-')
s++;
+
new->key = tor_strdup(s);
new->value = tor_strdup(argv[i+1]);
log(LOG_DEBUG,"Commandline: parsed keyword '%s', value '%s'",
- new->key, new->value);
+ new->key, new->value);
new->next = front;
front = new;
i += 2;
@@ -74,6 +78,7 @@ config_line_prepend(struct config_line_t *front,
const char *val)
{
struct config_line_t *newline;
+
newline = tor_malloc(sizeof(struct config_line_t));
newline->key = tor_strdup(key);
newline->value = tor_strdup(val);
@@ -85,18 +90,19 @@ config_line_prepend(struct config_line_t *front,
* strings. Set *result to the list, or NULL if parsing the file
* failed. Return 0 on success, -1 on failure. Warn and ignore any
* misformatted lines. */
-static int config_get_lines(FILE *f,
- struct config_line_t **result) {
-
+static int
+config_get_lines(FILE *f, struct config_line_t **result)
+{
struct config_line_t *front = NULL;
char line[CONFIG_LINE_T_MAXLEN];
int r;
char *key, *value;
- while( (r=parse_line_from_file(line,sizeof(line),f,&key,&value)) > 0) {
+ while ((r = parse_line_from_file(line, sizeof(line), f, &key, &value)) > 0) {
front = config_line_prepend(front, key, value);
}
- if(r < 0) {
+
+ if (r < 0) {
*result = NULL;
return -1;
} else {
@@ -108,10 +114,12 @@ static int config_get_lines(FILE *f,
/**
* Free all the configuration lines on the linked list <b>front</b>.
*/
-static void config_free_lines(struct config_line_t *front) {
+static void
+config_free_lines(struct config_line_t *front)
+{
struct config_line_t *tmp;
- while(front) {
+ while (front) {
tmp = front;
front = tmp->next;
@@ -126,51 +134,61 @@ static void config_free_lines(struct config_line_t *front) {
* the result in <b>arg</b>. If the option is misformatted, log a warning and
* skip it.
*/
-static int config_compare(struct config_line_t *c, const char *key, config_type_t type, void *arg) {
+static int
+config_compare(struct config_line_t *c, const char *key,
+ config_type_t type, void *arg)
+{
int i, ok;
- if(strncasecmp(c->key,key,strlen(c->key)))
+ if (strncasecmp(c->key, key, strlen(c->key)))
return 0;
- if(strcasecmp(c->key,key)) {
+ if (strcasecmp(c->key, key)) {
tor_free(c->key);
c->key = tor_strdup(key);
}
/* it's a match. cast and assign. */
- log_fn(LOG_DEBUG,"Recognized keyword '%s' as %s, using value '%s'.",c->key,key,c->value);
+ log_fn(LOG_DEBUG, "Recognized keyword '%s' as %s, using value '%s'.",
+ c->key, key, c->value);
switch(type) {
- case CONFIG_TYPE_UINT:
- i = tor_parse_long(c->value,10,0,INT_MAX,&ok,NULL);
- if(!ok) {
- log(LOG_WARN, "Int keyword '%s %s' is malformed or out of bounds. Skipping.",
- c->key,c->value);
- return 0;
- }
- *(int *)arg = i;
- break;
- case CONFIG_TYPE_BOOL:
- i = tor_parse_long(c->value,10,0,1,&ok,NULL);
- if (!ok) {
- log(LOG_WARN, "Boolean keyword '%s' expects 0 or 1. Skipping.", c->key);
- return 0;
- }
- *(int *)arg = i;
- break;
- case CONFIG_TYPE_STRING:
- tor_free(*(char **)arg);
- *(char **)arg = tor_strdup(c->value);
- break;
- case CONFIG_TYPE_DOUBLE:
- *(double *)arg = atof(c->value);
- break;
- case CONFIG_TYPE_CSV:
- if(*(smartlist_t**)arg == NULL)
- *(smartlist_t**)arg = smartlist_create();
- smartlist_split_string(*(smartlist_t**)arg, c->value, ",",
- SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
- break;
+ case CONFIG_TYPE_UINT:
+ i = tor_parse_long(c->value, 10, 0, INT_MAX, &ok, NULL);
+ if (!ok) {
+ log(LOG_WARN, "Int keyword '%s %s' is malformed or out of bounds. Skipping.",
+ c->key,c->value);
+ return 0;
+ }
+ *(int *)arg = i;
+ break;
+
+ case CONFIG_TYPE_BOOL:
+ i = tor_parse_long(c->value, 10, 0, 1, &ok, NULL);
+ if (!ok) {
+ log(LOG_WARN, "Boolean keyword '%s' expects 0 or 1. Skipping.", c->key);
+ return 0;
+ }
+ *(int *)arg = i;
+ break;
+
+ case CONFIG_TYPE_STRING:
+ tor_free(*(char **)arg);
+ *(char **)arg = tor_strdup(c->value);
+ break;
+
+ case CONFIG_TYPE_DOUBLE:
+ *(double *)arg = atof(c->value);
+ break;
+
+ case CONFIG_TYPE_CSV:
+ if (*(smartlist_t**)arg == NULL)
+ *(smartlist_t**)arg = smartlist_create();
+
+ smartlist_split_string(*(smartlist_t**)arg, c->value, ",",
+ SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
+ break;
+
case CONFIG_TYPE_LINELIST:
/* Note: this reverses the order that the lines appear in. That's
* just fine, since we build up the list of lines reversed in the
@@ -178,10 +196,12 @@ static int config_compare(struct config_line_t *c, const char *key, config_type_
*(struct config_line_t**)arg =
config_line_prepend(*(struct config_line_t**)arg, c->key, c->value);
break;
- case CONFIG_TYPE_OBSOLETE:
- log_fn(LOG_WARN, "Skipping obsolete configuration option '%s'", c->key);
- break;
+
+ case CONFIG_TYPE_OBSOLETE:
+ log_fn(LOG_WARN, "Skipping obsolete configuration option '%s'", c->key);
+ break;
}
+
return 1;
}
@@ -189,88 +209,88 @@ static int config_compare(struct config_line_t *c, const char *key, config_type_
* For each item, convert as appropriate and assign to <b>options</b>.
* If an item is unrecognized, return -1 immediately,
* else return 0 for success. */
-static int config_assign(or_options_t *options, struct config_line_t *list) {
-
- while(list) {
- if(
-
- /* order matters here! abbreviated arguments use the first match. */
+static int
+config_assign(or_options_t *options, struct config_line_t *list)
+{
+ while (list) {
+ if (
- /* string options */
- config_compare(list, "Address", CONFIG_TYPE_STRING, &options->Address) ||
- config_compare(list, "AllowUnverifiedNodes", CONFIG_TYPE_CSV, &options->AllowUnverifiedNodes) ||
- config_compare(list, "AuthoritativeDirectory",CONFIG_TYPE_BOOL, &options->AuthoritativeDir) ||
+ /* order matters here! abbreviated arguments use the first match. */
- config_compare(list, "BandwidthRate", CONFIG_TYPE_UINT, &options->BandwidthRate) ||
- config_compare(list, "BandwidthBurst", CONFIG_TYPE_UINT, &options->BandwidthBurst) ||
+ /* string options */
+ config_compare(list, "Address", CONFIG_TYPE_STRING, &options->Address) ||
+ config_compare(list, "AllowUnverifiedNodes", CONFIG_TYPE_CSV, &options->AllowUnverifiedNodes) ||
+ config_compare(list, "AuthoritativeDirectory",CONFIG_TYPE_BOOL, &options->AuthoritativeDir) ||
- config_compare(list, "ClientOnly", CONFIG_TYPE_BOOL, &options->ClientOnly) ||
- config_compare(list, "ContactInfo", CONFIG_TYPE_STRING, &options->ContactInfo) ||
+ config_compare(list, "BandwidthRate", CONFIG_TYPE_UINT, &options->BandwidthRate) ||
+ config_compare(list, "BandwidthBurst", CONFIG_TYPE_UINT, &options->BandwidthBurst) ||
- config_compare(list, "DebugLogFile", CONFIG_TYPE_STRING, &options->DebugLogFile) ||
- config_compare(list, "DataDirectory", CONFIG_TYPE_STRING, &options->DataDirectory) ||
- config_compare(list, "DirPort", CONFIG_TYPE_UINT, &options->DirPort) ||
- config_compare(list, "DirBindAddress", CONFIG_TYPE_LINELIST, &options->DirBindAddress) ||
- config_compare(list, "DirFetchPostPeriod",CONFIG_TYPE_UINT, &options->DirFetchPostPeriod) ||
- config_compare(list, "DirServer", CONFIG_TYPE_LINELIST, &options->DirServers) ||
+ config_compare(list, "ClientOnly", CONFIG_TYPE_BOOL, &options->ClientOnly) ||
+ config_compare(list, "ContactInfo", CONFIG_TYPE_STRING, &options->ContactInfo) ||
- config_compare(list, "ExitNodes", CONFIG_TYPE_STRING, &options->ExitNodes) ||
- config_compare(list, "EntryNodes", CONFIG_TYPE_STRING, &options->EntryNodes) ||
- config_compare(list, "StrictExitNodes", CONFIG_TYPE_BOOL, &options->StrictExitNodes) ||
- config_compare(list, "StrictEntryNodes", CONFIG_TYPE_BOOL, &options->StrictEntryNodes) ||
- config_compare(list, "ExitPolicy", CONFIG_TYPE_LINELIST, &options->ExitPolicy) ||
- config_compare(list, "ExcludeNodes", CONFIG_TYPE_STRING, &options->ExcludeNodes) ||
+ config_compare(list, "DebugLogFile", CONFIG_TYPE_STRING, &options->DebugLogFile) ||
+ config_compare(list, "DataDirectory", CONFIG_TYPE_STRING, &options->DataDirectory) ||
+ config_compare(list, "DirPort", CONFIG_TYPE_UINT, &options->DirPort) ||
+ config_compare(list, "DirBindAddress", CONFIG_TYPE_LINELIST, &options->DirBindAddress) ||
+ config_compare(list, "DirFetchPostPeriod",CONFIG_TYPE_UINT, &options->DirFetchPostPeriod) ||
+ config_compare(list, "DirServer", CONFIG_TYPE_LINELIST, &options->DirServers) ||
- config_compare(list, "FascistFirewall",CONFIG_TYPE_BOOL, &options->FascistFirewall) ||
- config_compare(list, "FirewallPorts",CONFIG_TYPE_CSV, &options->FirewallPorts) ||
+ config_compare(list, "ExitNodes", CONFIG_TYPE_STRING, &options->ExitNodes) ||
+ config_compare(list, "EntryNodes", CONFIG_TYPE_STRING, &options->EntryNodes) ||
+ config_compare(list, "StrictExitNodes", CONFIG_TYPE_BOOL, &options->StrictExitNodes) ||
+ config_compare(list, "StrictEntryNodes", CONFIG_TYPE_BOOL, &options->StrictEntryNodes) ||
+ config_compare(list, "ExitPolicy", CONFIG_TYPE_LINELIST, &options->ExitPolicy) ||
+ config_compare(list, "ExcludeNodes", CONFIG_TYPE_STRING, &options->ExcludeNodes) ||
- config_compare(list, "Group", CONFIG_TYPE_STRING, &options->Group) ||
+ config_compare(list, "FascistFirewall",CONFIG_TYPE_BOOL, &options->FascistFirewall) ||
+ config_compare(list, "FirewallPorts",CONFIG_TYPE_CSV, &options->FirewallPorts) ||
- config_compare(list, "HttpProxy", CONFIG_TYPE_STRING, &options->HttpProxy) ||
- config_compare(list, "HiddenServiceDir", CONFIG_TYPE_LINELIST, &options->RendConfigLines)||
- config_compare(list, "HiddenServicePort", CONFIG_TYPE_LINELIST, &options->RendConfigLines)||
- config_compare(list, "HiddenServiceNodes", CONFIG_TYPE_LINELIST, &options->RendConfigLines)||
- config_compare(list, "HiddenServiceExcludeNodes", CONFIG_TYPE_LINELIST, &options->RendConfigLines)||
+ config_compare(list, "Group", CONFIG_TYPE_STRING, &options->Group) ||
- config_compare(list, "IgnoreVersion", CONFIG_TYPE_BOOL, &options->IgnoreVersion) ||
+ config_compare(list, "HttpProxy", CONFIG_TYPE_STRING, &options->HttpProxy) ||
+ config_compare(list, "HiddenServiceDir", CONFIG_TYPE_LINELIST, &options->RendConfigLines)||
+ config_compare(list, "HiddenServicePort", CONFIG_TYPE_LINELIST, &options->RendConfigLines)||
+ config_compare(list, "HiddenServiceNodes", CONFIG_TYPE_LINELIST, &options->RendConfigLines)||
+ config_compare(list, "HiddenServiceExcludeNodes", CONFIG_TYPE_LINELIST, &options->RendConfigLines)||
- config_compare(list, "KeepalivePeriod",CONFIG_TYPE_UINT, &options->KeepalivePeriod) ||
+ config_compare(list, "IgnoreVersion", CONFIG_TYPE_BOOL, &options->IgnoreVersion) ||
- config_compare(list, "LogLevel", CONFIG_TYPE_LINELIST, &options->LogOptions) ||
- config_compare(list, "LogFile", CONFIG_TYPE_LINELIST, &options->LogOptions) ||
- config_compare(list, "LinkPadding", CONFIG_TYPE_OBSOLETE, NULL) ||
+ config_compare(list, "KeepalivePeriod",CONFIG_TYPE_UINT, &options->KeepalivePeriod) ||
- config_compare(list, "MaxConn", CONFIG_TYPE_UINT, &options->MaxConn) ||
- config_compare(list, "MaxOnionsPending",CONFIG_TYPE_UINT, &options->MaxOnionsPending) ||
+ config_compare(list, "LogLevel", CONFIG_TYPE_LINELIST, &options->LogOptions) ||
+ config_compare(list, "LogFile", CONFIG_TYPE_LINELIST, &options->LogOptions) ||
+ config_compare(list, "LinkPadding", CONFIG_TYPE_OBSOLETE, NULL) ||
- config_compare(list, "Nickname", CONFIG_TYPE_STRING, &options->Nickname) ||
- config_compare(list, "NewCircuitPeriod",CONFIG_TYPE_UINT, &options->NewCircuitPeriod) ||
- config_compare(list, "NumCpus", CONFIG_TYPE_UINT, &options->NumCpus) ||
+ config_compare(list, "MaxConn", CONFIG_TYPE_UINT, &options->MaxConn) ||
+ config_compare(list, "MaxOnionsPending",CONFIG_TYPE_UINT, &options->MaxOnionsPending) ||
- config_compare(list, "ORPort", CONFIG_TYPE_UINT, &options->ORPort) ||
- config_compare(list, "ORBindAddress", CONFIG_TYPE_LINELIST, &options->ORBindAddress) ||
- config_compare(list, "OutboundBindAddress",CONFIG_TYPE_STRING, &options->OutboundBindAddress) ||
+ config_compare(list, "Nickname", CONFIG_TYPE_STRING, &options->Nickname) ||
+ config_compare(list, "NewCircuitPeriod",CONFIG_TYPE_UINT, &options->NewCircuitPeriod) ||
+ config_compare(list, "NumCpus", CONFIG_TYPE_UINT, &options->NumCpus) ||
- config_compare(list, "PidFile", CONFIG_TYPE_STRING, &options->PidFile) ||
- config_compare(list, "PathlenCoinWeight",CONFIG_TYPE_DOUBLE, &options->PathlenCoinWeight) ||
+ config_compare(list, "ORPort", CONFIG_TYPE_UINT, &options->ORPort) ||
+ config_compare(list, "ORBindAddress", CONFIG_TYPE_LINELIST, &options->ORBindAddress) ||
+ config_compare(list, "OutboundBindAddress",CONFIG_TYPE_STRING, &options->OutboundBindAddress) ||
- config_compare(list, "RouterFile", CONFIG_TYPE_STRING, &options->RouterFile) ||
- config_compare(list, "RunAsDaemon", CONFIG_TYPE_BOOL, &options->RunAsDaemon) ||
- config_compare(list, "RunTesting", CONFIG_TYPE_BOOL, &options->RunTesting) ||
- config_compare(list, "RecommendedVersions",CONFIG_TYPE_STRING, &options->RecommendedVersions) ||
- config_compare(list, "RendNodes", CONFIG_TYPE_STRING, &options->RendNodes) ||
- config_compare(list, "RendExcludeNodes",CONFIG_TYPE_STRING, &options->RendExcludeNodes) ||
+ config_compare(list, "PidFile", CONFIG_TYPE_STRING, &options->PidFile) ||
+ config_compare(list, "PathlenCoinWeight",CONFIG_TYPE_DOUBLE, &options->PathlenCoinWeight) ||
- config_compare(list, "SocksPort", CONFIG_TYPE_UINT, &options->SocksPort) ||
- config_compare(list, "SocksBindAddress",CONFIG_TYPE_LINELIST,&options->SocksBindAddress) ||
- config_compare(list, "SocksPolicy", CONFIG_TYPE_LINELIST,&options->SocksPolicy) ||
+ config_compare(list, "RouterFile", CONFIG_TYPE_STRING, &options->RouterFile) ||
+ config_compare(list, "RunAsDaemon", CONFIG_TYPE_BOOL, &options->RunAsDaemon) ||
+ config_compare(list, "RunTesting", CONFIG_TYPE_BOOL, &options->RunTesting) ||
+ config_compare(list, "RecommendedVersions",CONFIG_TYPE_STRING, &options->RecommendedVersions) ||
+ config_compare(list, "RendNodes", CONFIG_TYPE_STRING, &options->RendNodes) ||
+ config_compare(list, "RendExcludeNodes",CONFIG_TYPE_STRING, &options->RendExcludeNodes) ||
- config_compare(list, "TrafficShaping", CONFIG_TYPE_OBSOLETE, NULL) ||
+ config_compare(list, "SocksPort", CONFIG_TYPE_UINT, &options->SocksPort) ||
+ config_compare(list, "SocksBindAddress",CONFIG_TYPE_LINELIST,&options->SocksBindAddress) ||
+ config_compare(list, "SocksPolicy", CONFIG_TYPE_LINELIST,&options->SocksPolicy) ||
- config_compare(list, "User", CONFIG_TYPE_STRING, &options->User)
+ config_compare(list, "TrafficShaping", CONFIG_TYPE_OBSOLETE, NULL) ||
+ config_compare(list, "User", CONFIG_TYPE_STRING, &options->User)
- ) {
+ ) {
/* then we're ok. it matched something. */
} else {
log_fn(LOG_WARN,"Unknown keyword '%s'. Failing.",list->key);
@@ -279,10 +299,13 @@ static int config_assign(or_options_t *options, struct config_line_t *list) {
list = list->next;
}
+
return 0;
}
-static void add_default_trusted_dirservers(void) {
+static void
+add_default_trusted_dirservers(void)
+{
/* moria1 */
parse_dir_server_line("18.244.0.188:9031 "
"FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441");
@@ -298,8 +321,9 @@ static void add_default_trusted_dirservers(void) {
*
* Call this function when we can't find any torrc config file.
*/
-static int config_assign_defaults(or_options_t *options) {
-
+static int
+config_assign_defaults(or_options_t *options)
+{
/* set them up as a client only */
options->SocksPort = 9050;
@@ -314,7 +338,9 @@ static int config_assign_defaults(or_options_t *options) {
}
/** Print a usage message for tor. */
-static void print_usage(void) {
+static void
+print_usage(void)
+{
printf("tor -f <torrc> [args]\n"
"See man page for more options. This -h is probably obsolete.\n\n"
"-b <bandwidth>\t\tbytes/second rate limiting\n"
@@ -324,20 +350,20 @@ static void print_usage(void) {
"-r <file>\t\tList of known routers\n");
printf("\nClient options:\n"
"-e \"nick1 nick2 ...\"\t\tExit nodes\n"
- "-s <IP>\t\t\tPort to bind to for Socks\n"
- );
+ "-s <IP>\t\t\tPort to bind to for Socks\n");
printf("\nServer options:\n"
"-n <nick>\t\tNickname of router\n"
"-o <port>\t\tOR port to bind to\n"
- "-p <file>\t\tPID file\n"
- );
+ "-p <file>\t\tPID file\n");
}
/**
* Based on <b>address</b>, guess our public IP address and put it
* in <b>addr</b>.
*/
-int resolve_my_address(const char *address, uint32_t *addr) {
+int
+resolve_my_address(const char *address, uint32_t *addr)
+{
struct in_addr in;
struct hostent *rent;
char hostname[256];
@@ -345,12 +371,12 @@ int resolve_my_address(const char *address, uint32_t *addr) {
tor_assert(addr);
- if(address) {
- strlcpy(hostname,address,sizeof(hostname));
+ if (address) {
+ strlcpy(hostname, address, sizeof(hostname));
} else { /* then we need to guess our address */
explicit_ip = 0; /* it's implicit */
- if(gethostname(hostname,sizeof(hostname)) < 0) {
+ if (gethostname(hostname, sizeof(hostname)) < 0) {
log_fn(LOG_WARN,"Error obtaining local hostname");
return -1;
}
@@ -359,7 +385,7 @@ int resolve_my_address(const char *address, uint32_t *addr) {
/* now we know hostname. resolve it and keep only the IP */
- if(tor_inet_aton(hostname, &in) == 0) {
+ if (tor_inet_aton(hostname, &in) == 0) {
/* then we have to resolve it */
explicit_ip = 0;
rent = (struct hostent *)gethostbyname(hostname);
@@ -368,39 +394,44 @@ int resolve_my_address(const char *address, uint32_t *addr) {
return -1;
}
tor_assert(rent->h_length == 4);
- memcpy(&in.s_addr, rent->h_addr,rent->h_length);
+ memcpy(&in.s_addr, rent->h_addr, rent->h_length);
}
- if(!explicit_ip && is_internal_IP(htonl(in.s_addr))) {
+
+ if (!explicit_ip && is_internal_IP(htonl(in.s_addr))) {
log_fn(LOG_WARN,"Address '%s' resolves to private IP '%s'. "
"Please set the Address config option to be the IP you want to use.",
hostname, inet_ntoa(in));
return -1;
}
- log_fn(LOG_DEBUG,"Resolved Address to %s.", inet_ntoa(in));
+
+ log_fn(LOG_DEBUG, "Resolved Address to %s.", inet_ntoa(in));
*addr = ntohl(in.s_addr);
return 0;
}
-static char *get_default_nickname(void)
+static char *
+get_default_nickname(void)
{
char localhostname[256];
char *cp, *out, *outp;
- if(gethostname(localhostname,sizeof(localhostname)) < 0) {
+ if (gethostname(localhostname, sizeof(localhostname)) < 0) {
log_fn(LOG_WARN,"Error obtaining local hostname");
return NULL;
}
+
/* Put it in lowercase; stop at the first dot. */
- for(cp = localhostname; *cp; ++cp) {
+ for (cp = localhostname; *cp; ++cp) {
if (*cp == '.') {
*cp = '\0';
break;
}
*cp = tolower(*cp);
}
+
/* Strip invalid characters. */
cp = localhostname;
- out = outp = tor_malloc(strlen(localhostname)+1);
+ out = outp = tor_malloc(strlen(localhostname) + 1);
while (*cp) {
if (strchr(LEGAL_NICKNAME_CHARACTERS, *cp))
*outp++ = *cp++;
@@ -408,6 +439,7 @@ static char *get_default_nickname(void)
cp++;
}
*outp = '\0';
+
/* Enforce length. */
if (strlen(out) > MAX_NICKNAME_LEN)
out[MAX_NICKNAME_LEN]='\0';
@@ -416,7 +448,9 @@ static char *get_default_nickname(void)
}
/** Release storage held by <b>options</b> */
-static void free_options(or_options_t *options) {
+static void
+free_options(or_options_t *options)
+{
config_free_lines(options->LogOptions);
tor_free(options->ContactInfo);
tor_free(options->DebugLogFile);
@@ -449,9 +483,11 @@ static void free_options(or_options_t *options) {
}
}
-/** Set <b>options</b> to hold reasonable defaults for most options. */
-static void init_options(or_options_t *options) {
-/* give reasonable values for each option. Defaults to zero. */
+/** Set <b>options</b> to hold reasonable defaults for most options.
+ * Each option defaults to zero. */
+static void
+init_options(or_options_t *options)
+{
memset(options,0,sizeof(or_options_t));
options->LogOptions = NULL;
options->ExitNodes = tor_strdup("");
@@ -483,7 +519,8 @@ static void init_options(or_options_t *options) {
options->DirServers = NULL;
}
-static char *get_default_conf_file(void)
+static char *
+get_default_conf_file(void)
{
#ifdef MS_WINDOWS
LPITEMIDLIST idl;
@@ -520,7 +557,9 @@ static char *get_default_conf_file(void)
/** Read a configuration file into <b>options</b>, finding the configuration
* file location based on the command line. After loading the options,
* validate them for consistency. Return 0 if success, <0 if failure. */
-int getconfig(int argc, char **argv, or_options_t *options) {
+int
+getconfig(int argc, char **argv, or_options_t *options)
+{
struct config_line_t *cl;
FILE *cf;
char *fname;
@@ -534,7 +573,7 @@ int getconfig(int argc, char **argv, or_options_t *options) {
int previous_orport = -1;
int using_default_torrc;
- if(first_load) { /* first time we're called. save commandline args */
+ if (first_load) { /* first time we're called. save commandline args */
backup_argv = argv;
backup_argc = argc;
first_load = 0;
@@ -543,7 +582,7 @@ int getconfig(int argc, char **argv, or_options_t *options) {
argc = backup_argc;
/* record some previous values, so we can fail if they change */
- if(options->PidFile)
+ if (options->PidFile)
previous_pidfile = tor_strdup(options->PidFile);
previous_runasdaemon = options->RunAsDaemon;
previous_orport = options->ORPort;
@@ -551,22 +590,23 @@ int getconfig(int argc, char **argv, or_options_t *options) {
}
init_options(options);
- if(argc > 1 && (!strcmp(argv[1], "-h") || !strcmp(argv[1],"--help"))) {
+ if (argc > 1 && (!strcmp(argv[1], "-h") || !strcmp(argv[1],"--help"))) {
print_usage();
exit(0);
}
- if(argc > 1 && (!strcmp(argv[1],"--version"))) {
+ if (argc > 1 && (!strcmp(argv[1],"--version"))) {
printf("Tor version %s.\n",VERSION);
exit(0);
}
/* learn config file name, get config lines, assign them */
i = 1;
- while(i < argc-1 && strcmp(argv[i],"-f")) {
+ while (i < argc-1 && strcmp(argv[i],"-f")) {
i++;
}
- if(i < argc-1) { /* we found one */
+
+ if (i < argc-1) { /* we found one */
fname = tor_strdup(argv[i+1]);
using_default_torrc = 0;
} else {
@@ -574,12 +614,12 @@ int getconfig(int argc, char **argv, or_options_t *options) {
char *fn;
using_default_torrc = 1;
fn = get_default_conf_file();
- if (fn && file_status(fn)==FN_FILE) {
+ if (fn && file_status(fn) == FN_FILE) {
fname = fn;
} else {
tor_free(fn);
fn = expand_filename("~/.torrc");
- if (fn && file_status(fn)==FN_FILE) {
+ if (fn && file_status(fn) == FN_FILE) {
fname = fn;
} else {
tor_free(fn);
@@ -588,18 +628,20 @@ int getconfig(int argc, char **argv, or_options_t *options) {
}
}
tor_assert(fname);
- log(LOG_DEBUG,"Opening config file '%s'",fname);
+ log(LOG_DEBUG, "Opening config file '%s'", fname);
- if(config_assign_defaults(options) < 0) {
+ if (config_assign_defaults(options) < 0) {
return -1;
}
+
cf = fopen(fname, "r");
- if(!cf) {
- if(using_default_torrc == 1) {
- log(LOG_NOTICE, "Configuration file '%s' not present, using reasonable defaults.",fname);
+ if (!cf) {
+ if (using_default_torrc == 1) {
+ log(LOG_NOTICE, "Configuration file '%s' not present, "
+ "using reasonable defaults.", fname);
tor_free(fname);
} else {
- log(LOG_WARN, "Unable to open configuration file '%s'.",fname);
+ log(LOG_WARN, "Unable to open configuration file '%s'.", fname);
tor_free(fname);
return -1;
}
@@ -607,7 +649,7 @@ int getconfig(int argc, char **argv, or_options_t *options) {
tor_free(fname);
if (config_get_lines(cf, &cl)<0)
return -1;
- if(config_assign(options,cl) < 0)
+ if (config_assign(options,cl) < 0)
return -1;
config_free_lines(cl);
fclose(cf);
@@ -615,37 +657,37 @@ int getconfig(int argc, char **argv, or_options_t *options) {
/* go through command-line variables too */
cl = config_get_commandlines(argc,argv);
- if(config_assign(options,cl) < 0)
+ if (config_assign(options,cl) < 0)
return -1;
config_free_lines(cl);
/* Validate options */
/* first check if any of the previous options have changed but aren't allowed to */
- if(previous_pidfile && strcmp(previous_pidfile,options->PidFile)) {
+ if (previous_pidfile && strcmp(previous_pidfile,options->PidFile)) {
log_fn(LOG_WARN,"During reload, PidFile changed from %s to %s. Failing.",
previous_pidfile, options->PidFile);
return -1;
}
tor_free(previous_pidfile);
- if(previous_runasdaemon && !options->RunAsDaemon) {
+ if (previous_runasdaemon && !options->RunAsDaemon) {
log_fn(LOG_WARN,"During reload, change from RunAsDaemon=1 to =0 not allowed. Failing.");
return -1;
}
- if(previous_orport == 0 && options->ORPort > 0) {
+ if (previous_orport == 0 && options->ORPort > 0) {
log_fn(LOG_WARN,"During reload, change from ORPort=0 to >0 not allowed. Failing.");
return -1;
}
- if(options->ORPort < 0 || options->ORPort > 65535) {
- log(LOG_WARN,"ORPort option out of bounds.");
+ if (options->ORPort < 0 || options->ORPort > 65535) {
+ log(LOG_WARN, "ORPort option out of bounds.");
result = -1;
}
if (options->Nickname == NULL) {
- if(server_mode()) {
+ if (server_mode()) {
if (!(options->Nickname = get_default_nickname()))
return -1;
log_fn(LOG_NOTICE, "Choosing default nickname %s", options->Nickname);
@@ -667,64 +709,65 @@ int getconfig(int argc, char **argv, or_options_t *options) {
}
}
- if(server_mode()) {
+ if (server_mode()) {
/* confirm that our address isn't broken, so we can complain now */
uint32_t tmp;
- if(resolve_my_address(options->Address, &tmp) < 0)
+ if (resolve_my_address(options->Address, &tmp) < 0)
result = -1;
}
- if(options->SocksPort < 0 || options->SocksPort > 65535) {
- log(LOG_WARN,"SocksPort option out of bounds.");
+ if (options->SocksPort < 0 || options->SocksPort > 65535) {
+ log(LOG_WARN, "SocksPort option out of bounds.");
result = -1;
}
- if(options->SocksPort == 0 && options->ORPort == 0) {
- log(LOG_WARN,"SocksPort and ORPort are both undefined? Quitting.");
+ if (options->SocksPort == 0 && options->ORPort == 0) {
+ log(LOG_WARN, "SocksPort and ORPort are both undefined? Quitting.");
result = -1;
}
- if(options->DirPort < 0 || options->DirPort > 65535) {
- log(LOG_WARN,"DirPort option out of bounds.");
+ if (options->DirPort < 0 || options->DirPort > 65535) {
+ log(LOG_WARN, "DirPort option out of bounds.");
result = -1;
}
- if(options->StrictExitNodes && !strlen(options->ExitNodes)) {
- log(LOG_WARN,"StrictExitNodes set, but no ExitNodes listed.");
+ if (options->StrictExitNodes && !strlen(options->ExitNodes)) {
+ log(LOG_WARN, "StrictExitNodes set, but no ExitNodes listed.");
}
- if(options->StrictEntryNodes && !strlen(options->EntryNodes)) {
- log(LOG_WARN,"StrictEntryNodes set, but no EntryNodes listed.");
+ if (options->StrictEntryNodes && !strlen(options->EntryNodes)) {
+ log(LOG_WARN, "StrictEntryNodes set, but no EntryNodes listed.");
}
- if(options->AuthoritativeDir && options->RecommendedVersions == NULL) {
- log(LOG_WARN,"Directory servers must configure RecommendedVersions.");
+ if (options->AuthoritativeDir && options->RecommendedVersions == NULL) {
+ log(LOG_WARN, "Directory servers must configure RecommendedVersions.");
result = -1;
}
- if(options->AuthoritativeDir && !options->DirPort) {
- log(LOG_WARN,"Running as authoritative directory, but no DirPort set.");
+ if (options->AuthoritativeDir && !options->DirPort) {
+ log(LOG_WARN, "Running as authoritative directory, but no DirPort set.");
result = -1;
}
- if(options->AuthoritativeDir && !options->ORPort) {
- log(LOG_WARN,"Running as authoritative directory, but no ORPort set.");
+ if (options->AuthoritativeDir && !options->ORPort) {
+ log(LOG_WARN, "Running as authoritative directory, but no ORPort set.");
result = -1;
}
- if(options->AuthoritativeDir && options->ClientOnly) {
- log(LOG_WARN,"Running as authoritative directory, but ClientOnly also set.");
+ if (options->AuthoritativeDir && options->ClientOnly) {
+ log(LOG_WARN, "Running as authoritative directory, but ClientOnly also set.");
result = -1;
}
- if(options->FascistFirewall && !options->FirewallPorts) {
+ if (options->FascistFirewall && !options->FirewallPorts) {
options->FirewallPorts = smartlist_create();
smartlist_add(options->FirewallPorts, tor_strdup("80"));
smartlist_add(options->FirewallPorts, tor_strdup("443"));
}
- if(options->FirewallPorts) {
+ if (options->FirewallPorts) {
SMARTLIST_FOREACH(options->FirewallPorts, const char *, cp,
- { i = atoi(cp);
+ {
+ i = atoi(cp);
if (i < 1 || i > 65535) {
log(LOG_WARN, "Port '%s' out of range in FirewallPorts", cp);
result=-1;
@@ -732,65 +775,65 @@ int getconfig(int argc, char **argv, or_options_t *options) {
});
}
options->_AllowUnverified = 0;
- 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 {
- log(LOG_WARN, "Unrecognized value '%s' in AllowUnverifiedNodes",
- cp);
- result=-1;
- }
- });
- }
-
- if(options->SocksPort >= 1 &&
- (options->PathlenCoinWeight < 0.0 || options->PathlenCoinWeight >= 1.0)) {
- log(LOG_WARN,"PathlenCoinWeight option must be >=0.0 and <1.0.");
+ 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 {
+ log(LOG_WARN, "Unrecognized value '%s' in AllowUnverifiedNodes",
+ cp);
+ result=-1;
+ }
+ });
+ }
+
+ if (options->SocksPort >= 1 &&
+ (options->PathlenCoinWeight < 0.0 || options->PathlenCoinWeight >= 1.0)) {
+ log(LOG_WARN, "PathlenCoinWeight option must be >=0.0 and <1.0.");
result = -1;
}
- if(options->MaxConn < 1) {
- log(LOG_WARN,"MaxConn option must be a non-zero positive integer.");
+ if (options->MaxConn < 1) {
+ log(LOG_WARN, "MaxConn option must be a non-zero positive integer.");
result = -1;
}
- if(options->MaxConn >= MAXCONNECTIONS) {
- log(LOG_WARN,"MaxConn option must be less than %d.", MAXCONNECTIONS);
+ if (options->MaxConn >= MAXCONNECTIONS) {
+ log(LOG_WARN, "MaxConn option must be less than %d.", MAXCONNECTIONS);
result = -1;
}
#define MIN_DIRFETCHPOSTPERIOD 60
- if(options->DirFetchPostPeriod < MIN_DIRFETCHPOSTPERIOD) {
- log(LOG_WARN,"DirFetchPostPeriod option must be at least %d.", MIN_DIRFETCHPOSTPERIOD);
+ if (options->DirFetchPostPeriod < MIN_DIRFETCHPOSTPERIOD) {
+ log(LOG_WARN, "DirFetchPostPeriod option must be at least %d.", MIN_DIRFETCHPOSTPERIOD);
result = -1;
}
- if(options->DirFetchPostPeriod > MIN_ONION_KEY_LIFETIME/2) {
- log(LOG_WARN,"DirFetchPostPeriod is too large; clipping.");
- options->DirFetchPostPeriod = MIN_ONION_KEY_LIFETIME/2;
+ if (options->DirFetchPostPeriod > MIN_ONION_KEY_LIFETIME / 2) {
+ log(LOG_WARN, "DirFetchPostPeriod is too large; clipping.");
+ options->DirFetchPostPeriod = MIN_ONION_KEY_LIFETIME / 2;
}
- if(options->KeepalivePeriod < 1) {
+ if (options->KeepalivePeriod < 1) {
log(LOG_WARN,"KeepalivePeriod option must be positive.");
result = -1;
}
- if(options->HttpProxy) { /* parse it now */
- if(parse_addr_port(options->HttpProxy, NULL,
- &options->HttpProxyAddr, &options->HttpProxyPort) < 0) {
+ if (options->HttpProxy) { /* parse it now */
+ if (parse_addr_port(options->HttpProxy, NULL,
+ &options->HttpProxyAddr, &options->HttpProxyPort) < 0) {
log(LOG_WARN,"HttpProxy failed to parse or resolve. Please fix.");
result = -1;
}
options->HttpProxyAddr = ntohl(options->HttpProxyAddr); /* switch to host-order */
- if(options->HttpProxyPort == 0) { /* give it a default */
+ if (options->HttpProxyPort == 0) { /* give it a default */
options->HttpProxyPort = 80;
}
}
@@ -816,11 +859,11 @@ int getconfig(int argc, char **argv, or_options_t *options) {
return result;
}
-static int add_single_log(struct config_line_t *level_opt,
- struct config_line_t *file_opt,
- int isDaemon)
+static int
+add_single_log(struct config_line_t *level_opt,
+ struct config_line_t *file_opt, int isDaemon)
{
- int levelMin=-1, levelMax=-1;
+ int levelMin = -1, levelMax = -1;
char *cp, *tmp_sev;
if (level_opt) {
@@ -828,20 +871,23 @@ static int add_single_log(struct config_line_t *level_opt,
if (cp) {
tmp_sev = tor_strndup(level_opt->value, cp - level_opt->value);
levelMin = parse_log_level(tmp_sev);
- if (levelMin<0) {
- log_fn(LOG_WARN, "Unrecognized log severity '%s': must be one of err|warn|notice|info|debug", tmp_sev);
+ if (levelMin < 0) {
+ log_fn(LOG_WARN, "Unrecognized log severity '%s': must be one of "
+ "err|warn|notice|info|debug", tmp_sev);
return -1;
}
tor_free(tmp_sev);
levelMax = parse_log_level(cp+1);
- if (levelMax<0) {
- log_fn(LOG_WARN, "Unrecognized log severity '%s': must be one of err|warn|notice|info|debug", cp+1);
+ if (levelMax < 0) {
+ log_fn(LOG_WARN, "Unrecognized log severity '%s': must be one of "
+ "err|warn|notice|info|debug", cp+1);
return -1;
}
} else {
levelMin = parse_log_level(level_opt->value);
- if (levelMin<0) {
- log_fn(LOG_WARN, "Unrecognized log severity '%s': must be one of err|warn|notice|info|debug", level_opt->value);
+ if (levelMin < 0) {
+ log_fn(LOG_WARN, "Unrecognized log severity '%s': must be one of "
+ "err|warn|notice|info|debug", level_opt->value);
return -1;
}
@@ -873,7 +919,8 @@ static int add_single_log(struct config_line_t *level_opt,
/**
* Initialize the logs based on the configuration file.
*/
-int config_init_logs(or_options_t *options)
+int
+config_init_logs(or_options_t *options)
{
/* The order of options is: Level? (File Level?)+
*/
@@ -889,11 +936,11 @@ int config_init_logs(or_options_t *options)
/* Special case for if first option is LogLevel. */
if (opt && !strcasecmp(opt->key, "LogLevel")) {
if (opt->next && !strcasecmp(opt->next->key, "LogFile")) {
- if (add_single_log(opt, opt->next, options->RunAsDaemon)<0)
+ if (add_single_log(opt, opt->next, options->RunAsDaemon) < 0)
return -1;
opt = opt->next->next;
} else if (!opt->next) {
- if (add_single_log(opt, NULL, options->RunAsDaemon)<0)
+ if (add_single_log(opt, NULL, options->RunAsDaemon) < 0)
return -1;
opt = opt->next;
} else {
@@ -909,12 +956,12 @@ int config_init_logs(or_options_t *options)
tor_assert(!strcasecmp(opt->key, "LogFile"));
if (opt->next && !strcasecmp(opt->next->key, "LogLevel")) {
/* LogFile followed by LogLevel */
- if (add_single_log(opt->next, opt, options->RunAsDaemon)<0)
+ if (add_single_log(opt->next, opt, options->RunAsDaemon) < 0)
return -1;
opt = opt->next->next;
} else {
/* LogFile followed by LogFile or end of list. */
- if (add_single_log(NULL, opt, options->RunAsDaemon)<0)
+ if (add_single_log(NULL, opt, options->RunAsDaemon) < 0)
return -1;
opt = opt->next;
}
@@ -923,9 +970,10 @@ int config_init_logs(or_options_t *options)
if (options->DebugLogFile) {
log_fn(LOG_WARN, "DebugLogFile is deprecated; use LogFile and LogLevel instead");
- if (add_file_log(LOG_DEBUG, LOG_ERR, options->DebugLogFile)<0)
+ if (add_file_log(LOG_DEBUG, LOG_ERR, options->DebugLogFile) < 0)
return -1;
}
+
return 0;
}
@@ -942,17 +990,20 @@ config_parse_exit_policy(struct config_line_t *cfg,
if (!cfg)
return;
+
nextp = dest;
+
while (*nextp)
nextp = &((*nextp)->next);
entries = smartlist_create();
for (; cfg; cfg = cfg->next) {
- smartlist_split_string(entries,cfg->value,",",SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK,0);
- SMARTLIST_FOREACH(entries, const char *, ent, {
+ smartlist_split_string(entries, cfg->value, ",", SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
+ SMARTLIST_FOREACH(entries, const char *, ent,
+ {
log_fn(LOG_DEBUG,"Adding new entry '%s'",ent);
*nextp = router_parse_exit_policy_from_string(ent);
- if(*nextp) {
+ if (*nextp) {
nextp = &((*nextp)->next);
} else {
log_fn(LOG_WARN,"Malformed exit policy %s; skipping.", ent);
@@ -966,6 +1017,7 @@ config_parse_exit_policy(struct config_line_t *cfg,
void exit_policy_free(struct exit_policy_t *p) {
struct exit_policy_t *e;
+
while (p) {
e = p;
p = p->next;
@@ -981,49 +1033,63 @@ static int parse_dir_server_line(const char *line)
char *addrport, *address=NULL;
uint16_t port;
char digest[DIGEST_LEN];
+
items = smartlist_create();
smartlist_split_string(items, line, " ",
SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 2);
if (smartlist_len(items) < 2) {
- log_fn(LOG_WARN, "Too few arguments to DirServer line."); goto err;
+ log_fn(LOG_WARN, "Too few arguments to DirServer line.");
+ goto err;
}
addrport = smartlist_get(items, 0);
if (parse_addr_port(addrport, &address, NULL, &port)<0) {
- log_fn(LOG_WARN, "Error parsing DirServer address '%s'", addrport);goto err;
+ log_fn(LOG_WARN, "Error parsing DirServer address '%s'", addrport);
+ goto err;
}
if (!port) {
- log_fn(LOG_WARN, "Missing port in DirServe address '%s'",addrport);goto err;
+ log_fn(LOG_WARN, "Missing port in DirServe address '%s'",addrport);
+ goto err;
}
tor_strstrip(smartlist_get(items, 1), " ");
if (strlen(smartlist_get(items, 1)) != HEX_DIGEST_LEN) {
- log_fn(LOG_WARN, "Key digest for DirServer is wrong length."); goto err;
+ log_fn(LOG_WARN, "Key digest for DirServer is wrong length.");
+ goto err;
}
if (base16_decode(digest, DIGEST_LEN,
smartlist_get(items,1), HEX_DIGEST_LEN)<0) {
- log_fn(LOG_WARN, "Unable to decode DirServer key digest."); goto err;
+ log_fn(LOG_WARN, "Unable to decode DirServer key digest.");
+ goto err;
}
- log_fn(LOG_DEBUG, "Trusted dirserver at %s:%d (%s)", address,(int)port,
+ log_fn(LOG_DEBUG, "Trusted dirserver at %s:%d (%s)", address, (int)port,
(char*)smartlist_get(items,1));
add_trusted_dir_server(address, port, digest);
r = 0;
goto done;
- err:
+
+ err:
r = -1;
- done:
+
+ done:
SMARTLIST_FOREACH(items, char*, s, tor_free(s));
smartlist_free(items);
- if (address) tor_free(address);
+
+ if (address)
+ tor_free(address);
+
return r;
}
-const char *get_data_directory(or_options_t *options) {
+const char *
+get_data_directory(or_options_t *options)
+{
const char *d;
- if (options->DataDirectory)
+
+ if (options->DataDirectory) {
d = options->DataDirectory;
- else {
+ } else {
#ifdef MS_WINDOWS
char *p;
p = tor_malloc(MAX_PATH);
@@ -1037,10 +1103,11 @@ const char *get_data_directory(or_options_t *options) {
d = "~/.tor";
#endif
}
- if (d && strncmp(d,"~/",2)==0) {
+
+ if (d && strncmp(d,"~/",2) == 0) {
char *fn = expand_filename(d);
- if(!fn) {
- log_fn(LOG_ERR,"Failed to expand filename '%s'. Exiting.",d);
+ if (!fn) {
+ log_fn(LOG_ERR,"Failed to expand filename '%s'. Exiting.", d);
exit(1);
}
tor_free(options->DataDirectory);
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion