helper nodes are dead. long live entry nodes.

(config options EntryNodes and StrictEntryNodes still not
implemented.)


svn:r5673

1 files changed, 3 insertions, 3 deletions

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index d7dea97661..a5e837cd8a 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -452,7 +452,7 @@ connection_or_connect(uint32_t addr, uint16_t port, const char *id_digest)
        * Tor server. */
       if (!options->HttpsProxy) {
         router_mark_as_down(conn->identity_digest);
-        helper_node_set_status(conn->identity_digest, 0);
+        entry_node_set_status(conn->identity_digest, 0);
       }
       control_event_or_conn_status(conn, OR_CONN_EVENT_FAILED);
       connection_free(conn);
@@ -625,7 +625,7 @@ connection_or_check_valid_handshake(connection_t *conn, char *digest_rcvd)
              "Identity key not as expected for router at %s:%d: wanted %s "
              "but got %s",
              conn->address, conn->port, expected, seen);
-      helper_node_set_status(conn->identity_digest, 0);
+      entry_node_set_status(conn->identity_digest, 0);
       control_event_or_conn_status(conn, OR_CONN_EVENT_FAILED);
       as_advertised = 0;
     }
@@ -687,7 +687,7 @@ connection_tls_finish_handshake(connection_t *conn)
   control_event_or_conn_status(conn, OR_CONN_EVENT_CONNECTED);
   if (started_here) {
     rep_hist_note_connect_succeeded(conn->identity_digest, time(NULL));
-    if (helper_node_set_status(conn->identity_digest, 1) < 0) {
+    if (entry_node_set_status(conn->identity_digest, 1) < 0) {
       /* pending circs get closed in circuit_about_to_close_connection() */
       return -1;
     }