October 2014 - tor-commits - lists.torproject.org

[tor/master] Switch new time tests to use SIZEOF_TIME_T, not sizeof(time_t)
by nickm＠torproject.org 22 Oct '14

22 Oct '14

commit ac4dd248e187b0327617c84ee2820a03b0a87a16 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 22 12:57:21 2014 -0400 Switch new time tests to use SIZEOF_TIME_T, not sizeof(time_t) Otherwise, we get implicit conversion warning on some platforms. --- src/test/test_util.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index e1f77b9..a75b6bb 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -471,7 +471,8 @@ test_util_time(void *arg) b_time.tm_year == (1901-1900)); } - if (sizeof(time_t) == 8) { +#if SIZEOF_TIME_T == 8 + { /* one of the smallest tm_year values my 64 bit system supports: * b_time.tm_year == (-292275055LL-1900LL) without clamping */ t_res = -9223372036854775LL; @@ -490,11 +491,13 @@ test_util_time(void *arg) tt_assert(b_time.tm_year == (1970-1900) || b_time.tm_year == (1-1900)); } +#endif /* time_t >= INT_MAX yields a year clamped to 2037 or 9999, * depending on whether the implementation of the system gmtime(_r) * sets struct tm (9999) or not (2037) */ - if (sizeof(time_t) == 4 || sizeof(time_t) == 8) { +#if SIZEOF_TIME_T == 4 || SIZEOF_TIME_T == 8 + { t_res = 3*(1 << 29); tor_gmtime_r(&t_res, &b_time); tt_assert(b_time.tm_year == (2021-1900)); @@ -504,8 +507,10 @@ test_util_time(void *arg) tt_assert(b_time.tm_year == (2037-1900) || b_time.tm_year == (2038-1900)); } +#endif - if (sizeof(time_t) == 8) { +#if SIZEOF_TIME_T == 8 + { /* one of the largest tm_year values my 64 bit system supports: * b_time.tm_year == (292278994L-1900L) without clamping */ t_res = 9223372036854775LL; @@ -524,6 +529,7 @@ test_util_time(void *arg) tt_assert(b_time.tm_year == (2037-1900) || b_time.tm_year == (9999-1900)); } +#endif /* Test {format,parse}_rfc1123_time */

1 0

[tor/master] Fix minor typos, two line lengths, and a repeated include
by nickm＠torproject.org 22 Oct '14

22 Oct '14

commit c9d0967dd9b236254f2f461b7dab3909ee826351 Author: teor <teor2345(a)gmail.com> Date: Thu Oct 23 02:35:46 2014 +1100 Fix minor typos, two line lengths, and a repeated include --- src/common/address.c | 2 +- src/common/compat.c | 7 ++----- src/common/log.c | 4 ++-- src/or/buffers.c | 2 +- src/test/test_socks.c | 3 ++- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index 07b7659..20f4d14 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -883,7 +883,7 @@ tor_addr_copy(tor_addr_t *dest, const tor_addr_t *src) memcpy(dest, src, sizeof(tor_addr_t)); } -/** Copy a tor_addr_t from src to dest, taking extra case to +/** Copy a tor_addr_t from src to dest, taking extra care to * copy only the well-defined portions. Used for computing hashes of * addresses. */ diff --git a/src/common/compat.c b/src/common/compat.c index b6fdb1a..0f9f4fa 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -77,6 +77,7 @@ /* Includes for the process attaching prevention */ #if defined(HAVE_SYS_PRCTL_H) && defined(__linux__) +/* Only use the linux prctl; the IRIX prctl is totally different */ #include <sys/prctl.h> #elif defined(__APPLE__) #include <sys/types.h> @@ -110,10 +111,6 @@ #ifdef HAVE_SYS_FILE_H #include <sys/file.h> #endif -#if defined(HAVE_SYS_PRCTL_H) && defined(__linux__) -/* Only use the linux prctl; the IRIX prctl is totally different */ -#include <sys/prctl.h> -#endif #ifdef TOR_UNIT_TESTS #if !defined(HAVE_USLEEP) && defined(HAVE_SYS_SELECT_H) /* as fallback implementation for tor_sleep_msec */ @@ -2883,7 +2880,7 @@ tor_localtime_r(const time_t *timep, struct tm *result) /** @} */ /** @{ */ -/** As gmtimee_r, but defined for platforms that don't have it: +/** As gmtime_r, but defined for platforms that don't have it: * * Convert *timep to a struct tm in UTC, and store the value in * *result. Return the result on success, or NULL on failure. diff --git a/src/common/log.c b/src/common/log.c index 4b38177..6bdc332 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -371,8 +371,8 @@ pending_log_message_free(pending_log_message_t *msg) tor_free(msg); } -/** Return true iff lf would like to receive a message with the specified - * severity in the specified domain. +/** Return true iff lf would like to receive a message with the + * specified severity in the specified domain. */ static INLINE int logfile_wants_message(const logfile_t *lf, int severity, diff --git a/src/or/buffers.c b/src/or/buffers.c index 9f02824..b415c8f 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1912,7 +1912,7 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, } *drain_out = 2u + usernamelen + 1u + passlen; req->got_auth = 1; - *want_length_out = 7; /* Minimal socks5 sommand. */ + *want_length_out = 7; /* Minimal socks5 command. */ return 0; } else if (req->auth_type == SOCKS_USER_PASS) { /* unknown version byte */ diff --git a/src/test/test_socks.c b/src/test/test_socks.c index 9aaa16e..dea5f52 100644 --- a/src/test/test_socks.c +++ b/src/test/test_socks.c @@ -392,7 +392,8 @@ test_socks_5_malformed_commands(void *ptr) /* XXX: Stringified address length > MAX_SOCKS_ADDR_LEN will never happen */ - /* SOCKS 5 Send CONNECT [01] to IP address 2.2.2.2:4369, with SafeSocks set */ + /** SOCKS 5 Send CONNECT [01] to IP address 2.2.2.2:4369, with SafeSocks set + */ ADD_DATA(buf, "\x05\x01\x00"); ADD_DATA(buf, "\x05\x01\x00\x01\x02\x02\x02\x02\x11\x11"); tt_int_op(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, 1),==,

