diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-02-26 05:36:02 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-02-26 05:36:02 +0000 |
| commit | 522a97098beccf8c6410fe903266ced5d2f4577d (patch) | |
| tree | 0785151faaea1df374b7d449570383a1e6c5106f /src/or | |
| parent | 9e44449946623a50d9f51dfcea0b765a7bdeec91 (diff) | |
| download | tor-522a97098beccf8c6410fe903266ced5d2f4577d.tar.gz tor-522a97098beccf8c6410fe903266ced5d2f4577d.zip | |
more cleanups; getting closer
svn:r9655
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/directory.c | 3 | ||||
| -rw-r--r-- | src/or/main.c | 3 | ||||
| -rw-r--r-- | src/or/relay.c | 7 | ||||
| -rw-r--r-- | src/or/router.c | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index 0dc2eccf0d..d3e582ce7b 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -712,7 +712,8 @@ http_set_address_origin(const char *headers, connection_t *conn) if (fwd) { struct in_addr in; if (!tor_inet_aton(fwd, &in) || is_internal_IP(ntohl(in.s_addr), 0)) { - log_debug(LD_DIR, "Ignoring unrecognized or internal IP '%s'", fwd); + log_debug(LD_DIR, "Ignoring unrecognized or internal IP %s", + escaped(fwd)); tor_free(fwd); return; } diff --git a/src/or/main.c b/src/or/main.c index 551b3686b2..19e875c2c0 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -974,7 +974,8 @@ run_scheduled_events(time_t now) } } -/** Libevent timer: used to invoke second_elapsed_callback() once per second. */ +/** Libevent timer: used to invoke second_elapsed_callback() once per + * second. */ static struct event *timeout_event = NULL; /** Number of libevent errors in the last second: we die if we get too many. */ static int n_libevent_errors = 0; diff --git a/src/or/relay.c b/src/or/relay.c index e89937f4f5..28d77cc4a5 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -829,9 +829,9 @@ connection_edge_process_end_not_open( return 0; } -/** Helper: change the socks_request->address field on conn to the dotted-quad - * representation of <b>new_addr</b> (given in host order), and send an - * appropriate REMAP event. */ +/** Helper: change the socks_request->address field on conn to the + * dotted-quad representation of <b>new_addr</b> (given in host order), + * and send an appropriate REMAP event. */ static void remap_event_helper(edge_connection_t *conn, uint32_t new_addr) { @@ -873,7 +873,6 @@ connection_edge_process_relay_cell_not_open( "Got 'connected' while not in state connect_wait. Dropping."); return 0; } - // log_fn(LOG_INFO,"Connected! Notifying application."); conn->_base.state = AP_CONN_STATE_OPEN; log_info(LD_APP,"'connected' received after %d seconds.", (int)(time(NULL) - conn->_base.timestamp_lastread)); diff --git a/src/or/router.c b/src/or/router.c index 17c7581853..0c0f4c986d 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -562,7 +562,7 @@ router_perform_bandwidth_test(int num_circs, time_t now) int cells_per_circuit = max_cells / num_circs; origin_circuit_t *circ = NULL; - log_notice(LD_OR,"Performing bandwidth self-test."); + log_notice(LD_OR,"Performing bandwidth self-test...done."); while ((circ = circuit_get_next_by_pk_and_purpose(circ, NULL, CIRCUIT_PURPOSE_TESTING))) { /* dump cells_per_circuit drop cells onto this circ */ |