diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | src/or/circuitbuild.c | 2 | ||||
| -rw-r--r-- | src/or/command.c | 2 | ||||
| -rw-r--r-- | src/or/connection.c | 6 | ||||
| -rw-r--r-- | src/or/directory.c | 6 | ||||
| -rw-r--r-- | src/or/main.c | 6 | ||||
| -rw-r--r-- | src/or/rendcommon.c | 2 |
7 files changed, 14 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog index ad13013a58..19935a738d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ tor (0.1.1.8-alpha-cvs-1) experimental; urgency=low * CVS snapshot. Mon, 17 Oct 2005 03:54:01 +0200 * Remove 08_add_newlines_between_serverdescriptors.dpatch. * Update 06_add_compile_time_defaults.dpatch + * Add some info -> debug log downgrades. - -- Peter Palfrader <weasel@debian.org> Mon, 17 Oct 2005 03:58:58 +0200 + -- Peter Palfrader <weasel@debian.org> Mon, 17 Oct 2005 04:01:50 +0200 tor (0.1.1.8-alpha-1) experimental; urgency=low diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 420c9ba3bf..a71fde7ed5 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -866,7 +866,7 @@ onionskin_answer(circuit_t *circ, uint8_t cell_type, char *payload, char *keys) memcpy(cell.payload, payload, cell_type == CELL_CREATED ? ONIONSKIN_REPLY_LEN : DIGEST_LEN*2); - log_fn(LOG_INFO,"init digest forward 0x%.8x, backward 0x%.8x.", + log_fn(LOG_DEBUG,"init digest forward 0x%.8x, backward 0x%.8x.", (unsigned int)*(uint32_t*)(keys), (unsigned int)*(uint32_t*)(keys+20)); if (circuit_init_cpath_crypto(tmp_cpath, keys, 0)<0) { log_fn(LOG_WARN,"Circuit initialization failed"); diff --git a/src/or/command.c b/src/or/command.c index b7c474d730..acb7cda05e 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -335,7 +335,7 @@ command_process_destroy_cell(cell_t *cell, connection_t *conn) return; } - log_fn(LOG_INFO,"Received for circID %d.",cell->circ_id); + log_fn(LOG_DEBUG,"Received for circID %d.",cell->circ_id); if (circ->state == CIRCUIT_STATE_ONIONSKIN_PENDING) { onion_pending_remove(circ); } diff --git a/src/or/connection.c b/src/or/connection.c index 2e611ccc8a..9aaa9a6a11 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -234,7 +234,7 @@ _connection_free(connection_t *conn) tor_free(conn->requested_resource); if (conn->s >= 0) { - log_fn(LOG_INFO,"closing fd %d.",conn->s); + log_fn(LOG_DEBUG,"closing fd %d.",conn->s); tor_close_socket(conn->s); } @@ -631,7 +631,7 @@ connection_handle_listener_read(connection_t *conn, int new_type) connection_mark_for_close(conn); return -1; } - log(LOG_INFO,"Connection accepted on socket %d (child of fd %d).",news, conn->s); + log(LOG_DEBUG,"Connection accepted on socket %d (child of fd %d).",news, conn->s); set_socket_nonblocking(news); @@ -1756,7 +1756,7 @@ connection_send_destroy(uint16_t circ_id, connection_t *conn) memset(&cell, 0, sizeof(cell_t)); cell.circ_id = circ_id; cell.command = CELL_DESTROY; - log_fn(LOG_INFO,"Sending destroy (circID %d).", circ_id); + log_fn(LOG_DEBUG,"Sending destroy (circID %d).", circ_id); connection_or_write_cell_to_buf(&cell, conn); return 0; } diff --git a/src/or/directory.c b/src/or/directory.c index 1ebd6f1260..3f367beafe 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1230,7 +1230,7 @@ directory_handle_command_get(connection_t *conn, char *headers, write_http_status_line(conn, 400, "Bad request"); return 0; } - log_fn(LOG_INFO,"rewritten url as '%s'.", url); + log_fn(LOG_DEBUG,"rewritten url as '%s'.", url); if (!strcmp(url,"/tor/") || !strcmp(url,"/tor/dir.z")) { /* directory fetch */ int deflated = !strcmp(url,"/tor/dir.z"); @@ -1453,7 +1453,7 @@ directory_handle_command_post(connection_t *conn, char *headers, write_http_status_line(conn, 400, "Bad request"); return 0; } - log_fn(LOG_INFO,"rewritten url as '%s'.", url); + log_fn(LOG_DEBUG,"rewritten url as '%s'.", url); origin = http_get_origin(headers, conn); if (!strcmp(url,"/tor/")) { /* server descriptor post */ @@ -1556,7 +1556,7 @@ connection_dir_finished_flushing(connection_t *conn) connection_stop_writing(conn); return 0; case DIR_CONN_STATE_SERVER_WRITING: - log_fn(LOG_INFO,"Finished writing server response. Closing."); + log_fn(LOG_DEBUG,"Finished writing server response. Closing."); connection_mark_for_close(conn); return 0; default: diff --git a/src/or/main.c b/src/or/main.c index d24f7b0e04..34ce2647ec 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -139,7 +139,7 @@ connection_add(connection_t *conn) nfds++; - log_fn(LOG_INFO,"new conn type %s, socket %d, nfds %d.", + log_fn(LOG_DEBUG,"new conn type %s, socket %d, nfds %d.", conn_type_to_string(conn->type), conn->s, nfds); return 0; @@ -157,7 +157,7 @@ connection_remove(connection_t *conn) tor_assert(conn); tor_assert(nfds>0); - log_fn(LOG_INFO,"removing socket %d (type %s), nfds now %d", + log_fn(LOG_DEBUG,"removing socket %d (type %s), nfds now %d", conn->s, conn_type_to_string(conn->type), nfds-1); tor_assert(conn->poll_index >= 0); @@ -437,7 +437,7 @@ conn_close_if_marked(int i) assert_connection_ok(conn, time(NULL)); assert_all_pending_dns_resolves_ok(); - log_fn(LOG_INFO,"Cleaning up connection (fd %d).",conn->s); + log_fn(LOG_DEBUG,"Cleaning up connection (fd %d).",conn->s); if (conn->s >= 0 && connection_wants_to_flush(conn)) { /* -1 means it's an incomplete edge connection, or that the socket * has already been closed as unflushable. */ diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 2e1711580c..b1e03bb304 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -407,7 +407,7 @@ rend_cache_store(const char *desc, size_t desc_len) e->desc = tor_malloc(desc_len); memcpy(e->desc, desc, desc_len); - log_fn(LOG_INFO,"Successfully stored rend desc '%s', len %d.", + log_fn(LOG_DEBUG,"Successfully stored rend desc '%s', len %d.", safe_str(query), (int)desc_len); return 1; } |