1 0

[tor/master] Merge remote-tracking branch 'public/bug11824_v2'
by nickm＠torproject.org 22 Oct '14

22 Oct '14

commit 653221e807fb07ce20e70566f95c6d27c284990e Merge: 8e4daa7 7573e66 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 22 11:01:50 2014 -0400 Merge remote-tracking branch 'public/bug11824_v2' changes/bug11824 | 5 +++++ src/common/torgzip.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] Treat Z_BUF_ERROR as TOR_ZLIB_BUF_FULL when finalizing a zlib buffer
by nickm＠torproject.org 22 Oct '14

22 Oct '14

commit 7573e66b9961cdb571c3c7af688fd01912e66455 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 3 20:38:00 2014 -0400 Treat Z_BUF_ERROR as TOR_ZLIB_BUF_FULL when finalizing a zlib buffer Otherwise, when we're out of input *and* finalizing, we might report TOR_ZLIB_OK erroneously and not finalize the buffer. (I don't believe this can happen in practice, with our code today: write_to_buf_zlib ensures that we are never trying to write into a completely empty buffer, and zlib says "Z_OK" if you give it even one byte to write into.) Fixes bug 11824; bugfix on 0.1.1.23 (06e09cdd47eaa8f7e90ce2). --- changes/bug11824 | 5 +++++ src/common/torgzip.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug11824 b/changes/bug11824 new file mode 100644 index 0000000..1eb89ca --- /dev/null +++ b/changes/bug11824 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - When trying to finalize a zlib stream where we have already + exhausted all the input bytes and we need more bytes in the + output buffer, do not report the the write as successful. + Fixes bug 11824; bugfix on 0.1.1.23. diff --git a/src/common/torgzip.c b/src/common/torgzip.c index 4328c63..778cbe9 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -480,7 +480,7 @@ tor_zlib_process(tor_zlib_state_t *state, case Z_STREAM_END: return TOR_ZLIB_DONE; case Z_BUF_ERROR: - if (state->stream.avail_in == 0) + if (state->stream.avail_in == 0 && !finish) return TOR_ZLIB_OK; return TOR_ZLIB_BUF_FULL; case Z_OK:

1 0

[tor/master] Fix a changes typo spotted by wfn
by nickm＠torproject.org 22 Oct '14

22 Oct '14

commit 67fdfcf27c874a64e30776d2e3d2469d0711d9ee Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 22 11:02:56 2014 -0400 Fix a changes typo spotted by wfn --- changes/bug11824 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug11824 b/changes/bug11824 index 1eb89ca..03d7dfc 100644 --- a/changes/bug11824 +++ b/changes/bug11824 @@ -1,5 +1,5 @@ o Minor bugfixes: - When trying to finalize a zlib stream where we have already exhausted all the input bytes and we need more bytes in the - output buffer, do not report the the write as successful. + output buffer, do not report the write as successful. Fixes bug 11824; bugfix on 0.1.1.23.

1 0

[tor/master] Merge remote-tracking branch 'public/ticket6938'
by nickm＠torproject.org 22 Oct '14

22 Oct '14

commit 8e4daa7bb0941037b6b5585059e5570267ee6eb9 Merge: 7161399 93dfb12 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 22 10:14:03 2014 -0400 Merge remote-tracking branch 'public/ticket6938' Conflicts: src/tools/tor-resolve.c changes/ticket6938 | 4 + src/common/log.c | 253 +++++++++++++++++++++++++++++++++------------- src/common/torlog.h | 3 +- src/or/config.c | 6 +- src/or/main.c | 2 +- src/test/bench.c | 2 +- src/test/test.c | 2 +- src/test/test_bt_cl.c | 2 +- src/test/test_logging.c | 4 +- src/tools/tor-checkkey.c | 2 +- src/tools/tor-gencert.c | 2 +- src/tools/tor-resolve.c | 2 +- 12 files changed, 205 insertions(+), 79 deletions(-) diff --cc src/tools/tor-resolve.c index 480c7e5,1b1e674..74af511 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@@ -344,8 -343,7 +344,8 @@@ main(int argc, char **argv char *result_hostname = NULL; log_severity_list_t *s = tor_malloc_zero(sizeof(log_severity_list_t)); - init_logging(); + init_logging(1); + sandbox_disable_getaddrinfo_cache(); arg = &argv[1]; n_args = argc-1;

1 0

[tor/master] Refactor pending_cb_message_t into a type with proper functions
by nickm＠torproject.org 22 Oct '14

22 Oct '14

commit 15a318b49acfb2b7618b25cf8cddf813c745f3ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 10 22:35:16 2014 -0400 Refactor pending_cb_message_t into a type with proper functions Also, rename it. --- src/common/log.c | 49 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/src/common/log.c b/src/common/log.c index 2e51e5c..193389c 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -117,15 +117,19 @@ static int syslog_count = 0; /** Represents a log message that we are going to send to callback-driven * loggers once we can do so in a non-reentrant way. */ -typedef struct pending_cb_message_t { +typedef struct pending_log_message_t { int severity; /**< The severity of the message */ log_domain_mask_t domain; /**< The domain of the message */ char *msg; /**< The content of the message */ -} pending_cb_message_t; +} pending_log_message_t; /** Log messages waiting to be replayed onto callback-based logs */ static smartlist_t *pending_cb_messages = NULL; +/** Log messages waiting to be replayed once the logging system is initialized. + */ +static smartlist_t *pending_startup_messages = NULL; + /** Lock the log_mutex to prevent others from changing the logfile_t list */ #define LOCK_LOGS() STMT_BEGIN \ tor_mutex_acquire(&log_mutex); \ @@ -329,6 +333,27 @@ format_msg(char *buf, size_t buf_len, return end_of_prefix; } +/* Create a new pending_log_message_t with appropriate values */ +static pending_log_message_t * +pending_log_message_new(int severity, log_domain_mask_t domain, const char *msg) +{ + pending_log_message_t *m = tor_malloc(sizeof(pending_log_message_t)); + m->severity = severity; + m->domain = domain; + m->msg = tor_strdup(msg); + return m; +} + +/** Release all storage held by msg. */ +static void +pending_log_message_free(pending_log_message_t *msg) +{ + if (!msg) + return; + tor_free(msg->msg); + tor_free(msg); +} + /** Helper: sends a message to the appropriate logfiles, at loglevel * severity. If provided, funcname is prepended to the * message. The actual message is derived as from tor_snprintf(format,ap). @@ -401,12 +426,8 @@ logv,(int severity, log_domain_mask_t domain, const char *funcname, } else if (lf->callback) { if (domain & LD_NOCB) { if (!callbacks_deferred && pending_cb_messages) { - pending_cb_message_t *msg = tor_malloc(sizeof(pending_cb_message_t)); - msg->severity = severity; - msg->domain = domain; - msg->msg = tor_strdup(end_of_prefix); - smartlist_add(pending_cb_messages, msg); - + smartlist_add(pending_cb_messages, + pending_log_message_new(severity,domain,end_of_prefix)); callbacks_deferred = 1; } } else { @@ -739,9 +760,8 @@ logs_free_all(void) } tor_free(appname); - SMARTLIST_FOREACH(messages, pending_cb_message_t *, msg, { - tor_free(msg->msg); - tor_free(msg); + SMARTLIST_FOREACH(messages, pending_log_message_t *, msg, { + pending_log_message_free(msg); }); smartlist_free(messages); @@ -847,6 +867,8 @@ init_logging(void) } if (pending_cb_messages == NULL) pending_cb_messages = smartlist_new(); + if (pending_startup_messages == NULL) + pending_startup_messages = smartlist_new(); } /** Set whether we report logging domains as a part of our log messages. @@ -932,7 +954,7 @@ flush_pending_log_callbacks(void) messages = pending_cb_messages; pending_cb_messages = smartlist_new(); do { - SMARTLIST_FOREACH_BEGIN(messages, pending_cb_message_t *, msg) { + SMARTLIST_FOREACH_BEGIN(messages, pending_log_message_t *, msg) { const int severity = msg->severity; const int domain = msg->domain; for (lf = logfiles; lf; lf = lf->next) { @@ -942,8 +964,7 @@ flush_pending_log_callbacks(void) } lf->callback(severity, domain, msg->msg); } - tor_free(msg->msg); - tor_free(msg); + pending_log_message_free(msg); } SMARTLIST_FOREACH_END(msg); smartlist_clear(messages);

1 0

[tor/master] Refactor the 'deliver a log message' logic to its own function.
by nickm＠torproject.org 22 Oct '14

22 Oct '14

commit 6e2ef4bc5ef882b3434d2fe15c1007b4ac711374 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 10 22:58:36 2014 -0400 Refactor the 'deliver a log message' logic to its own function. --- src/common/log.c | 92 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 54 insertions(+), 38 deletions(-) diff --git a/src/common/log.c b/src/common/log.c index 544aae9..fb1d85b 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -374,6 +374,58 @@ logfile_wants_message(const logfile_t *lf, int severity, return 1; } +/** Send a message to lf. The full message, with time prefix and + * severity, is in buf. The message itself is in + * msg_after_prefix. If callbacks_deferred points to true, then + * we already deferred this message for pending callbacks and don't need to do + * it again. Otherwise, if we need to do it, do it, and set + * callbacks_deferred to 1. */ +static INLINE void +logfile_deliver(logfile_t *lf, const char *buf, size_t msg_len, + const char *msg_after_prefix, log_domain_mask_t domain, + int severity, int *callbacks_deferred) +{ + + if (lf->is_syslog) { +#ifdef HAVE_SYSLOG_H +#ifdef MAXLINE + /* Some syslog implementations have limits on the length of what you can + * pass them, and some very old ones do not detect overflow so well. + * Regrettably, they call their maximum line length MAXLINE. */ +#if MAXLINE < 64 +#warn "MAXLINE is a very low number; it might not be from syslog.h after all" +#endif + char *m = msg_after_prefix; + if (msg_len >= MAXLINE) + m = tor_strndup(msg_after_prefix, MAXLINE-1); + syslog(severity, "%s", m); + if (m != msg_after_prefix) { + tor_free(m); + } +#else + /* We have syslog but not MAXLINE. That's promising! */ + syslog(severity, "%s", msg_after_prefix); +#endif +#endif + } else if (lf->callback) { + if (domain & LD_NOCB) { + if (!*callbacks_deferred && pending_cb_messages) { + smartlist_add(pending_cb_messages, + pending_log_message_new(severity,domain,msg_after_prefix)); + *callbacks_deferred = 1; + } + } else { + lf->callback(severity, domain, msg_after_prefix); + } + } else { + if (write_all(lf->fd, buf, msg_len, 0) < 0) { /* error */ + /* don't log the error! mark this log entry to be blown away, and + * continue. */ + lf->seems_dead = 1; + } + } +} + /** Helper: sends a message to the appropriate logfiles, at loglevel * severity. If provided, funcname is prepended to the * message. The actual message is derived as from tor_snprintf(format,ap). @@ -410,44 +462,8 @@ logv,(int severity, log_domain_mask_t domain, const char *funcname, formatted = 1; } - if (lf->is_syslog) { -#ifdef HAVE_SYSLOG_H - char *m = end_of_prefix; -#ifdef MAXLINE - /* Some syslog implementations have limits on the length of what you can - * pass them, and some very old ones do not detect overflow so well. - * Regrettably, they call their maximum line length MAXLINE. */ -#if MAXLINE < 64 -#warn "MAXLINE is a very low number; it might not be from syslog.h after all" -#endif - if (msg_len >= MAXLINE) - m = tor_strndup(end_of_prefix, MAXLINE-1); -#endif - syslog(severity, "%s", m); -#ifdef MAXLINE - if (m != end_of_prefix) { - tor_free(m); - } -#endif -#endif - continue; - } else if (lf->callback) { - if (domain & LD_NOCB) { - if (!callbacks_deferred && pending_cb_messages) { - smartlist_add(pending_cb_messages, - pending_log_message_new(severity,domain,end_of_prefix)); - callbacks_deferred = 1; - } - } else { - lf->callback(severity, domain, end_of_prefix); - } - continue; - } - if (write_all(lf->fd, buf, msg_len, 0) < 0) { /* error */ - /* don't log the error! mark this log entry to be blown away, and - * continue. */ - lf->seems_dead = 1; - } + logfile_deliver(lf, buf, msg_len, end_of_prefix, domain, severity, + &callbacks_deferred); } UNLOCK_LOGS(); }

1 0

[tor/master] Turn log loop into a for loop, and "Does this lf want this" into a fn
by nickm＠torproject.org 22 Oct '14

22 Oct '14

commit de114587f047b337cf49e6a308be22f373b4bfc8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 10 22:39:55 2014 -0400 Turn log loop into a for loop, and "Does this lf want this" into a fn --- src/common/log.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/src/common/log.c b/src/common/log.c index 193389c..544aae9 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -354,6 +354,26 @@ pending_log_message_free(pending_log_message_t *msg) tor_free(msg); } +/** Return true iff lf would like to receive a message with the specified + * severity in the specified domain. + */ +static INLINE int +logfile_wants_message(const logfile_t *lf, int severity, + log_domain_mask_t domain) +{ + if (! (lf->severities->masks[SEVERITY_MASK_IDX(severity)] & domain)) { + return 0; + } + if (! (lf->fd >= 0 || lf->is_syslog || lf->callback)) { + return 0; + } + if (lf->seems_dead) { + return 0; + } + + return 1; +} + /** Helper: sends a message to the appropriate logfiles, at loglevel * severity. If provided, funcname is prepended to the * message. The actual message is derived as from tor_snprintf(format,ap). @@ -379,20 +399,9 @@ logv,(int severity, log_domain_mask_t domain, const char *funcname, if ((! (domain & LD_NOCB)) && smartlist_len(pending_cb_messages)) flush_pending_log_callbacks(); - lf = logfiles; - while (lf) { - if (! (lf->severities->masks[SEVERITY_MASK_IDX(severity)] & domain)) { - lf = lf->next; - continue; - } - if (! (lf->fd >= 0 || lf->is_syslog || lf->callback)) { - lf = lf->next; - continue; - } - if (lf->seems_dead) { - lf = lf->next; + for (lf = logfiles; lf; lf = lf->next) { + if (! logfile_wants_message(lf, severity, domain)) continue; - } if (!formatted) { end_of_prefix = @@ -421,7 +430,6 @@ logv,(int severity, log_domain_mask_t domain, const char *funcname, } #endif #endif - lf = lf->next; continue; } else if (lf->callback) { if (domain & LD_NOCB) { @@ -433,7 +441,6 @@ logv,(int severity, log_domain_mask_t domain, const char *funcname, } else { lf->callback(severity, domain, end_of_prefix); } - lf = lf->next; continue; } if (write_all(lf->fd, buf, msg_len, 0) < 0) { /* error */ @@ -441,7 +448,6 @@ logv,(int severity, log_domain_mask_t domain, const char *funcname, * continue. */ lf->seems_dead = 1; } - lf = lf->next; } UNLOCK_LOGS(); }

1 0

[tor/master] Remember log messages that happen before logs are configured
by nickm＠torproject.org 22 Oct '14

22 Oct '14

commit 93dfb1203715bd275d0eed6c8cccf6b6db76fd95 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 10 23:30:37 2014 -0400 Remember log messages that happen before logs are configured (And replay them once we know our first real logs.) This is an implementation for issue 6938. It solves the problem of early log mesages not getting sent to log files, but not the issue of early log messages not getting sent to controllers. --- changes/ticket6938 | 4 +++ src/common/log.c | 86 ++++++++++++++++++++++++++++++++++++++++++---- src/common/torlog.h | 3 +- src/or/config.c | 6 +++- src/or/main.c | 2 +- src/test/bench.c | 2 +- src/test/test.c | 2 +- src/test/test_bt_cl.c | 2 +- src/test/test_logging.c | 4 +-- src/tools/tor-checkkey.c | 2 +- src/tools/tor-gencert.c | 2 +- src/tools/tor-resolve.c | 2 +- 12 files changed, 100 insertions(+), 17 deletions(-) diff --git a/changes/ticket6938 b/changes/ticket6938 new file mode 100644 index 0000000..4e3979a --- /dev/null +++ b/changes/ticket6938 @@ -0,0 +1,4 @@ + o Minor features: + + - When opening a log file at startup, send it every log message that we + generated between startup and opening it. Closes ticket 6938. diff --git a/src/common/log.c b/src/common/log.c index fb1d85b..4b38177 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -120,6 +120,7 @@ static int syslog_count = 0; typedef struct pending_log_message_t { int severity; /**< The severity of the message */ log_domain_mask_t domain; /**< The domain of the message */ + char *fullmsg; /**< The message, with all decorations */ char *msg; /**< The content of the message */ } pending_log_message_t; @@ -130,6 +131,19 @@ static smartlist_t *pending_cb_messages = NULL; */ static smartlist_t *pending_startup_messages = NULL; +/** Number of bytes of messages queued in pending_startup_messages. (This is + * the length of the messages, not the number of bytes used to store + * them.) */ +static size_t pending_startup_messages_len; + +/** True iff we should store messages while waiting for the logs to get + * configured. */ +static int queue_startup_messages = 1; + +/** Don't store more than this many bytes of messages while waiting for the + * logs to get configured. */ +#define MAX_STARTUP_MSG_LEN (1<<16) + /** Lock the log_mutex to prevent others from changing the logfile_t list */ #define LOCK_LOGS() STMT_BEGIN \ tor_mutex_acquire(&log_mutex); \ @@ -335,12 +349,14 @@ format_msg(char *buf, size_t buf_len, /* Create a new pending_log_message_t with appropriate values */ static pending_log_message_t * -pending_log_message_new(int severity, log_domain_mask_t domain, const char *msg) +pending_log_message_new(int severity, log_domain_mask_t domain, + const char *fullmsg, const char *shortmsg) { pending_log_message_t *m = tor_malloc(sizeof(pending_log_message_t)); m->severity = severity; m->domain = domain; - m->msg = tor_strdup(msg); + m->fullmsg = fullmsg ? tor_strdup(fullmsg) : NULL; + m->msg = tor_strdup(shortmsg); return m; } @@ -351,6 +367,7 @@ pending_log_message_free(pending_log_message_t *msg) if (!msg) return; tor_free(msg->msg); + tor_free(msg->fullmsg); tor_free(msg); } @@ -411,7 +428,7 @@ logfile_deliver(logfile_t *lf, const char *buf, size_t msg_len, if (domain & LD_NOCB) { if (!*callbacks_deferred && pending_cb_messages) { smartlist_add(pending_cb_messages, - pending_log_message_new(severity,domain,msg_after_prefix)); + pending_log_message_new(severity,domain,NULL,msg_after_prefix)); *callbacks_deferred = 1; } } else { @@ -451,6 +468,18 @@ logv,(int severity, log_domain_mask_t domain, const char *funcname, if ((! (domain & LD_NOCB)) && smartlist_len(pending_cb_messages)) flush_pending_log_callbacks(); + if (queue_startup_messages && + pending_startup_messages_len < MAX_STARTUP_MSG_LEN) { + end_of_prefix = + format_msg(buf, sizeof(buf), domain, severity, funcname, suffix, + format, ap, &msg_len); + formatted = 1; + + smartlist_add(pending_startup_messages, + pending_log_message_new(severity,domain,buf,end_of_prefix)); + pending_startup_messages_len += msg_len; + } + for (lf = logfiles; lf; lf = lf->next) { if (! logfile_wants_message(lf, severity, domain)) continue; @@ -767,12 +796,14 @@ void logs_free_all(void) { logfile_t *victim, *next; - smartlist_t *messages; + smartlist_t *messages, *messages2; LOCK_LOGS(); next = logfiles; logfiles = NULL; messages = pending_cb_messages; pending_cb_messages = NULL; + messages2 = pending_startup_messages; + pending_startup_messages = NULL; UNLOCK_LOGS(); while (next) { victim = next; @@ -787,6 +818,13 @@ logs_free_all(void) }); smartlist_free(messages); + if (messages2) { + SMARTLIST_FOREACH(messages2, pending_log_message_t *, msg, { + pending_log_message_free(msg); + }); + smartlist_free(messages2); + } + /* We _could_ destroy the log mutex here, but that would screw up any logs * that happened between here and the end of execution. */ } @@ -881,7 +919,7 @@ add_stream_log(const log_severity_list_t *severity, const char *name, int fd) /** Initialize the global logging facility */ void -init_logging(void) +init_logging(int disable_startup_queue) { if (!log_mutex_initialized) { tor_mutex_init(&log_mutex); @@ -889,8 +927,11 @@ init_logging(void) } if (pending_cb_messages == NULL) pending_cb_messages = smartlist_new(); - if (pending_startup_messages == NULL) + if (disable_startup_queue) + queue_startup_messages = 0; + if (pending_startup_messages == NULL && queue_startup_messages) { pending_startup_messages = smartlist_new(); + } } /** Set whether we report logging domains as a part of our log messages. @@ -1000,6 +1041,39 @@ flush_pending_log_callbacks(void) UNLOCK_LOGS(); } +/** Flush all the messages we stored from startup while waiting for log + * initialization. + */ +void +flush_log_messages_from_startup(void) +{ + logfile_t *lf; + + LOCK_LOGS(); + queue_startup_messages = 0; + pending_startup_messages_len = 0; + if (! pending_startup_messages) + goto out; + + SMARTLIST_FOREACH_BEGIN(pending_startup_messages, pending_log_message_t *, + msg) { + int callbacks_deferred = 0; + for (lf = logfiles; lf; lf = lf->next) { + if (! logfile_wants_message(lf, msg->severity, msg->domain)) + continue; + + logfile_deliver(lf, msg->fullmsg, strlen(msg->fullmsg), msg->msg, + msg->domain, msg->severity, &callbacks_deferred); + } + pending_log_message_free(msg); + } SMARTLIST_FOREACH_END(msg); + smartlist_free(pending_startup_messages); + pending_startup_messages = NULL; + + out: + UNLOCK_LOGS(); +} + /** Close any log handlers added by add_temp_log() or marked by * mark_logs_temp(). */ void diff --git a/src/common/torlog.h b/src/common/torlog.h index 34e39b4..8105af4 100644 --- a/src/common/torlog.h +++ b/src/common/torlog.h @@ -121,7 +121,7 @@ typedef struct log_severity_list_t { /** Callback type used for add_callback_log. */ typedef void (*log_callback)(int severity, uint32_t domain, const char *msg); -void init_logging(void); +void init_logging(int disable_startup_queue); int parse_log_level(const char *level); const char *log_level_to_string(int level); int parse_log_severity_config(const char **cfg, @@ -147,6 +147,7 @@ void mark_logs_temp(void); void change_callback_log_severity(int loglevelMin, int loglevelMax, log_callback cb); void flush_pending_log_callbacks(void); +void flush_log_messages_from_startup(void); void log_set_application_name(const char *name); void set_log_time_granularity(int granularity_msec); void truncate_logs(void); diff --git a/src/or/config.c b/src/or/config.c index ba9c944..85e36c7 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1023,7 +1023,7 @@ options_act_reversible(const or_options_t *old_options, char **msg) int running_tor = options->command == CMD_RUN_TOR; int set_conn_limit = 0; int r = -1; - int logs_marked = 0; + int logs_marked = 0, logs_initialized = 0; int old_min_log_level = get_min_log_level(); /* Daemonize _first_, since we only want to open most of this stuff in @@ -1153,6 +1153,7 @@ options_act_reversible(const or_options_t *old_options, char **msg) *msg = tor_strdup("Failed to init Log options. See logs for details."); goto rollback; } + logs_initialized = 1; commit: r = 0; @@ -1165,6 +1166,9 @@ options_act_reversible(const or_options_t *old_options, char **msg) tor_free(severity); tor_log_update_sigsafe_err_fds(); } + if (logs_initialized) { + flush_log_messages_from_startup(); + } { const char *badness = NULL; diff --git a/src/or/main.c b/src/or/main.c index 094120f..ffbed6e 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2954,7 +2954,7 @@ tor_main(int argc, char *argv[]) update_approx_time(time(NULL)); tor_threads_init(); - init_logging(); + init_logging(0); #ifdef USE_DMALLOC { /* Instruct OpenSSL to use our internal wrappers for malloc, diff --git a/src/test/bench.c b/src/test/bench.c index f6c3362..70bac63 100644 --- a/src/test/bench.c +++ b/src/test/bench.c @@ -569,7 +569,7 @@ main(int argc, const char **argv) crypto_seed_rng(1); crypto_init_siphash_key(); options = options_new(); - init_logging(); + init_logging(1); options->command = CMD_RUN_UNITTESTS; options->DataDirectory = tor_strdup(""); options_init(options); diff --git a/src/test/test.c b/src/test/test.c index e836160..a14064f 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1381,7 +1381,7 @@ main(int c, const char **v) update_approx_time(time(NULL)); options = options_new(); tor_threads_init(); - init_logging(); + init_logging(1); configure_backtrace_handler(get_version()); for (i_out = i = 1; i < c; ++i) { diff --git a/src/test/test_bt_cl.c b/src/test/test_bt_cl.c index 720ccd4..d7a3cab 100644 --- a/src/test/test_bt_cl.c +++ b/src/test/test_bt_cl.c @@ -96,7 +96,7 @@ main(int argc, char **argv) return 1; } - init_logging(); + init_logging(1); set_log_severity_config(LOG_WARN, LOG_ERR, &severity); add_stream_log(&severity, "stdout", STDOUT_FILENO); tor_log_update_sigsafe_err_fds(); diff --git a/src/test/test_logging.c b/src/test/test_logging.c index 9f57000..76cc9e9 100644 --- a/src/test/test_logging.c +++ b/src/test/test_logging.c @@ -19,7 +19,7 @@ test_get_sigsafe_err_fds(void *arg) int n; log_severity_list_t include_bug, no_bug, no_bug2; (void) arg; - init_logging(); + init_logging(1); n = tor_log_get_sigsafe_err_fds(&fds); tt_int_op(n, ==, 1); @@ -87,7 +87,7 @@ test_sigsafe_err(void *arg) set_log_severity_config(LOG_WARN, LOG_ERR, &include_bug); - init_logging(); + init_logging(1); mark_logs_temp(); add_file_log(&include_bug, fn, 0); tor_log_update_sigsafe_err_fds(); diff --git a/src/tools/tor-checkkey.c b/src/tools/tor-checkkey.c index d50f12e..295da33 100644 --- a/src/tools/tor-checkkey.c +++ b/src/tools/tor-checkkey.c @@ -21,7 +21,7 @@ main(int c, char **v) int wantdigest=0; int fname_idx; char *fname=NULL; - init_logging(); + init_logging(1); if (c < 2) { fprintf(stderr, "Hi. I'm tor-checkkey. Tell me a filename that " diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index fae26ef..0fe6821 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -525,7 +525,7 @@ int main(int argc, char **argv) { int r = 1; - init_logging(); + init_logging(1); /* Don't bother using acceleration. */ if (crypto_global_init(0, NULL, NULL)) { diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c index 306f6c6..1b1e674 100644 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@ -343,7 +343,7 @@ main(int argc, char **argv) char *result_hostname = NULL; log_severity_list_t *s = tor_malloc_zero(sizeof(log_severity_list_t)); - init_logging(); + init_logging(1); arg = &argv[1]; n_args = argc-1;

1 0