Commit 47122d1d authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Revert junk accidentally included with "start folding in the changes entries" 

Looks like Roger's debugging code wanted to take a tour of the world
outside his sandbox.

This reverts part of commit 19d37202.
parent cb24852e

src/or/connection.c

+1 −2
Original line number Diff line number Diff line
@@ -1245,7 +1245,6 @@ connection_handle_listener_read(connection_t *conn, int new_type) 
  if (!SOCKET_OK(news)) { /* accept() error */

    int e = tor_socket_errno(conn->s);

    if (ERRNO_IS_ACCEPT_EAGAIN(e)) {

      log_notice(LD_APP, "he hung up before we could accept(). that's fine.");

      return 0; /* he hung up before we could accept(). that's fine. */

    } else if (ERRNO_IS_ACCEPT_RESOURCE_LIMIT(e)) {

      warn_too_many_conns();
@@ -1257,7 +1256,7 @@ connection_handle_listener_read(connection_t *conn, int new_type) 
    connection_mark_for_close(conn);

    return -1;

  }

  log_notice(LD_NET,

  log_debug(LD_NET,

            "Connection accepted on socket %d (child of fd %d).",

            (int)news,(int)conn->s);

src/or/relay.c

+0 −8
Original line number Diff line number Diff line
@@ -1619,14 +1619,6 @@ connection_edge_package_raw_inbuf(edge_connection_t *conn, int package_partial, 
            conn->base_.s,

            (int)length, (int)connection_get_inbuf_len(TO_CONN(conn)));



  if (conn->base_.type == CONN_TYPE_AP) {

    char *text = tor_memdup(payload, length+1);

    text[length] = 0;

    log_notice(LD_APP, "Incoming socks text (%d):===\n%s\n===",

               conn->base_.s, text);

    tor_free(text);

  }



  if (sending_optimistically && !sending_from_optimistic) {

    /* This is new optimistic data; remember it in case we need to detach and

       retry */