clean up string printing in relay logs

svn:r3317

diff --git a/src/or/main.c b/src/or/main.c
index 43c0ebaf5bcf3aec937727d747c04f3a719bb42d..da5d78e0c43c63130e0d57e0ef9e43bfed6b6b46 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -240,6 +240,8 @@ static void conn_read(int i) {
   if (conn->marked_for_close)
     return;
 
+  /* post 0.0.9, 
+
   /* see http://www.greenend.org.uk/rjk/2001/06/poll.html for
    * discussion of POLLIN vs POLLHUP */
   if (!(poll_array[i].revents & (POLLIN|POLLHUP|POLLERR)))

diff --git a/src/or/relay.c b/src/or/relay.c
index 0773ebd1cdbc39d5eef86f1c6a3e23c611350a90..661280c57e31d201aebec3962e0a520bcbc92cc0 100644 (file)
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -507,10 +507,10 @@ connection_edge_process_relay_cell_not_open(
       }
       addr = ntohl(get_uint32(cell->payload+RELAY_HEADER_SIZE+1));
       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);
       } 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->has_sent_end = 1; /* we just got an 'end', don't need to send one */
         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 */
       }
       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);
         exitrouter->exit_policy =
           router_parse_addr_policy_from_string("reject *:*");