nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 21:44:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use log_fn_ratelim in a few places.

Browse Source
This commit is contained in:
Nick Mathewson 2012-12-26 11:07:15 -05:00
parent f269e0f9a5
commit a7334f5122
4 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/or/buffers.c
View File

@ -1505,22 +1505,19 @@ log_unsafe_socks_warning(int socks_protocol, const char *address,
static ratelim_t socks_ratelim = RATELIM_INIT(SOCKS_WARN_INTERVAL); static ratelim_t socks_ratelim = RATELIM_INIT(SOCKS_WARN_INTERVAL);
const or_options_t *options = get_options(); const or_options_t *options = get_options();
char *m = NULL;
if (! options->WarnUnsafeSocks) if (! options->WarnUnsafeSocks)
return; return;
if (safe_socks || (m = rate_limit_log(&socks_ratelim, approx_time()))) { if (safe_socks) {
log_warn(LD_APP, log_fn_ratelim(&socks_ratelim, LOG_WARN, LD_APP,
"Your application (using socks%d to port %d) is giving " "Your application (using socks%d to port %d) is giving "
"Tor only an IP address. Applications that do DNS resolves " "Tor only an IP address. Applications that do DNS resolves "
"themselves may leak information. Consider using Socks4A " "themselves may leak information. Consider using Socks4A "
"(e.g. via privoxy or socat) instead. For more information, " "(e.g. via privoxy or socat) instead. For more information, "
"please see https://wiki.torproject.org/TheOnionRouter/" "please see https://wiki.torproject.org/TheOnionRouter/"
"TorFAQ#SOCKSAndDNS.%s%s", "TorFAQ#SOCKSAndDNS.%s",
socks_protocol, socks_protocol,
(int)port, (int)port,
safe_socks ? " Rejecting." : "", safe_socks ? " Rejecting." : "");
m ? m : "");
tor_free(m);
} }
control_event_client_status(LOG_WARN, control_event_client_status(LOG_WARN,
"DANGEROUS_SOCKS PROTOCOL=SOCKS%d ADDRESS=%s:%d", "DANGEROUS_SOCKS PROTOCOL=SOCKS%d ADDRESS=%s:%d",

10
src/or/circuituse.c
View File

@ -479,17 +479,13 @@ circuit_expire_building(void)
continue; continue;
} else { } else {
static ratelim_t relax_timeout_limit = RATELIM_INIT(3600); static ratelim_t relax_timeout_limit = RATELIM_INIT(3600);
char *m; log_fn_ratelim(&relax_timeout_limit, LOG_NOTICE, LD_CIRC,
if ((m = rate_limit_log(&relax_timeout_limit, approx_time()))) {
log_notice(LD_CIRC,
"No circuits are opened. Relaxed timeout for " "No circuits are opened. Relaxed timeout for "
"a circuit with channel state %s to %ldms. " "a circuit with channel state %s to %ldms. "
"However, it appears the circuit has timed out anyway. " "However, it appears the circuit has timed out anyway. "
"%d guards are live. %s", "%d guards are live.",
channel_state_to_string(victim->n_chan->state), channel_state_to_string(victim->n_chan->state),
(long)circ_times.close_ms, num_live_entry_guards(0), m); (long)circ_times.close_ms, num_live_entry_guards(0));
tor_free(m);
}
} }
} }

7
src/or/connection.c
View File

@ -1441,16 +1441,13 @@ connection_connect(connection_t *conn, const char *address,
/* We should never even try to connect anyplace if DisableNetwork is set. /* We should never even try to connect anyplace if DisableNetwork is set.
* Warn if we do, and refuse to make the connection. */ * Warn if we do, and refuse to make the connection. */
static ratelim_t disablenet_violated = RATELIM_INIT(30*60); static ratelim_t disablenet_violated = RATELIM_INIT(30*60);
char *m;
#ifdef _WIN32 #ifdef _WIN32
*socket_error = WSAENETUNREACH; *socket_error = WSAENETUNREACH;
#else #else
*socket_error = ENETUNREACH; *socket_error = ENETUNREACH;
#endif #endif
if ((m = rate_limit_log(&disablenet_violated, approx_time()))) { log_fn_ratelim(&disablenet_violated, LOG_WARN, LD_BUG,
log_warn(LD_BUG, "Tried to open a socket with DisableNetwork set.%s", m); "Tried to open a socket with DisableNetwork set.");
tor_free(m);
}
tor_fragile_assert(); tor_fragile_assert();
return -1; return -1;
} }

9
src/or/router.c
View File

@ -936,14 +936,11 @@ consider_testing_reachability(int test_or, int test_dir)
if (test_or || test_dir) { if (test_or || test_dir) {
#define SELF_EXCLUDED_WARN_INTERVAL 3600 #define SELF_EXCLUDED_WARN_INTERVAL 3600
static ratelim_t warning_limit=RATELIM_INIT(SELF_EXCLUDED_WARN_INTERVAL); static ratelim_t warning_limit=RATELIM_INIT(SELF_EXCLUDED_WARN_INTERVAL);
char *msg; log_fn_ratelim(&warning_limit, LOG_WARN, LD_CIRC,
if ((msg = rate_limit_log(&warning_limit, approx_time()))) { "Can't peform self-tests for this relay: we have "
log_warn(LD_CIRC, "Can't peform self-tests for this relay: we have "
"listed ourself in ExcludeNodes, and StrictNodes is set. " "listed ourself in ExcludeNodes, and StrictNodes is set. "
"We cannot learn whether we are usable, and will not " "We cannot learn whether we are usable, and will not "
"be able to advertise ourself.%s", msg); "be able to advertise ourself.");
tor_free(msg);
}
} }
return; return;
} }