prefer tor_free to free

plus complain more loudly when we fail to parse a dir we just fetched


svn:r2401

1 files changed, 2 insertions, 4 deletions

diff --git a/src/or/main.c b/src/or/main.c
index 87924da0e..bef042cd2 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -297,7 +297,6 @@ static void conn_write(int i) {
 static void conn_close_if_marked(int i) {
   connection_t *conn;
   int retval;
-  struct in_addr in;
 
   conn = connection_array[i];
   assert_connection_ok(conn, time(NULL));
@@ -309,12 +308,11 @@ static void conn_close_if_marked(int i) {
   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. */
-    in.s_addr = htonl(conn->addr);
     if(!conn->hold_open_until_flushed)
       log_fn(LOG_INFO,
         "Conn (addr %s, fd %d, type %s, state %d) marked, but wants to flush %d bytes. "
         "(Marked at %s:%d)",
-        inet_ntoa(in), conn->s, CONN_TYPE_TO_STRING(conn->type), conn->state,
+        conn->address, conn->s, CONN_TYPE_TO_STRING(conn->type), conn->state,
         conn->outbuf_flushlen, conn->marked_for_close_file, conn->marked_for_close);
     if(connection_speaks_cells(conn)) {
       if(conn->state == OR_CONN_STATE_OPEN) {
@@ -332,7 +330,7 @@ static void conn_close_if_marked(int i) {
     }
     if(connection_wants_to_flush(conn)) {
       log_fn(LOG_WARN,"Conn (addr %s, fd %d, type %s, state %d) still wants to flush. Losing %d bytes! (Marked at %s:%d)",
-             inet_ntoa(in), conn->s, CONN_TYPE_TO_STRING(conn->type), conn->state,
+             conn->address, conn->s, CONN_TYPE_TO_STRING(conn->type), conn->state,
              (int)buf_datalen(conn->outbuf), conn->marked_for_close_file,
              conn->marked_for_close);
     }