aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/common/compat.c23
-rw-r--r--src/common/compat.h9
-rw-r--r--src/common/log.c20
-rw-r--r--src/common/log.h56
-rw-r--r--src/common/tortls.c4
-rw-r--r--src/common/tortls.h2
-rw-r--r--src/common/util.c14
-rw-r--r--src/common/util.h32
-rw-r--r--src/or/circuitlist.c2
-rw-r--r--src/or/config.c488
-rw-r--r--src/or/connection_or.c64
-rw-r--r--src/or/or.h4
-rw-r--r--src/or/routerparse.c2
-rw-r--r--src/tools/tor-resolve.c4
14 files changed, 346 insertions, 378 deletions
diff --git a/src/common/compat.c b/src/common/compat.c
index 6a8368fef..69b58b619 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -177,6 +177,7 @@ tor_memmem(const void *_haystack, size_t hlen, const void *_needle, size_t nlen)
#endif
}
+#ifdef MS_WINDOWS
/** Take a filename and return a pointer to its final element. This
* function is called on __FILE__ to fix a MSVC nit where __FILE__
* contains the full path to the file. This is bad, because it
@@ -184,7 +185,7 @@ tor_memmem(const void *_haystack, size_t hlen, const void *_needle, size_t nlen)
* compiled the binary in their warrning messages.
*/
const char *
-_tor_fix_source_file(const char *fname)
+tor_fix_source_file(const char *fname)
{
const char *cp1, *cp2, *r;
cp1 = strrchr(fname, '/');
@@ -200,6 +201,7 @@ _tor_fix_source_file(const char *fname)
}
return r;
}
+#endif
#ifndef UNALIGNED_INT_ACCESS_OK
/**
@@ -499,7 +501,7 @@ switch_id(char *user, char *group)
if (user) {
pw = getpwnam(user);
if (pw == NULL) {
- err("User '%s' not found.", user);
+ err(LD_CONFIG,"User '%s' not found.", user);
return -1;
}
}
@@ -508,17 +510,17 @@ switch_id(char *user, char *group)
if (group) {
gr = getgrnam(group);
if (gr == NULL) {
- err("Group '%s' not found.", group);
+ err(LD_CONFIG,"Group '%s' not found.", group);
return -1;
}
if (setgid(gr->gr_gid) != 0) {
- err("Error setting GID: %s", strerror(errno));
+ err(LD_GENERAL,"Error setting GID: %s", strerror(errno));
return -1;
}
} else if (user) {
if (setgid(pw->pw_gid) != 0) {
- err("Error setting GID: %s", strerror(errno));
+ err(LD_GENERAL,"Error setting GID: %s", strerror(errno));
return -1;
}
}
@@ -527,7 +529,7 @@ switch_id(char *user, char *group)
privileges */
if (user) {
if (setuid(pw->pw_uid) != 0) {
- err("Error setting UID: %s", strerror(errno));
+ err(LD_GENERAL,"Error setting UID: %s", strerror(errno));
return -1;
}
}
@@ -535,8 +537,7 @@ switch_id(char *user, char *group)
return 0;
#endif
- err("User or group specified, but switching users is not supported.");
-
+ err(LD_CONFIG,"User or group specified, but switching users is not supported.");
return -1;
}
@@ -550,7 +551,7 @@ get_user_homedir(const char *username)
tor_assert(username);
if (!(pw = getpwnam(username))) {
- err("User \"%s\" not found.", username);
+ err(LD_CONFIG,"User \"%s\" not found.", username);
return NULL;
}
return tor_strdup(pw->pw_dir);
@@ -894,7 +895,7 @@ tor_gettimeofday(struct timeval *timeval)
/* number of 100-nsec units since Jan 1, 1601 */
GetSystemTimeAsFileTime(&ft.ft_ft);
if (ft.ft_64 < EPOCH_BIAS) {
- err("System time is before 1970; failing.");
+ err(LD_GENERAL,"System time is before 1970; failing.");
exit(1);
}
ft.ft_64 -= EPOCH_BIAS;
@@ -902,7 +903,7 @@ tor_gettimeofday(struct timeval *timeval)
timeval->tv_usec = (unsigned) ((ft.ft_64 / UNITS_PER_USEC) % USEC_PER_SEC);
#elif defined(HAVE_GETTIMEOFDAY)
if (gettimeofday(timeval, NULL)) {
- err("gettimeofday failed.");
+ err(LD_GENERAL,"gettimeofday failed.");
/* If gettimeofday dies, we have either given a bad timezone (we didn't),
or segfaulted.*/
exit(1);
diff --git a/src/common/compat.h b/src/common/compat.h
index 4e8d4b180..314477894 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -100,8 +100,13 @@ const void *tor_memmem(const void *haystack, size_t hlen, const void *needle,
#define TOR_ISDIGIT(c) isdigit((int)(unsigned char)(c))
#define TOR_ISPRINT(c) isprint((int)(unsigned char)(c))
-#define _SHORT_FILE_ (_tor_fix_source_file(__FILE__))
-const char *_tor_fix_source_file(const char *fname);
+#ifdef MS_WINDOWS
+#define _SHORT_FILE_ (tor_fix_source_file(__FILE__))
+const char *tor_fix_source_file(const char *fname);
+#else
+#define _SHORT_FILE_ (__FILE__)
+#define tor_fix_source_file(s) (s)
+#endif
/* ===== Time compatibility */
#if !defined(HAVE_GETTIMEOFDAY) && !defined(HAVE_STRUCT_TIMEVAL_TV_SEC)
diff --git a/src/common/log.c b/src/common/log.c
index 3bdd55a48..aa167ac57 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -184,7 +184,7 @@ format_msg(char *buf, size_t buf_len,
* message. The actual message is derived as from tor_snprintf(format,ap).
*/
static void
-logv(int severity, int domain, const char *funcname, const char *format,
+logv(int severity, unsigned int domain, const char *funcname, const char *format,
va_list ap)
{
char buf[10024];
@@ -234,7 +234,7 @@ logv(int severity, int domain, const char *funcname, const char *format,
/** Output a message to the log. */
void
-_log(int severity, int domain, const char *format, ...)
+_log(int severity, unsigned int domain, const char *format, ...)
{
va_list ap;
va_start(ap,format);
@@ -245,7 +245,7 @@ _log(int severity, int domain, const char *format, ...)
/** Output a message to the log, prefixed with a function name <b>fn</b>. */
#ifdef __GNUC__
void
-_log_fn(int severity, int domain, const char *fn, const char *format, ...)
+_log_fn(int severity, unsigned int domain, const char *fn, const char *format, ...)
{
va_list ap;
va_start(ap,format);
@@ -255,7 +255,7 @@ _log_fn(int severity, int domain, const char *fn, const char *format, ...)
#else
const char *_log_fn_function_name=NULL;
void
-_log_fn(int severity, int domain, const char *format, ...)
+_log_fn(int severity, unsigned int domain, const char *format, ...)
{
va_list ap;
va_start(ap,format);
@@ -264,7 +264,7 @@ _log_fn(int severity, int domain, const char *format, ...)
_log_fn_function_name = NULL;
}
void
-_debug(int domain, const char *format, ...)
+_debug(unsigned int domain, const char *format, ...)
{
va_list ap;
va_start(ap,format);
@@ -273,7 +273,7 @@ _debug(int domain, const char *format, ...)
_log_fn_function_name = NULL;
}
void
-_info(int domain, const char *format, ...)
+_info(unsigned int domain, const char *format, ...)
{
va_list ap;
va_start(ap,format);
@@ -282,7 +282,7 @@ _info(int domain, const char *format, ...)
_log_fn_function_name = NULL;
}
void
-_notice(int domain, const char *format, ...)
+_notice(unsigned int domain, const char *format, ...)
{
va_list ap;
va_start(ap,format);
@@ -291,7 +291,7 @@ _notice(int domain, const char *format, ...)
_log_fn_function_name = NULL;
}
void
-_warn(int domain, const char *format, ...)
+_warn(unsigned int domain, const char *format, ...)
{
va_list ap;
va_start(ap,format);
@@ -300,11 +300,11 @@ _warn(int domain, const char *format, ...)
_log_fn_function_name = NULL;
}
void
-_err(const char *format, ...)
+_err(unsigned int domain, const char *format, ...)
{
va_list ap;
va_start(ap,format);
- logv(LOG_ERR, LD_GENERAL, _log_fn_function_name, format, ap);
+ logv(LOG_ERR, domain, _log_fn_function_name, format, ap);
va_end(ap);
_log_fn_function_name = NULL;
}
diff --git a/src/common/log.h b/src/common/log.h
index b06ea248f..0cd6dd442 100644
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -53,39 +53,41 @@
/* Logging domains */
/** Catch-all for miscellaneous events and fatal errors */
-#define LD_GENERAL 0
+#define LD_GENERAL (1u<<0)
/** The cryptography subsytem */
-#define LD_CRYPTO 1
+#define LD_CRYPTO (1u<<1)
/** Networking */
-#define LD_NET 2
+#define LD_NET (1u<<2)
/** Parsing and acting on our configuration */
-#define LD_CONFIG 3
+#define LD_CONFIG (1u<<3)
/** Reading and writing from the filesystem */
-#define LD_FS 4
+#define LD_FS (1u<<4)
/** Other servers' (non)compliance with the Tor protocol */
-#define LD_PROTOCOL 5
+#define LD_PROTOCOL (1u<<5)
/** Memory management */
-#define LD_MM 6
+#define LD_MM (1u<<6)
/** HTTP implementation */
-#define LD_HTTP 7
+#define LD_HTTP (1u<<7)
/** Application (socks) requests */
-#define LD_APP 8
+#define LD_APP (1u<<8)
/** Communication via the controller protocol */
-#define LD_CONTROL 9
+#define LD_CONTROL (1u<<9)
/** Building, using, and managing circuits */
-#define LD_CIRC 10
+#define LD_CIRC (1u<<10)
/** Hidden services */
-#define LD_REND 11
+#define LD_REND (1u<<11)
/** Internal errors in this Tor process. */
-#define LD_BUG 12
+#define LD_BUG (1u<<12)
/** Learning and using information about Tor servers. */
-#define LD_DIR 13
+#define LD_DIR (1u<<13)
/** Learning and using information about Tor servers. */
-#define LD_DIRSERV 14
+#define LD_DIRSERV (1u<<14)
/** Onion routing protocol. */
-#define LD_OR 15
+#define LD_OR (1u<<15)
+/** Connections leaving Tor, other exit stuff. */
+#define LD_EXIT (1u<<16)
-typedef void (*log_callback)(int severity, int domain, const char *msg);
+typedef void (*log_callback)(int severity, unsigned int domain, const char *msg);
int parse_log_level(const char *level);
const char *log_level_to_string(int level);
@@ -108,10 +110,10 @@ void change_callback_log_severity(int loglevelMin, int loglevelMax,
log_callback cb);
/* Outputs a message to stdout */
-void _log(int severity, int domain, const char *format, ...) CHECK_PRINTF(3,4);
+void _log(int severity, unsigned int domain, const char *format, ...) CHECK_PRINTF(3,4);
#ifdef __GNUC__
-void _log_fn(int severity, int domain,
+void _log_fn(int severity, unsigned int domain,
const char *funcname, const char *format, ...)
CHECK_PRINTF(4,5);
/** Log a message at level <b>severity</b>, using a pretty-printed version
@@ -134,16 +136,16 @@ void _log_fn(int severity, int domain,
_log_fn(LOG_INFO, domain, __PRETTY_FUNCTION__, args)
#define warn(domain, args...) \
_log_fn(LOG_INFO, domain, __PRETTY_FUNCTION__, args)
-#define err(args...) \
- _log_fn(LOG_ERR, LD_GENERAL, __PRETTY_FUNCTION__, args)
+#define err(domain, args...) \
+ _log_fn(LOG_ERR, domain, __PRETTY_FUNCTION__, args)
#else
-void _log_fn(int severity, int domain, const char *format, ...);
-void _debug(int domain, const char *format, ...);
-void _info(int domain, const char *format, ...);
-void _notice(int domain, const char *format, ...);
-void _warn(int domain, const char *format, ...);
-void _err(const char *format, ...);
+void _log_fn(int severity, unsigned int domain, const char *format, ...);
+void _debug(unsigned int domain, const char *format, ...);
+void _info(unsigned int domain, const char *format, ...);
+void _notice(unsigned int domain, const char *format, ...);
+void _warn(unsigned int domain, const char *format, ...);
+void _err(unsigned int domain, const char *format, ...);
#define log _log /* hack it so we don't conflict with log() as much */
diff --git a/src/common/tortls.c b/src/common/tortls.c
index a4cd730b3..00e7d22e9 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -866,8 +866,8 @@ _check_no_tls_errors(const char *fname, int line)
{
if (ERR_peek_error() == 0)
return;
- log_fn(LOG_WARN, LD_CRYPTO, "Unhandled OpenSSL errors found at %s:%d: ",
- fname, line);
+ log(LOG_WARN, LD_CRYPTO, "Unhandled OpenSSL errors found at %s:%d: ",
+ tor_fix_source_file(fname), line);
tls_log_errors(LOG_WARN, NULL);
}
diff --git a/src/common/tortls.h b/src/common/tortls.h
index 8166a8dbb..95545fe97 100644
--- a/src/common/tortls.h
+++ b/src/common/tortls.h
@@ -46,7 +46,7 @@ unsigned long tor_tls_get_n_bytes_written(tor_tls_t *tls);
/* Log and abort if there are unhandled TLS errors in OpenSSL's error stack.
*/
-#define check_no_tls_errors() _check_no_tls_errors(_SHORT_FILE_,__LINE__)
+#define check_no_tls_errors() _check_no_tls_errors(__FILE__,__LINE__)
void _check_no_tls_errors(const char *fname, int line);
diff --git a/src/common/util.c b/src/common/util.c
index 09fdd9841..dd289ff25 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -127,7 +127,7 @@ _tor_malloc(size_t size DMALLOC_PARAMS)
result = dmalloc_malloc(file, line, size, DMALLOC_FUNC_MALLOC, 0, 0);
if (!result) {
- err("Out of memory. Dying.");
+ err(LD_MM,"Out of memory. Dying.");
/* XXX if these functions die within a worker process, they won't
* call spawn_exit */
exit(1);
@@ -159,7 +159,7 @@ _tor_realloc(void *ptr, size_t size DMALLOC_PARAMS)
result = dmalloc_realloc(file, line, ptr, size, DMALLOC_FUNC_REALLOC, 0);
if (!result) {
- err("Out of memory. Dying.");
+ err(LD_MM,"Out of memory. Dying.");
exit(1);
}
return result;
@@ -177,7 +177,7 @@ _tor_strdup(const char *s DMALLOC_PARAMS)
dup = dmalloc_strdup(file, line, s, 0);
if (!dup) {
- err("Out of memory. Dying.");
+ err(LD_MM,"Out of memory. Dying.");
exit(1);
}
return dup;
@@ -1594,7 +1594,7 @@ start_daemon(void)
pipe(daemon_filedes);
pid = fork();
if (pid < 0) {
- err("fork failed. Exiting.");
+ err(LD_GENERAL,"fork failed. Exiting.");
exit(1);
}
if (pid) { /* Parent */
@@ -1649,14 +1649,14 @@ finish_daemon(const char *desired_cwd)
desired_cwd = "/";
/* Don't hold the wrong FS mounted */
if (chdir(desired_cwd) < 0) {
- err("chdir to \"%s\" failed. Exiting.",desired_cwd);
+ err(LD_GENERAL,"chdir to \"%s\" failed. Exiting.",desired_cwd);
exit(1);
}
nullfd = open("/dev/null",
O_CREAT | O_RDWR | O_APPEND);
if (nullfd < 0) {
- err("/dev/null can't be opened. Exiting.");
+ err(LD_GENERAL,"/dev/null can't be opened. Exiting.");
exit(1);
}
/* close fds linking to invoking terminal, but
@@ -1666,7 +1666,7 @@ finish_daemon(const char *desired_cwd)
if (dup2(nullfd,0) < 0 ||
dup2(nullfd,1) < 0 ||
dup2(nullfd,2) < 0) {
- err("dup2 failed. Exiting.");
+ err(LD_GENERAL,"dup2 failed. Exiting.");
exit(1);
}
if (nullfd > 2)
diff --git a/src/common/util.h b/src/common/util.h
index 1019b5807..c80bbd666 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -39,23 +39,23 @@
#error "Sorry; we don't support building with NDEBUG."
#else
#ifdef OLD_LOG_INTERFACE
-#define tor_assert(expr) do { \
- if (!(expr)) { \
- log(LOG_ERR, "%s:%d: %s: Assertion %s failed; aborting.", \
- _SHORT_FILE_, __LINE__, __FUNCTION__, #expr); \
- fprintf(stderr,"%s:%d %s: Assertion %s failed; aborting.\n", \
- _SHORT_FILE_, __LINE__, __FUNCTION__, #expr); \
- abort(); /* unreached */ \
- } } while (0)
+#define tor_assert(expr) do { \
+ if (!(expr)) { \
+ log(LOG_ERR, "%s:%d: %s: Assertion %s failed; aborting.", \
+ _SHORT_FILE_, __LINE__, __FUNCTION__, #expr); \
+ fprintf(stderr,"%s:%d %s: Assertion %s failed; aborting.\n", \
+ _SHORT_FILE_, __LINE__, __FUNCTION__, #expr); \
+ abort(); /* unreached */ \
+ } } while (0)
#else
-#define tor_assert(expr) do { \
- if (!(expr)) { \
- log(LOG_ERR, LD_GENERAL, "%s:%d: %s: Assertion %s failed; aborting.", \
- _SHORT_FILE_, __LINE__, __FUNCTION__, #expr); \
- fprintf(stderr,"%s:%d %s: Assertion %s failed; aborting.\n", \
- _SHORT_FILE_, __LINE__, __FUNCTION__, #expr); \
- abort(); /* unreached */ \
- } } while (0)
+#define tor_assert(expr) do { \
+ if (!(expr)) { \
+ log(LOG_ERR, LD_BUG, "%s:%d: %s: Assertion %s failed; aborting.", \
+ _SHORT_FILE_, __LINE__, __FUNCTION__, #expr); \
+ fprintf(stderr,"%s:%d %s: Assertion %s failed; aborting.\n", \
+ _SHORT_FILE_, __LINE__, __FUNCTION__, #expr); \
+ abort(); /* unreached */ \
+ } } while (0)
#endif
#endif
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 68b174404..7f10ee6db 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -731,7 +731,7 @@ assert_cpath_layer_ok(const crypt_path_t *cp)
/* tor_assert(cp->dh_handshake_state); */
break;
default:
- err("Unexpected state %d",cp->state);
+ log_fn(LOG_ERR, LD_BUG, "Unexpected state %d", cp->state);
tor_assert(0);
}
tor_assert(cp->package_window >= 0);
diff --git a/src/or/config.c b/src/or/config.c
index 96c4b3753..878fcac4a 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -10,6 +10,7 @@ const char config_c_id[] = "$Id$";
* \brief Code to parse and interpret configuration files.
**/
+#define NEW_LOG_INTERFACE
#include "or.h"
#ifdef MS_WINDOWS
#include <shlobj.h>
@@ -389,7 +390,8 @@ set_options(or_options_t *new_val)
return -1;
}
if (options_act(old_options) < 0) { /* acting on the options failed. die. */
- log_fn(LOG_ERR,"Acting on config options left us in a broken state. Dying.");
+ err(LD_CONFIG,
+ "Acting on config options left us in a broken state. Dying.");
exit(1);
}
if (old_options)
@@ -467,7 +469,7 @@ options_act_reversible(or_options_t *old_options)
/* Ensure data directory is private; create if possible. */
if (check_private_dir(options->DataDirectory, CPD_CREATE)<0) {
- log_fn(LOG_ERR, "Couldn't access/create private data directory \"%s\"",
+ err(LD_FS, "Couldn't access/create private data directory \"%s\"",
options->DataDirectory);
/* No need to roll back, since you can't change the value. */
goto done;
@@ -485,7 +487,7 @@ options_act_reversible(or_options_t *old_options)
set_conn_limit = 1;
if (retry_all_listeners(0, replaced_listeners, new_listeners) < 0) {
- log_fn(LOG_ERR,"Failed to bind one of the listener ports.");
+ err(LD_CONFIG, "Failed to bind one of the listener ports.");
goto rollback;
}
@@ -493,7 +495,7 @@ options_act_reversible(or_options_t *old_options)
r = 0;
SMARTLIST_FOREACH(replaced_listeners, connection_t *, conn,
{
- log_fn(LOG_NOTICE, "Closing old %s on %s:%d",
+ notice(LD_NET, "Closing old %s on %s:%d",
conn_type_to_string(conn->type), conn->address, conn->port);
connection_close_immediate(conn);
connection_mark_for_close(conn);
@@ -508,7 +510,7 @@ options_act_reversible(or_options_t *old_options)
SMARTLIST_FOREACH(new_listeners, connection_t *, conn,
{
- log_fn(LOG_NOTICE, "Closing %s on %s:%d",
+ notice(LD_NET, "Closing %s on %s:%d",
conn_type_to_string(conn->type), conn->address, conn->port);
connection_close_immediate(conn);
connection_mark_for_close(conn);
@@ -541,15 +543,15 @@ options_act(or_options_t *old_options)
clear_trusted_dir_servers();
for (cl = options->DirServers; cl; cl = cl->next) {
if (parse_dir_server_line(cl->value, 0)<0) {
- log_fn(LOG_ERR,
- "Bug: Previously validated DirServer line could not be added!");
+ err(LD_BUG,
+ "Bug: Previously validated DirServer line could not be added!");
return -1;
}
}
if (running_tor && rend_config_services(options, 0)<0) {
- log_fn(LOG_ERR,
- "Bug: Previously validated hidden services line could not be added!");
+ err(LD_BUG,
+ "Bug: Previously validated hidden services line could not be added!");
return -1;
}
@@ -561,8 +563,8 @@ options_act(or_options_t *old_options)
fn = tor_malloc(len);
tor_snprintf(fn, len, "%s/cached-status", options->DataDirectory);
if (check_private_dir(fn, CPD_CREATE) != 0) {
- log_fn(LOG_ERR, "Couldn't access/create private data directory \"%s\"",
- fn);
+ err(LD_CONFIG,
+ "Couldn't access/create private data directory \"%s\"", fn);
tor_free(fn);
return -1;
}
@@ -622,13 +624,13 @@ options_act(or_options_t *old_options)
/* reload keys as needed for rendezvous services. */
if (rend_service_load_keys()<0) {
- log_fn(LOG_ERR,"Error loading rendezvous service keys");
+ err(LD_GENERAL,"Error loading rendezvous service keys");
return -1;
}
/* Set up accounting */
if (accounting_parse_options(options, 0)<0) {
- log_fn(LOG_ERR,"Error in accounting options");
+ err(LD_CONFIG,"Error in accounting options");
return -1;
}
if (accounting_is_enabled(options))
@@ -640,13 +642,13 @@ options_act(or_options_t *old_options)
/* Check for transitions that need action. */
if (old_options) {
if (options->UseHelperNodes && !old_options->UseHelperNodes) {
- log_fn(LOG_INFO, "Switching to helper nodes; abandoning previous circuits");
+ info(LD_CIRC,"Switching to helper nodes; abandoning previous circuits");
circuit_mark_all_unused_circs();
circuit_expire_all_dirty_circs();
}
if (options_transition_affects_workers(old_options, options)) {
- log_fn(LOG_INFO,"Worker-related options changed. Rotating workers.");
+ info(LD_GENERAL,"Worker-related options changed. Rotating workers.");
cpuworkers_rotate();
dnsworkers_rotate();
}
@@ -682,7 +684,7 @@ expand_abbrev(config_format_t *fmt, const char *option, int command_line,
if (!strcasecmp(option,fmt->abbrevs[i].abbreviated) &&
(command_line || !fmt->abbrevs[i].commandline_only)) {
if (warn_obsolete && fmt->abbrevs[i].warn) {
- log_fn(LOG_WARN,
+ warn(LD_CONFIG,
"The configuration option '%s' is deprecated; use '%s' instead.",
fmt->abbrevs[i].abbreviated,
fmt->abbrevs[i].full);
@@ -717,7 +719,7 @@ config_get_commandlines(int argc, char **argv, config_line_t **result)
continue;
}
if (i == argc-1) {
- log_fn(LOG_WARN,"Command-line option '%s' with no value. Failing.",
+ warn(LD_CONFIG,"Command-line option '%s' with no value. Failing.",
argv[i]);
config_free_lines(front);
return -1;
@@ -732,7 +734,7 @@ config_get_commandlines(int argc, char **argv, config_line_t **result)
(*new)->key = tor_strdup(expand_abbrev(&options_format, s, 1, 1));
(*new)->value = tor_strdup(argv[i+1]);
(*new)->next = NULL;
- log(LOG_DEBUG,"Commandline: parsed keyword '%s', value '%s'",
+ log(LOG_DEBUG, LD_CONFIG, "Commandline: parsed keyword '%s', value '%s'",
(*new)->key, (*new)->value);
new = &((*new)->next);
@@ -844,7 +846,7 @@ config_find_option(config_format_t *fmt, const char *key)
/* If none, check for an abbreviated match */
for (i=0; fmt->vars[i].name; ++i) {
if (!strncasecmp(key, fmt->vars[i].name, keylen)) {
- log_fn(LOG_WARN, "The abbreviation '%s' is deprecated. "
+ warn(LD_CONFIG, "The abbreviation '%s' is deprecated. "
"Please use '%s' instead",
key, fmt->vars[i].name);
return &fmt->vars[i];
@@ -883,8 +885,8 @@ config_assign_value(config_format_t *fmt, or_options_t *options,
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.",
- c->key,c->value);
+ log(LOG_WARN, LD_CONFIG,
+ "Int keyword '%s %s' is malformed or out of bounds.", c->key, c->value);
return -1;
}
*(int *)lvalue = i;
@@ -911,7 +913,7 @@ config_assign_value(config_format_t *fmt, or_options_t *options,
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.", c->key);
+ log(LOG_WARN, LD_CONFIG, "Boolean keyword '%s' expects 0 or 1.", c->key);
return -1;
}
*(int *)lvalue = i;
@@ -928,7 +930,8 @@ config_assign_value(config_format_t *fmt, or_options_t *options,
case CONFIG_TYPE_ISOTIME:
if (parse_iso_time(c->value, (time_t *)lvalue)) {
- log(LOG_WARN, "Invalid time '%s' for keyword '%s'", c->value, c->key);
+ log(LOG_WARN, LD_CONFIG,
+ "Invalid time '%s' for keyword '%s'", c->value, c->key);
return -1;
}
break;
@@ -951,10 +954,10 @@ config_assign_value(config_format_t *fmt, or_options_t *options,
break;
case CONFIG_TYPE_OBSOLETE:
- log_fn(LOG_WARN, "Skipping obsolete configuration option '%s'", c->key);
+ warn(LD_CONFIG, "Skipping obsolete configuration option '%s'", c->key);
break;
case CONFIG_TYPE_LINELIST_V:
- log_fn(LOG_WARN, "Can't provide value for virtual option '%s'", c->key);
+ warn(LD_CONFIG, "Can't provide value for virtual option '%s'", c->key);
return -1;
default:
tor_assert(0);
@@ -982,7 +985,7 @@ config_assign_line(config_format_t *fmt, or_options_t *options,
var = config_find_option(fmt, c->key);
if (!var) {
- log_fn(LOG_WARN, "Unknown option '%s'. Failing.", c->key);
+ warn(LD_CONFIG, "Unknown option '%s'. Failing.", c->key);
return -1;
}
/* Put keyword into canonical case. */
@@ -1072,10 +1075,11 @@ get_assigned_option(config_format_t *fmt, or_options_t *options, const char *key
var = config_find_option(fmt, key);
if (!var) {
- log_fn(LOG_WARN, "Unknown option '%s'. Failing.", key);
+ warn(LD_CONFIG, "Unknown option '%s'. Failing.", key);
return NULL;
} else if (var->type == CONFIG_TYPE_LINELIST_S) {
- log_fn(LOG_WARN, "Can't return context-sensitive '%s' on its own", key);
+ warn(LD_CONFIG,
+ "Can't return context-sensitive '%s' on its own", key);
return NULL;
}
value = ((char*)options) + var->var_offset;
@@ -1134,14 +1138,15 @@ get_assigned_option(config_format_t *fmt, or_options_t *options, const char *key
result->value = tor_strdup("");
break;
case CONFIG_TYPE_OBSOLETE:
- log_fn(LOG_WARN,"You asked me for the value of an obsolete config option '%s'.", key);
+ warn(LD_CONFIG,
+ "You asked me for the value of an obsolete config option '%s'.", key);
tor_free(result->key);
tor_free(result);
return NULL;
default:
tor_free(result->key);
tor_free(result);
- log_fn(LOG_WARN,"Bug: unknown type %d for known key '%s'", var->type, key);
+ warn(LD_BUG,"Bug: unknown type %d for known key '%s'", var->type, key);
return NULL;
}
@@ -1388,10 +1393,10 @@ resolve_my_address(or_options_t *options, uint32_t *addr_out, char **hostname_ou
explicit_ip = 0; /* it's implicit */
if (gethostname(hostname, sizeof(hostname)) < 0) {
- log_fn(LOG_WARN,"Error obtaining local hostname");
+ warn(LD_NET,"Error obtaining local hostname");
return -1;
}
- log_fn(LOG_DEBUG,"Guessed local host name as '%s'",hostname);
+ debug(LD_CONFIG,"Guessed local host name as '%s'",hostname);
}
/* now we know hostname. resolve it and keep only the IP */
@@ -1401,7 +1406,7 @@ resolve_my_address(or_options_t *options, uint32_t *addr_out, char **hostname_ou
explicit_ip = 0;
rent = (struct hostent *)gethostbyname(hostname);
if (!rent) {
- log_fn(LOG_WARN,"Could not resolve local Address '%s'. Failing.", hostname);
+ warn(LD_CONFIG,"Could not resolve local Address '%s'. Failing.",hostname);
return -1;
}
tor_assert(rent->h_length == 4);
@@ -1413,25 +1418,25 @@ resolve_my_address(or_options_t *options, uint32_t *addr_out, char **hostname_ou
/* make sure we're ok with publishing an internal IP */
if (!options->DirServers) {
/* if they are using the default dirservers, disallow internal IPs always. */
- log_fn(LOG_WARN,"Address '%s' resolves to private IP '%s'. "
- "Tor servers that use the default DirServers must have public IP addresses.",
- hostname, tmpbuf);
+ warn(LD_CONFIG,"Address '%s' resolves to private IP '%s'. "
+ "Tor servers that use the default DirServers must have public IP addresses.",
+ hostname, tmpbuf);
return -1;
}
if (!explicit_ip) {
/* even if they've set their own dirservers, require an explicit IP if
* they're using an internal address. */
- 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, tmpbuf);
+ 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);
return -1;
}
}
- log_fn(LOG_DEBUG, "Resolved Address to '%s'.", tmpbuf);
+ debug(LD_CONFIG, "Resolved Address to '%s'.", tmpbuf);
*addr_out = ntohl(in.s_addr);
if (old_addr && old_addr != *addr_out) {
- log_fn(LOG_NOTICE,"Your IP seems to have changed. Updating.");
+ notice(LD_NET, "Your IP seems to have changed. Updating.");
server_has_changed_ip();
}
old_addr = *addr_out;
@@ -1449,7 +1454,7 @@ get_default_nickname(void)
char *cp, *out, *outp;
if (gethostname(localhostname, sizeof(localhostname)) < 0) {
- log_fn(LOG_WARN,"Error obtaining local hostname");
+ warn(LD_NET,"Error obtaining local hostname");
return NULL;
}
@@ -1546,8 +1551,8 @@ options_dup(config_format_t *fmt, or_options_t *old)
line = get_assigned_option(fmt, old, fmt->vars[i].name);
if (line) {
if (config_assign(fmt, newopts, line, 0, 0) < 0) {
- log_fn(LOG_WARN,"Bug: config_get_assigned_option() generated "
- "something we couldn't config_assign().");
+ warn(LD_BUG, "Bug: config_get_assigned_option() generated "
+ "something we couldn't config_assign().");
tor_assert(0);
}
}
@@ -1627,7 +1632,7 @@ config_dump(config_format_t *fmt, void *options, int minimal)
char *tmp;
tmp = tor_malloc(len);
if (tor_snprintf(tmp, len, "%s %s\n", line->key, line->value)<0) {
- log_fn(LOG_ERR, "Internal error writing log option");
+ err(LD_BUG,"Internal error writing log option");
tor_assert(0);
}
smartlist_add(elements, tmp);
@@ -1668,7 +1673,7 @@ validate_ports_csv(smartlist_t *sl, const char *name)
{
i = atoi(cp);
if (i < 1 || i > 65535) {
- log(LOG_WARN, "Port '%s' out of range in %s", cp, name);
+ log(LOG_WARN, LD_CONFIG, "Port '%s' out of range in %s", cp, name);
result=-1;
}
});
@@ -1687,7 +1692,7 @@ parse_reachable_addresses(void)
if (config_parse_addr_policy(options->ReachableAddresses,
&reachable_addr_policy,
ADDR_POLICY_ACCEPT)) {
- log_fn(LOG_WARN, "Error in ReachableAddresses entry; ignoring.");
+ warn(LD_CONFIG, "Error in ReachableAddresses entry; ignoring.");
return;
}
}
@@ -1717,7 +1722,7 @@ fascist_firewall_allows_address(uint32_t addr, uint16_t port)
case ADDR_POLICY_REJECTED:
return 0;
default:
- log_fn(LOG_WARN, "Unexpected result: %d", (int)p);
+ warn(LD_BUG, "Unexpected result: %d", (int)p);
return 0;
}
}
@@ -1731,45 +1736,39 @@ options_validate(or_options_t *options)
int result = 0;
config_line_t *cl;
addr_policy_t *addr_policy=NULL;
+#define REJECT(arg) do { log(LOG_WARN, LD_CONFIG, arg); result = -1; } while (0)
+#define COMPLAIN(arg) do { log(LOG_WARN, LD_CONFIG, arg); } while (0)
- if (options->ORPort < 0 || options->ORPort > 65535) {
- log(LOG_WARN, "ORPort option out of bounds.");
- result = -1;
- }
+ if (options->ORPort < 0 || options->ORPort > 65535)
+ REJECT("ORPort option out of bounds.");
- if (options->ORPort == 0 && options->ORListenAddress != NULL) {
- log(LOG_WARN, "ORPort must be defined if ORListenAddress is defined.");
- result = -1;
- }
- if (options->DirPort == 0 && options->DirListenAddress != NULL) {
- log(LOG_WARN, "DirPort must be defined if DirListenAddress is defined.");
- result = -1;
- }
- if (options->SocksPort == 0 && options->SocksListenAddress != NULL) {
- log(LOG_WARN, "SocksPort must be defined if SocksListenAddress is defined.");
- result = -1;
- }
+ if (options->ORPort == 0 && options->ORListenAddress != NULL)
+ REJECT("ORPort must be defined if ORListenAddress is defined.");
- if (validate_data_directory(options)<0) {
- log(LOG_WARN, "Invalid DataDirectory");
- result = -1;
- }
+ if (options->DirPort == 0 && options->DirListenAddress != NULL)
+ REJECT("DirPort must be defined if DirListenAddress is defined.");
+
+ if (options->SocksPort == 0 && options->SocksListenAddress != NULL)
+ REJECT("SocksPort must be defined if SocksListenAddress is defined.");
+
+ if (validate_data_directory(options)<0)
+ REJECT("Invalid DataDirectory");
if (options->Nickname == NULL) {
if (server_mode(options)) {
if (!(options->Nickname = get_default_nickname()))
return -1;
- log_fn(LOG_NOTICE, "Choosing default nickname '%s'", options->Nickname);
+ notice(LD_CONFIG, "Choosing default nickname '%s'", options->Nickname);
}
} else {
if (!is_legal_nickname(options->Nickname)) {
- log_fn(LOG_WARN, "Nickname '%s' is wrong length or contains illegal characters.", options->Nickname);
+ log(LOG_WARN, LD_CONFIG, "Nickname '%s' is wrong length or contains illegal characters.", options->Nickname);
result = -1;
}
}
if (server_mode(options) && !options->ContactInfo)
- log_fn(LOG_NOTICE,"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.");
+ 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.");
if (normalize_log_options(options))
return -1;
@@ -1789,45 +1788,31 @@ options_validate(or_options_t *options)
result = -1;
}
- if (options->SocksPort < 0 || options->SocksPort > 65535) {
- log(LOG_WARN, "SocksPort option out of bounds.");
- result = -1;
- }
+ if (options->SocksPort < 0 || options->SocksPort > 65535)
+ REJECT("SocksPort option out of bounds.");
- if (options->SocksPort == 0 && options->ORPort == 0) {
- log(LOG_WARN, "SocksPort and ORPort are both undefined? Quitting.");
- result = -1;
- }
+ if (options->SocksPort == 0 && options->ORPort == 0)
+ REJECT("SocksPort and ORPort are both undefined? Quitting.");
- if (options->ControlPort < 0 || options->ControlPort > 65535) {
- log(LOG_WARN, "ControlPort option out of bounds.");
- result = -1;
- }
+ if (options->ControlPort < 0 || options->ControlPort > 65535)
+ REJECT("ControlPort option out of bounds.");
- if (options->DirPort < 0 || options->DirPort > 65535) {
- log(LOG_WARN, "DirPort option out of bounds.");
- result = -1;
- }
+ if (options->DirPort < 0 || options->DirPort > 65535)
+ REJECT("DirPort option out of bounds.");
if (options->StrictExitNodes &&
- (!options->ExitNodes || !strlen(options->ExitNodes))) {
- log(LOG_WARN, "StrictExitNodes set, but no ExitNodes listed.");
- }
+ (!options->ExitNodes || !strlen(options->ExitNodes)))
+ COMPLAIN("StrictExitNodes set, but no ExitNodes listed.");
if (options->StrictEntryNodes &&
- (!options->EntryNodes || !strlen(options->EntryNodes))) {
- log(LOG_WARN, "StrictEntryNodes set, but no EntryNodes listed.");
- }
+ (!options->EntryNodes || !strlen(options->EntryNodes)))
+ COMPLAIN("StrictEntryNodes set, but no EntryNodes listed.");
if (options->AuthoritativeDir) {
- if (!options->ContactInfo) {
- log(LOG_WARN, "Authoritative directory servers must set ContactInfo");
- result = -1;
- }
- if (!options->RecommendedVersions) {
- log(LOG_WARN, "Authoritative directory servers must configure RecommendedVersions.");
- result = -1;
- }
+ if (!options->ContactInfo)
+ REJECT("Authoritative directory servers must set ContactInfo");
+ if (!options->RecommendedVersions)
+ REJECT("Authoritative directory servers must configure RecommendedVersions.");
if (!options->RecommendedClientVersions)
options->RecommendedClientVersions =
config_lines_dup(options->RecommendedVersions);
@@ -1836,34 +1821,27 @@ options_validate(or_options_t *options)
config_lines_dup(options->RecommendedVersions);
}
- if (options->AuthoritativeDir && !options->DirPort) {
- log(LOG_WARN, "Running as authoritative directory, but no DirPort set.");
- result = -1;
- }
+ if (options->AuthoritativeDir && !options->DirPort)
+ REJECT("Running as authoritative directory, but no DirPort set.");
- if (options->AuthoritativeDir && !options->ORPort) {
- log(LOG_WARN, "Running as authoritative directory, but no ORPort set.");
- result = -1;
- }
+ if (options->AuthoritativeDir && !options->ORPort)
+ REJECT("Running as authoritative directory, but no ORPort set.");
if (options->AuthoritativeDir && options->ClientOnly) {
- log(LOG_WARN, "Running as authoritative directory, but ClientOnly also set.");
- result = -1;
+ REJECT("Running as authoritative directory, but ClientOnly also set.");
}
- if (options->AuthoritativeDir && options->NoPublish) {
- log(LOG_WARN, "You cannot set both AuthoritativeDir and NoPublish.");
- result = -1;
- }
+ if (options->AuthoritativeDir && options->NoPublish)
+ REJECT("You cannot set both AuthoritativeDir and NoPublish.");
if (options->ConnLimit <= 0) {
- log(LOG_WARN, "ConnLimit must be greater than 0, but was set to %d",
+ log(LOG_WARN, LD_CONFIG,"ConnLimit must be greater than 0, but was set to %d",
options->ConnLimit);
result = -1;
}
if (options->_AccountingMaxKB) {
- log(LOG_WARN, "AccountingMaxKB is deprecated. Say 'AccountingMax %d KB' instead.", options->_AccountingMaxKB);
+ log(LOG_WARN, LD_CONFIG, "AccountingMaxKB is deprecated. Say 'AccountingMax %d KB' instead.", options->_AccountingMaxKB);
options->AccountingMax = U64_LITERAL(1024)*options->_AccountingMaxKB;
options->_AccountingMaxKB = 0;
}
@@ -1897,7 +1875,7 @@ options_validate(or_options_t *options)
});
new_line->value = smartlist_join_strings(instead,",",0,NULL);
/* These have been deprecated since 0.1.1.5-alpha-cvs */
- log_fn(LOG_WARN, "FascistFirewall and FirewallPorts are deprecated. Instead, use \"ReachableAddresses %s\"", new_line->value);
+ log(LOG_WARN, LD_CONFIG, "FascistFirewall and FirewallPorts are deprecated. Instead, use \"ReachableAddresses %s\"", new_line->value);
new_line->next = options->ReachableAddresses;
options->ReachableAddresses = new_line;
SMARTLIST_FOREACH(instead, char *, cp, tor_free(cp));
@@ -1929,18 +1907,16 @@ options_validate(or_options_t *options)
else if (!strcasecmp(cp, "rendezvous"))
options->_AllowUnverified |= ALLOW_UNVERIFIED_RENDEZVOUS;
else {
- log(LOG_WARN, "Unrecognized value '%s' in AllowUnverifiedNodes",
- cp);
+ log(LOG_WARN, LD_CONFIG,
+ "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;
- }
+ (options->PathlenCoinWeight < 0.0 || options->PathlenCoinWeight >= 1.0))
+ REJECT("PathlenCoinWeight option must be >=0.0 and <1.0.");
#define MIN_DIR_FETCH_PERIOD 600
#define MIN_REND_POST_PERIOD 300
@@ -1952,66 +1928,62 @@ options_validate(or_options_t *options)
if (options->DirFetchPeriod &&
options->DirFetchPeriod < MIN_DIR_FETCH_PERIOD) {
- log(LOG_WARN, "DirFetchPeriod option must be at least %d seconds. Clipping.", MIN_DIR_FETCH_PERIOD);
+ log(LOG_WARN, LD_CONFIG, "DirFetchPeriod option must be at least %d seconds. Clipping.", MIN_DIR_FETCH_PERIOD);
options->DirFetchPeriod = MIN_DIR_FETCH_PERIOD;
}
if (options->StatusFetchPeriod &&
options->StatusFetchPeriod < MIN_STATUS_FETCH_PERIOD) {
- log(LOG_WARN, "StatusFetchPeriod option must be at least %d seconds. Clipping.", MIN_STATUS_FETCH_PERIOD);
+ log(LOG_WARN, LD_CONFIG, "StatusFetchPeriod option must be at least %d seconds. Clipping.", MIN_STATUS_FETCH_PERIOD);
options->StatusFetchPeriod = MIN_STATUS_FETCH_PERIOD;
}
if (options->RendPostPeriod < MIN_REND_POST_PERIOD) {
- log(LOG_WARN,"RendPostPeriod option must be at least %d seconds. Clipping.",
+ log(LOG_WARN,LD_CONFIG,"RendPostPeriod option must be at least %d seconds. Clipping.",
MIN_REND_POST_PERIOD);
options->RendPostPeriod = MIN_REND_POST_PERIOD;
}
if (options->DirPort && ! options->AuthoritativeDir) {
if (options->DirFetchPeriod > MAX_CACHE_DIR_FETCH_PERIOD) {
- log(LOG_WARN, "Caching directory servers must have DirFetchPeriod less than %d seconds. Clipping.", MAX_CACHE_DIR_FETCH_PERIOD);
+ log(LOG_WARN, LD_CONFIG, "Caching directory servers must have DirFetchPeriod less than %d seconds. Clipping.", MAX_CACHE_DIR_FETCH_PERIOD);
options->DirFetchPeriod = MAX_CACHE_DIR_FETCH_PERIOD;
}
if (options->StatusFetchPeriod > MAX_CACHE_STATUS_FETCH_PERIOD) {
- log(LOG_WARN, "Caching directory servers must have StatusFetchPeriod less than %d seconds. Clipping.", MAX_CACHE_STATUS_FETCH_PERIOD);
+ log(LOG_WARN, LD_CONFIG, "Caching directory servers must have StatusFetchPeriod less than %d seconds. Clipping.", MAX_CACHE_STATUS_FETCH_PERIOD);
options->StatusFetchPeriod = MAX_CACHE_STATUS_FETCH_PERIOD;
}
}
if (options->DirFetchPeriod > MAX_DIR_PERIOD) {
- log(LOG_WARN, "DirFetchPeriod is too large; clipping to %ds.", MAX_DIR_PERIOD);
+ log(LOG_WARN, LD_CONFIG, "DirFetchPeriod is too large; clipping to %ds.", MAX_DIR_PERIOD);
options->DirFetchPeriod = MAX_DIR_PERIOD;
}
if (options->StatusFetchPeriod > MAX_DIR_PERIOD) {
- log(LOG_WARN, "StatusFetchPeriod is too large; clipping to %ds.", MAX_DIR_PERIOD);
+ log(LOG_WARN, LD_CONFIG, "StatusFetchPeriod is too large; clipping to %ds.", MAX_DIR_PERIOD);
options->StatusFetchPeriod = MAX_DIR_PERIOD;
}
if (options->RendPostPeriod > MAX_DIR_PERIOD) {
- log(LOG_WARN, "RendPostPeriod is too large; clipping to %ds.", MAX_DIR_PERIOD);
+ log(LOG_WARN, LD_CONFIG, "RendPostPeriod is too large; clipping to %ds.", MAX_DIR_PERIOD);
options->RendPostPeriod = MAX_DIR_PERIOD;
}
- if (options->KeepalivePeriod < 1) {
- log(LOG_WARN,"KeepalivePeriod option must be positive.");
- result = -1;
- }
+ if (options->KeepalivePeriod < 1)
+ REJECT("KeepalivePeriod option must be positive.");
if (options->BandwidthRate > INT_MAX) {
- log(LOG_WARN,"BandwidthRate must be less than %d",INT_MAX);
+ log(LOG_WARN,LD_CONFIG,"BandwidthRate must be less than %d",INT_MAX);
result = -1;
}
if (options->BandwidthBurst > INT_MAX) {
- log(LOG_WARN,"BandwidthBurst must be less than %d",INT_MAX);
+ log(LOG_WARN,LD_CONFIG,"BandwidthBurst must be less than %d",INT_MAX);
result = -1;
}
if (server_mode(options) &&
options->BandwidthRate < ROUTER_REQUIRED_MIN_BANDWIDTH*2) {
- log(LOG_WARN,"BandwidthRate is set to %d bytes/second. For servers, it must be at least %d.", (int)options->BandwidthRate, ROUTER_REQUIRED_MIN_BANDWIDTH*2);
- result = -1;
- }
- if (options->BandwidthRate > options->BandwidthBurst) {
- log(LOG_WARN,"BandwidthBurst must be at least equal to BandwidthRate.");
+ 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);
result = -1;
}
+ if (options->BandwidthRate > options->BandwidthBurst)
+ REJECT("BandwidthBurst must be at least equal to BandwidthRate.");
if (accounting_parse_options(options, 1)<0) {
result = -1;
@@ -2019,55 +1991,41 @@ options_validate(or_options_t *options)
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, &options->HttpProxyPort) < 0)
+ REJECT("HttpProxy failed to parse or resolve. Please fix.");
if (options->HttpProxyPort == 0) { /* give it a default */
options->HttpProxyPort = 80;
}
}
if (options->HttpProxyAuthenticator) {
- if (strlen(options->HttpProxyAuthenticator) >= 48) {
- log(LOG_WARN, "HttpProxyAuthenticator is too long (>= 48 chars).");
- result = -1;
- }
+ if (strlen(options->HttpProxyAuthenticator) >= 48)
+ REJECT("HttpProxyAuthenticator is too long (>= 48 chars).");
}
if (options->HttpsProxy) { /* parse it now */
if (parse_addr_port(options->HttpsProxy, NULL,
- &options->HttpsProxyAddr, &options->HttpsProxyPort) < 0) {
- log(LOG_WARN,"HttpsProxy failed to parse or resolve. Please fix.");
- result = -1;
- }
+ &options->HttpsProxyAddr, &options->HttpsProxyPort) < 0)
+ REJECT("HttpsProxy failed to parse or resolve. Please fix.");
if (options->HttpsProxyPort == 0) { /* give it a default */
options->HttpsProxyPort = 443;
}
}
if (options->HttpsProxyAuthenticator) {
- if (strlen(options->HttpsProxyAuthenticator) >= 48) {
- log(LOG_WARN, "HttpsProxyAuthenticator is too long (>= 48 chars).");
- result = -1;
- }
+ if (strlen(options->HttpsProxyAuthenticator) >= 48)
+ REJECT("HttpsProxyAuthenticator is too long (>= 48 chars).");
}
if (options->HashedControlPassword) {
- if (decode_hashed_password(NULL, options->HashedControlPassword)<0) {
- log_fn(LOG_WARN,"Bad HashedControlPassword: wrong length or bad encoding");
- result = -1;
- }
- }
- if (options->HashedControlPassword && options->CookieAuthentication) {
- log_fn(LOG_WARN,"Cannot enable both HashedControlPassword and CookieAuthentication");
- result = -1;
+ if (decode_hashed_password(NULL, options->HashedControlPassword)<0)
+ REJECT("Bad HashedControlPassword: wrong length or bad encoding");
}
+ if (options->HashedControlPassword && options->CookieAuthentication)
+ REJECT("Cannot enable both HashedControlPassword and CookieAuthentication");
- if (options->UseHelperNodes && ! options->NumHelperNodes) {
- log_fn(LOG_WARN, "Cannot enable UseHelperNodes with NumHelperNodes set to 0");
- result = -1;
- }
+ if (options->UseHelperNodes && ! options->NumHelperNodes)
+ REJECT("Cannot enable UseHelperNodes with NumHelperNodes set to 0");
if (check_nickname_list(options->ExitNodes, "ExitNodes"))
result = -1;
@@ -2086,39 +2044,29 @@ options_validate(or_options_t *options)
result = -1;
}
- if (config_parse_addr_policy(options->ExitPolicy, &addr_policy, -1)) {
- log_fn(LOG_WARN, "Error in Exit Policy entry.");
- result = -1;
- }
+ if (config_parse_addr_policy(options->ExitPolicy, &addr_policy, -1))
+ REJECT("Error in Exit Policy entry.");
+
options_append_default_exit_policy(&addr_policy);
if (server_mode(options)) {
exit_policy_implicitly_allows_local_networks(addr_policy, 1);
}
/* The rest of these calls *append* to addr_policy. So don't actually
* use the results for anything other than checking if they parse! */
- if (config_parse_addr_policy(options->DirPolicy, &addr_policy, -1)) {
- log_fn(LOG_WARN, "Error in DirPolicy entry.");
- result = -1;
- }
- if (config_parse_addr_policy(options->SocksPolicy, &addr_policy, -1)) {
- log_fn(LOG_WARN, "Error in SocksPolicy entry.");
- result = -1;
- }
+ 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.");
if (config_parse_addr_policy(options->ReachableAddresses, &addr_policy,
- ADDR_POLICY_ACCEPT)) {
- log_fn(LOG_WARN, "Error in ReachableAddresses entry.");
- result = -1;
- }
+ ADDR_POLICY_ACCEPT))
+ REJECT("Error in ReachableAddresses entry.");
if (config_parse_addr_policy(options->AuthDirReject, &addr_policy,
- ADDR_POLICY_REJECT)) {
- log_fn(LOG_WARN, "Error in ReachableAddresses entry.");
- result = -1;
- }
+ ADDR_POLICY_REJECT))
+ REJECT("Error in ReachableAddresses entry.");
if (config_parse_addr_policy(options->AuthDirInvalid, &addr_policy,
- ADDR_POLICY_REJECT)) {
- log_fn(LOG_WARN, "Error in ReachableAddresses entry.");
- result = -1;
- }
+ ADDR_POLICY_REJECT))
+ REJECT("Error in ReachableAddresses entry.");
+
addr_policy_free(addr_policy);
for (cl = options->RedirectExit; cl; cl = cl->next) {
@@ -2129,7 +2077,7 @@ options_validate(or_options_t *options)
if (!options->DirServers) {
add_default_trusted_dirservers(options);
} else {
- log_fn(LOG_WARN, "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.");
+ 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.");
for (cl = options->DirServers; cl; cl = cl->next) {
if (parse_dir_server_line(cl->value, 1)<0)
result = -1;
@@ -2140,6 +2088,8 @@ options_validate(or_options_t *options)
result = -1;
return result;
+#undef REJECT
+#undef COMPLAIN
}
/** Helper: return true iff s1 and s2 are both NULL, or both non-NULL
@@ -2163,32 +2113,32 @@ options_transition_allowed(or_options_t *old, or_options_t *new_val)
return 0;
if (!opt_streq(old->PidFile, new_val->PidFile)) {
- log_fn(LOG_WARN,"PidFile is not allowed to change. Failing.");
+ warn(LD_CONFIG,"PidFile is not allowed to change. Failing.");
return -1;
}
if (old->RunAsDaemon != new_val->RunAsDaemon) {
- log_fn(LOG_WARN,"While Tor is running, changing RunAsDaemon is not allowed. Failing.");
+ warn(LD_CONFIG,"While Tor is running, changing RunAsDaemon is not allowed. Failing.");
return -1;
}
if (strcmp(old->DataDirectory,new_val->DataDirectory)!=0) {
- log_fn(LOG_WARN,"While Tor is running, changing DataDirectory (\"%s\"->\"%s\") is not allowed. Failing.", old->DataDirectory, new_val->DataDirectory);
+ warn(LD_CONFIG,"While Tor is running, changing DataDirectory (\"%s\"->\"%s\") is not allowed. Failing.", old->DataDirectory, new_val->DataDirectory);
return -1;
}
if (!opt_streq(old->User, new_val->User)) {
- log_fn(LOG_WARN,"While Tor is running, changing User is not allowed. Failing.");
+ warn(LD_CONFIG,"While Tor is running, changing User is not allowed. Failing.");
return -1;
}
if (!opt_streq(old->Group, new_val->Group)) {
- log_fn(LOG_WARN,"While Tor is running, changing Group is not allowed. Failing.");
+ warn(LD_CONFIG,"While Tor is running, changing Group is not allowed. Failing.");
return -1;
}
if (old->HardwareAccel != new_val->HardwareAccel) {
- log_fn(LOG_WARN,"While Tor is running, changing HardwareAccel is not allowed. Failing.");
+ warn(LD_CONFIG,"While Tor is running, changing HardwareAccel is not allowed. Failing.");
return -1;
}
@@ -2262,7 +2212,7 @@ get_windows_conf_root(void)
&idl))) {
GetCurrentDirectory(MAX_PATH, path);
is_set = 1;
- log_fn(LOG_WARN, "I couldn't find your application data folder: are you running an ancient version of Windows 95? Defaulting to \"%s\"", path);
+ warn(LD_CONFIG, "I couldn't find your application data folder: are you running an ancient version of Windows 95? Defaulting to \"%s\"", path);
return path;
}
/* Convert the path from an "ID List" (whatever that is!) to a path. */
@@ -2312,7 +2262,7 @@ check_nickname_list(const char *lst, const char *name)
SMARTLIST_FOREACH(sl, const char *, s,
{
if (!is_legal_nickname_or_hexdigest(s)) {
- log_fn(LOG_WARN, "Invalid nickname '%s' in %s line", s, name);
+ warn(LD_CONFIG, "Invalid nickname '%s' in %s line", s, name);
r = -1;
}
});
@@ -2369,7 +2319,7 @@ options_init_from_torrc(int argc, char **argv)
for (i = 1; i < argc; ++i) {
if (i < argc-1 && !strcmp(argv[i],"-f")) {
if (fname) {
- log(LOG_WARN, "Duplicate -f options on command line.");
+ log(LOG_WARN, LD_CONFIG, "Duplicate -f options on command line.");
tor_free(fname);
}
fname = tor_strdup(argv[i+1]);
@@ -2406,17 +2356,18 @@ options_init_from_torrc(int argc, char **argv)
}
}
tor_assert(fname);
- log(LOG_DEBUG, "Opening config file \"%s\"", fname);
+ log(LOG_DEBUG, LD_CONFIG, "Opening config file \"%s\"", fname);
/* get config lines, assign them */
if (file_status(fname) != FN_FILE ||
!(cf = read_file_to_str(fname,0))) {
if (using_default_torrc == 1) {
- log(LOG_NOTICE, "Configuration file \"%s\" not present, "
+ log(LOG_NOTICE, LD_CONFIG, "Configuration file \"%s\" not present, "
"using reasonable defaults.", fname);
tor_free(fname); /* sets fname to NULL */
} else {
- log(LOG_WARN, "Unable to open configuration file \"%s\".", fname);
+ log(LOG_WARN, LD_CONFIG,
+ "Unable to open configuration file \"%s\".", fname);
tor_free(fname);
goto err;
}
@@ -2487,17 +2438,17 @@ config_register_addressmaps(or_options_t *options)
from = smartlist_get(elts,0);
to = smartlist_get(elts,1);
if (!is_plausible_address(from)) {
- log_fn(LOG_WARN,"Skipping invalid argument '%s' to MapAddress",from);
+ warn(LD_CONFIG,"Skipping invalid argument '%s' to MapAddress",from);
} else if (!is_plausible_address(to)) {
- log_fn(LOG_WARN,"Skipping invalid argument '%s' to MapAddress",to);
+ warn(LD_CONFIG,"Skipping invalid argument '%s' to MapAddress",to);
} else {
addressmap_register(from, tor_strdup(to), 0);
if (smartlist_len(elts)>2) {
- log_fn(LOG_WARN,"Ignoring extra arguments to MapAddress.");
+ warn(LD_CONFIG,"Ignoring extra arguments to MapAddress.");
}
}
} else {
- log_fn(LOG_WARN,"MapAddress '%s' has too few arguments. Ignoring.", opt->value);
+ warn(LD_CONFIG,"MapAddress '%s' has too few arguments. Ignoring.", opt->value);
}
SMARTLIST_FOREACH(elts, char*, cp, tor_free(cp));
smartlist_clear(elts);
@@ -2524,7 +2475,7 @@ parse_log_severity_range(const char *range, int *min_out, int *max_out)
char *tmp_sev = tor_strndup(range, cp - range);
levelMin = parse_log_level(tmp_sev);
if (levelMin < 0) {
- log_fn(LOG_WARN, "Unrecognized log severity '%s': must be one of "
+ warn(LD_CONFIG, "Unrecognized log severity '%s': must be one of "
"err|warn|notice|info|debug", tmp_sev);
tor_free(tmp_sev);
return -1;
@@ -2536,7 +2487,7 @@ parse_log_severity_range(const char *range, int *min_out, int *max_out)
} else {
levelMax = parse_log_level(cp+1);
if (levelMax < 0) {
- log_fn(LOG_WARN, "Unrecognized log severity '%s': must be one of "
+ warn(LD_CONFIG, "Unrecognized log severity '%s': must be one of "
"err|warn|notice|info|debug", cp+1);
return -1;
}
@@ -2544,7 +2495,7 @@ parse_log_severity_range(const char *range, int *min_out, int *max_out)
} else {
levelMin = parse_log_level(range);
if (levelMin < 0) {
- log_fn(LOG_WARN, "Unrecognized log severity '%s': must be one of "
+ warn(LD_CONFIG, "Unrecognized log severity '%s': must be one of "
"err|warn|notice|info|debug", range);
return -1;
}
@@ -2581,7 +2532,7 @@ convert_log_option(or_options_t *options, config_line_t *level_opt,
if (file_opt && !strcasecmp(file_opt->key, "LogFile")) {
if (add_single_log_option(options, levelMin, levelMax, "file", file_opt->value) < 0) {
- log_fn(LOG_WARN, "Cannot write to LogFile \"%s\": %s.", file_opt->value,
+ warn(LD_FS, "Cannot write to LogFile \"%s\": %s.", file_opt->value,
strerror(errno));
return -1;
}
@@ -2611,7 +2562,7 @@ options_init_logs(or_options_t *options, int validate_only)
smartlist_split_string(elts, opt->value, NULL,
SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 3);
if (smartlist_len(elts) == 0) {
- log_fn(LOG_WARN, "Bad syntax on Log option 'Log %s'", opt->value);
+ warn(LD_CONFIG, "Bad syntax on Log option 'Log %s'", opt->value);
ok = 0; goto cleanup;
}
if (parse_log_severity_range(smartlist_get(elts,0), &levelMin, &levelMax)) {
@@ -2624,7 +2575,7 @@ options_init_logs(or_options_t *options, int validate_only)
}
if (!strcasecmp(smartlist_get(elts,1), "file")) {
if (smartlist_len(elts) != 3) {
- log_fn(LOG_WARN, "Bad syntax on Log option 'Log %s'", opt->value);
+ warn(LD_CONFIG, "Bad syntax on Log option 'Log %s'", opt->value);
ok = 0; goto cleanup;
}
if (!validate_only)
@@ -2632,7 +2583,7 @@ options_init_logs(or_options_t *options, int validate_only)
goto cleanup;
}
if (smartlist_len(elts) != 2) {
- log_fn(LOG_WARN, "Bad syntax on Log option 'Log %s'", opt->value);
+ warn(LD_CONFIG, "Bad syntax on Log option 'Log %s'", opt->value);
ok = 0; goto cleanup;
}
if (!strcasecmp(smartlist_get(elts,1), "stdout")) {
@@ -2650,13 +2601,14 @@ options_init_logs(or_options_t *options, int validate_only)
if (!validate_only)
add_syslog_log(levelMin, levelMax);
#else
- log_fn(LOG_WARN, "Syslog is not supported in this compilation.");
+ warn(LD_CONFIG, "Syslog is not supported in this compilation.");
#endif
} else {
- log_fn(LOG_WARN, "Unrecognized log type %s",
+ warn(LD_CONFIG, "Unrecognized log type %s",
(const char*)smartlist_get(elts,1));
- if (strchr(smartlist_get(elts,1), '/')) {
- log_fn(LOG_WARN, "Did you mean to say 'Log file %s' ?",
+ if (strchr(smartlist_get(elts,1), '/') ||
+ strchr(smartlist_get(elts,1), '\\')) {
+ warn(LD_CONFIG, "Did you mean to say 'Log file %s' ?",
(const char *)smartlist_get(elts,1));
}
ok = 0; goto cleanup;
@@ -2677,21 +2629,25 @@ static int
add_single_log_option(or_options_t *options, int minSeverity, int maxSeverity,
const char *type, const char *fname)
{
- char buf[512];
- int n;
+ char *buf;
+ size_t len;
- n = tor_snprintf(buf, sizeof(buf), "%s%s%s %s%s%s",
+ len = 256 + fname?strlen(fname):0;
+ buf = tor_malloc(len);
+
+ if (tor_snprintf(buf, len, "%s%s%s %s%s%s",
log_level_to_string(minSeverity),
maxSeverity == LOG_ERR ? "" : "-",
maxSeverity == LOG_ERR ? "" : log_level_to_string(maxSeverity),
- type, fname?" ":"", fname?fname:"");
- if (n<0) {
- log_fn(LOG_WARN, "Normalized log option too long.");
+ type, fname?" ":"", fname?fname:"")<0) {
+ warn(LD_BUG, "Normalized log option too long.");
+ tor_free(buf);
return -1;
}
- log(LOG_WARN, "The old LogLevel/LogFile/DebugLogFile/SysLog options are deprecated, and will go away soon. Your new torrc line should be: 'Log %s'", buf);
+ 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);
config_line_append(&options->Logs, "Log", buf);
+ tor_free(buf);
return 0;
}
@@ -2722,7 +2678,7 @@ normalize_log_options(or_options_t *options)
while (opt) {
if (!strcasecmp(opt->key, "LogLevel")) {
- log_fn(LOG_WARN, "Two LogLevel options in a row without intervening LogFile or SysLog");
+ warn(LD_CONFIG, "Two LogLevel options in a row without intervening LogFile or SysLog");
opt = opt->next;
} else {
tor_assert(!strcasecmp(opt->key, "LogFile") ||
@@ -2807,12 +2763,12 @@ config_parse_addr_policy(config_line_t *cfg,
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);
+ debug(LD_CONFIG,"Adding new entry '%s'",ent);
*nextp = router_parse_addr_policy_from_string(ent, assume_action);
if (*nextp) {
nextp = &((*nextp)->next);
} else {
- log_fn(LOG_WARN,"Malformed policy '%s'.", ent);
+ warn(LD_CONFIG,"Malformed policy '%s'.", ent);
r = -1;
}
});
@@ -2880,12 +2836,12 @@ parse_redirect_line(smartlist_t *result, config_line_t *line)
smartlist_split_string(elements, line->value, NULL,
SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
if (smartlist_len(elements) != 2) {
- log_fn(LOG_WARN, "Wrong number of elements in RedirectExit line");
+ warn(LD_CONFIG, "Wrong number of elements in RedirectExit line");
goto err;
}
if (parse_addr_and_port_range(smartlist_get(elements,0),&r->addr,&r->mask,
&r->port_min,&r->port_max)) {
- log_fn(LOG_WARN, "Error parsing source address in RedirectExit line");
+ warn(LD_CONFIG, "Error parsing source address in RedirectExit line");
goto err;
}
if (0==strcasecmp(smartlist_get(elements,1), "pass")) {
@@ -2893,7 +2849,7 @@ parse_redirect_line(smartlist_t *result, config_line_t *line)
} else {
if (parse_addr_port(smartlist_get(elements,1),NULL,&r->addr_dest,
&r->port_dest)) {
- log_fn(LOG_WARN, "Error parsing dest address in RedirectExit line");
+ warn(LD_CONFIG, "Error parsing dest address in RedirectExit line");
goto err;
}
r->is_redirect = 1;
@@ -2934,6 +2890,8 @@ parse_dir_server_line(const char *line, int validate_only)
smartlist_split_string(items, line, NULL,
SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1);
if (smartlist_len(items) < 2) {
+ warn(LD_CONFIG, "Too few arguments to DirServer line.");
+ goto err;
}
idx = 0;
@@ -2950,32 +2908,32 @@ parse_dir_server_line(const char *line, int validate_only)
}
if (smartlist_len(items) < 2) {
- log_fn(LOG_WARN, "Too few arguments to DirServer line.");
+ warn(LD_CONFIG, "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);
+ warn(LD_CONFIG, "Error parsing DirServer address '%s'", addrport);
goto err;
}
if (!port) {
- log_fn(LOG_WARN, "Missing port in DirServer address '%s'",addrport);
+ warn(LD_CONFIG, "Missing port in DirServer address '%s'",addrport);
goto err;
}
smartlist_del_keeporder(items, 0);
fingerprint = smartlist_join_strings(items, "", 0, NULL);
if (strlen(fingerprint) != HEX_DIGEST_LEN) {
- log_fn(LOG_WARN, "Key digest for DirServer is wrong length.");
+ warn(LD_CONFIG, "Key digest for DirServer is wrong length.");
goto err;
}
if (base16_decode(digest, DIGEST_LEN, fingerprint, HEX_DIGEST_LEN)<0) {
- log_fn(LOG_WARN, "Unable to decode DirServer key digest.");
+ warn(LD_CONFIG, "Unable to decode DirServer key digest.");
goto err;
}
if (!validate_only) {
- log_fn(LOG_DEBUG, "Trusted dirserver at %s:%d (%s)", address, (int)port,
+ debug(LD_DIR, "Trusted dirserver at %s:%d (%s)", address, (int)port,
(char*)smartlist_get(items,1));
add_trusted_dir_server(nickname, address, port, digest, supports_v1);
}
@@ -3016,13 +2974,13 @@ normalize_data_directory(or_options_t *options)
if (strncmp(d,"~/",2) == 0) {
char *fn = expand_filename(d);
if (!fn) {
- log_fn(LOG_ERR,"Failed to expand filename \"%s\".", d);
+ err(LD_CONFIG,"Failed to expand filename \"%s\".", d);
return -1;
}
if (!options->DataDirectory && !strcmp(fn,"/.tor")) {
/* If our homedir is /, we probably don't want to use it. */
/* XXXX Default to /var/lib/tor? */
- log_fn(LOG_WARN, "Default DataDirectory is \"~/.tor\". This expands to \"%s\", which is probably not what you want. Using \"%s/tor\" instead", fn, LOCALSTATEDIR);
+ warn(LD_CONFIG, "Default DataDirectory is \"~/.tor\". This expands to \"%s\", which is probably not what you want. Using \"%s/tor\" instead", fn, LOCALSTATEDIR);
tor_free(fn);
fn = tor_strdup(LOCALSTATEDIR"/tor");
@@ -3043,7 +3001,7 @@ validate_data_directory(or_options_t *options)
return -1;
tor_assert(options->DataDirectory);
if (strlen(options->DataDirectory) > (512-128)) {
- log_fn(LOG_ERR, "DataDirectory is too long.");
+ err(LD_CONFIG, "DataDirectory is too long.");
return -1;
}
return 0;
@@ -3074,13 +3032,13 @@ write_configuration_file(const char *fname, or_options_t *options)
case FN_NOENT:
break;
default:
- log_fn(LOG_WARN,"Config file \"%s\" is not a file? Failing.", fname);
+ warn(LD_CONFIG,"Config file \"%s\" is not a file? Failing.", fname);
return -1;
}
}
if (!(new_conf = options_dump(options, 1))) {
- log_fn(LOG_WARN, "Couldn't get configuration string");
+ warn(LD_BUG, "Couldn't get configuration string");
goto err;
}
@@ -3096,7 +3054,7 @@ write_configuration_file(const char *fname, or_options_t *options)
fn_tmp = tor_malloc(fn_tmp_len);
while (1) {
if (tor_snprintf(fn_tmp, fn_tmp_len, "%s.orig.%d", fname, i)<0) {
- log_fn(LOG_WARN, "tor_snprintf failed inexplicably");
+ warn(LD_BUG, "tor_snprintf failed inexplicably");
tor_free(fn_tmp);
goto err;
}
@@ -3104,7 +3062,7 @@ write_configuration_file(const char *fname, or_options_t *options)
break;
++i;
}
- log_fn(LOG_NOTICE, "Renaming old configuration file to \"%s\"", fn_tmp);
+ notice(LD_CONFIG, "Renaming old configuration file to \"%s\"", fn_tmp);
rename(fname, fn_tmp);
tor_free(fn_tmp);
}
@@ -3210,7 +3168,7 @@ config_parse_units(const char *val, struct unit_table_t *u, int *ok)
return v;
}
}
- log_fn(LOG_WARN, "Unknown unit '%s'.", cp);
+ warn(LD_CONFIG, "Unknown unit '%s'.", cp);
*ok = 0;
return 0;
}
@@ -3237,7 +3195,7 @@ config_parse_interval(const char *s, int *ok)
if (!ok)
return -1;
if (r > INT_MAX) {
- log_fn(LOG_WARN, "Interval '%s' is too long", s);
+ warn(LD_CONFIG, "Interval '%s' is too long", s);
*ok = 0;
return -1;
}
@@ -3263,13 +3221,13 @@ init_libevent(void)
#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. */
- log(LOG_NOTICE, "Initialized libevent version %s using method %s. Good.",
+ log(LOG_NOTICE, LD_GENERAL, "Initialized libevent version %s using method %s. Good.",
event_get_version(), event_get_method());
check_libevent_version(event_get_method(), event_get_version(),
get_options()->ORPort != 0);
#else
- log(LOG_NOTICE, "Initialized old libevent (version 1.0b or earlier).");
- log(LOG_WARN, "You have a very old version of libevent. It is likely to be buggy; please consider building Tor with a more recent version.");
+ log(LOG_NOTICE, LD_GENERAL, "Initialized old libevent (version 1.0b or earlier).");
+ 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.");
#endif
return 0;
@@ -3307,15 +3265,15 @@ check_libevent_version(const char *m, const char *v, int server)
}
if (buggy) {
- log(LOG_WARN,
+ log(LOG_WARN, LD_GENERAL,
"There are known bugs in using %s with libevent %s. "
"Please use the latest version of libevent.", m, v);
} else if (iffy) {
- log(LOG_WARN,
+ log(LOG_WARN, LD_GENERAL,
"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) {
- log(LOG_WARN,
+ log(LOG_WARN, LD_GENERAL,
"libevent %s can be very slow with %s. "
"When running a server, please use the latest version of libevent.",v,m);
}
@@ -3360,7 +3318,7 @@ or_state_validate(or_state_t *state)
{
const char *err;
if (helper_nodes_parse_state(state, 0, &err)<0) {
- log_fn(LOG_WARN, "Unable to parse helper nodes: %s", err);
+ warn(LD_GENERAL, "Unable to parse helper nodes: %s", err);
return -1;
}
return 0;
@@ -3376,7 +3334,7 @@ or_state_set(or_state_t *new_state)
config_free(&state_format, global_state);
global_state = new_state;
if (helper_nodes_parse_state(global_state, 1, &err)<0)
- log_fn(LOG_WARN,"Unparseable helper nodes state: %s",err);
+ warn(LD_GENERAL,"Unparseable helper nodes state: %s",err);
}
@@ -3392,14 +3350,14 @@ or_state_load(void)
switch (file_status(fname)) {
case FN_FILE:
if (!(contents = read_file_to_str(fname, 0))) {
- log_fn(LOG_WARN, "Unable to read state file \"%s\"", fname);
+ warn(LD_FS, "Unable to read state file \"%s\"", fname);
goto done;
}
break;
case FN_NOENT:
break;
default:
- log_fn(LOG_WARN,"State file \"%s\" is not a file? Failing.", fname);
+ warn(LD_GENERAL,"State file \"%s\" is not a file? Failing.", fname);
goto done;
}
new_state = tor_malloc_zero(sizeof(or_state_t));
@@ -3420,9 +3378,9 @@ or_state_load(void)
goto done;
if (contents)
- log_fn(LOG_INFO, "Loaded state from \"%s\"", fname);
+ info(LD_GENERAL, "Loaded state from \"%s\"", fname);
else
- log_fn(LOG_INFO, "Initialized state");
+ info(LD_GENERAL, "Initialized state");
or_state_set(new_state);
new_state = NULL;
if (!contents) {
@@ -3466,12 +3424,12 @@ or_state_save(void)
tor_free(state);
fname = get_or_state_fname();
if (write_str_to_file(fname, contents, 0)<0) {
- log_fn(LOG_WARN, "Unable to write state to file \"%s\"", fname);
+ warn(LD_FS, "Unable to write state to file \"%s\"", fname);
tor_free(fname);
tor_free(contents);
return -1;
}
- log_fn(LOG_INFO, "Saved state to \"%s\"", fname);
+ info(LD_GENERAL, "Saved state to \"%s\"", fname);
tor_free(fname);
tor_free(contents);
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index c63bf0e4b..7e3f8e8e0 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -11,6 +11,7 @@ const char connection_or_c_id[] = "$Id$";
* cells on the network.
**/
+#define NEW_LOG_INTERFACE
#include "or.h"
/** How much clock skew do we tolerate when checking certificates for
@@ -48,7 +49,7 @@ cell_unpack(cell_t *dest, const char *src)
int
connection_or_reached_eof(connection_t *conn)
{
- log_fn(LOG_INFO,"OR connection reached EOF. Closing.");
+ info(LD_OR,"OR connection reached EOF. Closing.");
connection_mark_for_close(conn);
return 0;
}
@@ -71,27 +72,27 @@ connection_or_read_proxy_response(connection_t *conn)
&headers, MAX_HEADERS_SIZE,
NULL, NULL, 10000, 0)) {
case -1: /* overflow */
- log_fn(LOG_WARN,"Your https proxy sent back an oversized response. Closing.");
+ warn(LD_PROTOCOL,"Your https proxy sent back an oversized response. Closing.");
return -1;
case 0:
- log_fn(LOG_INFO,"https proxy response not all here yet. Waiting.");
+ info(LD_OR,"https proxy response not all here yet. Waiting.");
return 0;
/* case 1, fall through */
}
if (parse_http_response(headers, &status_code, &date_header,
&compression, &reason) < 0) {
- log_fn(LOG_WARN,"Unparseable headers (connecting to '%s'). Closing.",
- conn->address);
+ warn(LD_OR,"Unparseable headers from proxy (connecting to '%s'). Closing.",
+ conn->address);
tor_free(headers);
return -1;
}
if (!reason) reason = tor_strdup("[no reason given]");
if (status_code == 200) {
- log_fn(LOG_INFO,
- "HTTPS connect to '%s' successful! (200 \"%s\") Starting TLS.",
- conn->address, reason);
+ info(LD_OR,
+ "HTTPS connect to '%s' successful! (200 \"%s\") Starting TLS.",
+ conn->address, reason);
tor_free(reason);
if (connection_tls_start_handshake(conn, 0) < 0) {
/* TLS handshaking error of some kind. */
@@ -102,8 +103,9 @@ connection_or_read_proxy_response(connection_t *conn)
return 0;
}
/* else, bad news on the status code */
- log_fn(LOG_WARN,"The https proxy sent back an unexpected status code %d (\"%s\"). Closing.",
- status_code, reason);
+ warn(LD_OR,
+ "The https proxy sent back an unexpected status code %d (\"%s\"). Closing.",
+ status_code, reason);
tor_free(reason);
connection_mark_for_close(conn);
return -1;
@@ -148,7 +150,7 @@ connection_or_finished_flushing(connection_t *conn)
switch (conn->state) {
case OR_CONN_STATE_PROXY_FLUSHING:
- log_fn(LOG_DEBUG,"finished sending CONNECT to proxy.");
+ debug(LD_OR,"finished sending CONNECT to proxy.");
conn->state = OR_CONN_STATE_PROXY_READING;
connection_stop_writing(conn);
break;
@@ -156,7 +158,7 @@ connection_or_finished_flushing(connection_t *conn)
connection_stop_writing(conn);
break;
default:
- log_fn(LOG_WARN,"BUG: called in unexpected state %d.", conn->state);
+ err(LD_BUG,"BUG: called in unexpected state %d.", conn->state);
tor_fragile_assert();
return -1;
}
@@ -172,7 +174,7 @@ connection_or_finished_connecting(connection_t *conn)
tor_assert(conn->type == CONN_TYPE_OR);
tor_assert(conn->state == OR_CONN_STATE_CONNECTING);
- log_fn(LOG_DEBUG,"OR connect() to router at %s:%u finished.",
+ debug(LD_OR,"OR connect() to router at %s:%u finished.",
conn->address,conn->port);
if (get_options()->HttpsProxy) {
@@ -188,7 +190,7 @@ connection_or_finished_connecting(connection_t *conn)
if (authenticator) {
base64_authenticator = alloc_http_authenticator(authenticator);
if (!base64_authenticator)
- log_fn(LOG_WARN, "Encoding https authenticator failed");
+ warn(LD_OR, "Encoding https authenticator failed");
}
if (base64_authenticator) {
tor_snprintf(buf, sizeof(buf), "CONNECT %s:%d HTTP/1.1\r\n"
@@ -326,7 +328,7 @@ connection_or_connect(uint32_t addr, uint16_t port, const char *id_digest)
if (server_mode(options) && (me=router_get_my_routerinfo()) &&
!memcmp(me->identity_digest, id_digest,DIGEST_LEN)) {
- log_fn(LOG_INFO,"Client asked me to connect to myself. Refusing.");
+ info(LD_PROTOCOL,"Client asked me to connect to myself. Refusing.");
return NULL;
}
@@ -380,11 +382,11 @@ connection_tls_start_handshake(connection_t *conn, int receiving)
conn->state = OR_CONN_STATE_HANDSHAKING;
conn->tls = tor_tls_new(conn->s, receiving, 0);
if (!conn->tls) {
- log_fn(LOG_WARN,"tor_tls_new failed. Closing.");
+ warn(LD_BUG,"tor_tls_new failed. Closing.");
return -1;
}
connection_start_reading(conn);
- log_fn(LOG_DEBUG,"starting the handshake");
+ debug(LD_OR,"starting TLS handshake on fd %d", conn->s);
if (connection_tls_continue_handshake(conn) < 0) {
return -1;
}
@@ -403,16 +405,16 @@ connection_tls_continue_handshake(connection_t *conn)
switch (tor_tls_handshake(conn->tls)) {
case TOR_TLS_ERROR:
case TOR_TLS_CLOSE:
- log_fn(LOG_INFO,"tls error. breaking.");
+ info(LD_OR,"tls error. breaking connection.");
return -1;
case TOR_TLS_DONE:
return connection_tls_finish_handshake(conn);
case TOR_TLS_WANTWRITE:
connection_start_writing(conn);
- log_fn(LOG_DEBUG,"wanted write");
+ debug(LD_OR,"wanted write");
return 0;
case TOR_TLS_WANTREAD: /* handshaking conns are *always* reading */
- log_fn(LOG_DEBUG,"wanted read");
+ debug(LD_OR,"wanted read");
return 0;
}
return 0;
@@ -467,26 +469,26 @@ connection_or_check_valid_handshake(connection_t *conn, char *digest_rcvd)
check_no_tls_errors();
if (! tor_tls_peer_has_cert(conn->tls)) {
- log_fn(LOG_INFO,"Peer didn't send a cert! Closing.");
+ info(LD_PROTOCOL,"Peer didn't send a cert! Closing.");
return -1;
}
check_no_tls_errors();
if (tor_tls_get_peer_cert_nickname(conn->tls, nickname, sizeof(nickname))) {
- log_fn(severity,"Other side (%s:%d) has a cert without a valid nickname. Closing.",
+ log_fn(severity,LD_PROTOCOL,"Other side (%s:%d) has a cert without a valid nickname. Closing.",
conn->address, conn->port);
return -1;
}
check_no_tls_errors();
- log_fn(LOG_DEBUG, "Other side (%s:%d) claims to be router '%s'",
+ debug(LD_OR, "Other side (%s:%d) claims to be router '%s'",
conn->address, conn->port, nickname);
if (tor_tls_verify(severity, conn->tls, &identity_rcvd) < 0) {
- log_fn(severity,"Other side, which claims to be router '%s' (%s:%d), has a cert but it's invalid. Closing.",
+ log_fn(severity,LD_OR,"Other side, which claims to be router '%s' (%s:%d), has a cert but it's invalid. Closing.",
nickname, conn->address, conn->port);
return -1;
}
check_no_tls_errors();
- log_fn(LOG_DEBUG,"The router's cert is valid.");
+ debug(LD_OR,"The router's cert is valid.");
crypto_pk_get_digest(identity_rcvd, digest_rcvd);
if (crypto_pk_cmp_keys(get_identity_key(), identity_rcvd)<0) {
@@ -500,7 +502,7 @@ connection_or_check_valid_handshake(connection_t *conn, char *digest_rcvd)
if (router && /* we know this nickname */
router->is_named && /* make sure it's the right guy */
memcmp(digest_rcvd, router->identity_digest, DIGEST_LEN) != 0) {
- log_fn(severity,
+ log_fn(severity, LD_OR,
"Identity key not as expected for router claiming to be '%s' (%s:%d)",
nickname, conn->address, conn->port);
return -1;
@@ -514,7 +516,7 @@ connection_or_check_valid_handshake(connection_t *conn, char *digest_rcvd)
char expected[HEX_DIGEST_LEN+1];
base16_encode(seen, sizeof(seen), digest_rcvd, DIGEST_LEN);
base16_encode(expected, sizeof(expected), conn->identity_digest, DIGEST_LEN);
- log_fn(severity,
+ log_fn(severity, LD_OR,
"Identity key not as expected for router at %s:%d: wanted %s but got %s",
conn->address, conn->port, expected, seen);
helper_node_set_status(conn->identity_digest, 0);
@@ -552,14 +554,14 @@ connection_tls_finish_handshake(connection_t *conn)
{
char digest_rcvd[DIGEST_LEN];
- log_fn(LOG_DEBUG,"tls handshake done. verifying.");
+ debug(LD_OR,"tls handshake done. verifying.");
if (connection_or_check_valid_handshake(conn, digest_rcvd) < 0)
return -1;
if (!connection_or_nonopen_was_started_here(conn)) {
connection_t *c;
if ((c=connection_get_by_identity_digest(digest_rcvd, CONN_TYPE_OR))) {
- log_fn(LOG_INFO,"Router '%s' is already connected on fd %d. Dropping fd %d.",
+ debug(LD_OR,"Router '%s' is already connected on fd %d. Dropping fd %d.",
c->nickname, c->s, conn->s);
return -1;
}
@@ -613,7 +615,7 @@ connection_or_write_cell_to_buf(const cell_t *cell, connection_t *conn)
if (connection_handle_write(conn) < 0) {
if (!conn->marked_for_close) {
/* this connection is broken. remove it. */
- log_fn(LOG_WARN,"Bug: unhandled error on write for OR conn (fd %d); removing",
+ warn(LD_BUG,"Bug: unhandled error on write for OR conn (fd %d); removing",
conn->s);
tor_fragile_assert();
conn->has_sent_end = 1; /* otherwise we cry wolf about duplicate close */
@@ -643,7 +645,7 @@ connection_or_process_cells_from_inbuf(connection_t *conn)
cell_t cell;
loop:
- log_fn(LOG_DEBUG,"%d: starting, inbuf_datalen %d (%d pending in tls object).",
+ debug(LD_OR,"%d: starting, inbuf_datalen %d (%d pending in tls object).",
conn->s,(int)buf_datalen(conn->inbuf),tor_tls_get_pending_bytes(conn->tls));
if (buf_datalen(conn->inbuf) < CELL_NETWORK_SIZE) /* entire response available? */
return 0; /* not yet */
diff --git a/src/or/or.h b/src/or/or.h
index 387ae5d8b..9472b109f 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1379,7 +1379,7 @@ void assert_buf_ok(buf_t *buf);
/********************************* circuitbuild.c **********************/
char *circuit_list_path(circuit_t *circ, int verbose);
-void circuit_log_path(int severity, int domain, circuit_t *circ);
+void circuit_log_path(int severity, unsigned int domain, circuit_t *circ);
void circuit_rep_hist_note_result(circuit_t *circ);
void circuit_dump_by_conn(connection_t *conn, int severity);
circuit_t *circuit_init(uint8_t purpose, int need_uptime,
@@ -1721,7 +1721,7 @@ int control_event_circuit_status(circuit_t *circ, circuit_status_event_t e);
int control_event_stream_status(connection_t *conn, stream_status_event_t e);
int control_event_or_conn_status(connection_t *conn, or_conn_status_event_t e);
int control_event_bandwidth_used(uint32_t n_read, uint32_t n_written);
-void control_event_logmsg(int severity, int domain, const char *msg);
+void control_event_logmsg(int severity, unsigned int domain, const char *msg);
int control_event_descriptors_changed(smartlist_t *routers);
int control_event_address_mapped(const char *from, const char *to,time_t expires);
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 9e6a08e2f..fe4ec89f1 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -275,7 +275,7 @@ tor_version_is_obsolete(const char *myversion, const char *versionlist)
myversion, versionlist);
if (tor_version_parse(myversion, &mine)) {
- err("I couldn't parse my own version (%s)", myversion);
+ err(LD_BUG,"I couldn't parse my own version (%s)", myversion);
tor_assert(0);
}
version_sl = smartlist_create();
diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
index 7af279af1..60daaaff0 100644
--- a/src/tools/tor-resolve.c
+++ b/src/tools/tor-resolve.c
@@ -136,7 +136,7 @@ do_resolve(const char *hostname, uint32_t sockshost, uint16_t socksport,
}
if ((len = build_socks4a_resolve_request(&req, "", hostname))<0) {
- err("Error generating SOCKS request");
+ err(LD_BUG,"Error generating SOCKS request");
return -1;
}
@@ -236,7 +236,7 @@ main(int argc, char **argv)
}
if (network_init()<0) {
- err("Error initializing network; exiting.");
+ err(LD_NET,"Error initializing network; exiting.");
return 1;
}
generated by cgit v1.2.3 (git 2.45.0) at 2024-11-19 08:39:12 +0000