nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

clean up string printing in relay logs

Browse Source 
svn:r3317
This commit is contained in:
Roger Dingledine 2005-01-06 19:19:13 +00:00
parent 6d2859c2e5
commit 1f51809e65
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/main.c
View File

@ -240,6 +240,8 @@ static void conn_read(int i) {
if (conn->marked_for_close) if (conn->marked_for_close)
return; return;
/* post 0.0.9,
/* see http://www.greenend.org.uk/rjk/2001/06/poll.html for /* see http://www.greenend.org.uk/rjk/2001/06/poll.html for
* discussion of POLLIN vs POLLHUP */ * discussion of POLLIN vs POLLHUP */
if (!(poll_array[i].revents & (POLLIN|POLLHUP|POLLERR))) if (!(poll_array[i].revents & (POLLIN|POLLHUP|POLLERR)))

6
src/or/relay.c
View File

@ -507,10 +507,10 @@ connection_edge_process_relay_cell_not_open(
} }
addr = ntohl(get_uint32(cell->payload+RELAY_HEADER_SIZE+1)); addr = ntohl(get_uint32(cell->payload+RELAY_HEADER_SIZE+1));
if (addr) { if (addr) {
log_fn(LOG_INFO,"Address %s refused due to exit policy. Retrying.", log_fn(LOG_INFO,"Address '%s' refused due to exit policy. Retrying.",
conn->socks_request->address); conn->socks_request->address);
} else { } else {
log_fn(LOG_INFO,"Address %s resolved to 0.0.0.0. Closing,", log_fn(LOG_INFO,"Address '%s' resolved to 0.0.0.0. Closing,",
conn->socks_request->address); conn->socks_request->address);
conn->has_sent_end = 1; /* we just got an 'end', don't need to send one */ conn->has_sent_end = 1; /* we just got an 'end', don't need to send one */
connection_mark_for_close(conn); connection_mark_for_close(conn);
@ -525,7 +525,7 @@ connection_edge_process_relay_cell_not_open(
return 0; /* this circuit is screwed and doesn't know it yet */ return 0; /* this circuit is screwed and doesn't know it yet */
} }
if (connection_ap_can_use_exit(conn, exitrouter)) { if (connection_ap_can_use_exit(conn, exitrouter)) {
log_fn(LOG_NOTICE,"Exitrouter %s seems to be more restrictive than its exit policy. Not using this router as exit for now.", exitrouter->nickname); log_fn(LOG_NOTICE,"Exitrouter '%s' seems to be more restrictive than its exit policy. Not using this router as exit for now.", exitrouter->nickname);
addr_policy_free(exitrouter->exit_policy); addr_policy_free(exitrouter->exit_policy);
exitrouter->exit_policy = exitrouter->exit_policy =
router_parse_addr_policy_from_string("reject *:*"); router_parse_addr_policy_from_string("reject *:*");