diff options
author | Roger Dingledine <arma@torproject.org> | 2002-10-02 22:54:20 +0000 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2002-10-02 22:54:20 +0000 |
commit | bf53852a002f3a0b323ebf67354f2d7a1e4039e6 (patch) | |
tree | dd02f724114715c6eea4aba53dc0392d7c1204b7 /src/or/connection_ap.c | |
parent | bef3424bec7ddc67f9d561b1e7f5aa652fb4893f (diff) | |
download | tor-bf53852a002f3a0b323ebf67354f2d7a1e4039e6.tar tor-bf53852a002f3a0b323ebf67354f2d7a1e4039e6.tar.gz |
cleanup and a variety of bugfixes
svn:r132
Diffstat (limited to 'src/or/connection_ap.c')
-rw-r--r-- | src/or/connection_ap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/connection_ap.c b/src/or/connection_ap.c index 3751beae4..d268f5b78 100644 --- a/src/or/connection_ap.c +++ b/src/or/connection_ap.c @@ -205,7 +205,7 @@ int ap_handshake_establish_circuit(connection_t *conn, unsigned int *route, int connection_stop_reading(conn); /* Stop listening for input from the AP! */ if(!n_conn) { /* launch the connection */ - n_conn = connect_to_router_as_op(firsthop); + n_conn = connection_or_connect_as_op(firsthop); if(!n_conn) { /* connect failed, forget the whole thing */ log(LOG_DEBUG,"ap_handshake_establish_circuit(): connect to firsthop failed. Closing."); circuit_close(circ); @@ -393,9 +393,9 @@ int connection_ap_finished_flushing(connection_t *conn) { } -int connection_ap_create_listener(struct sockaddr_in *local) { +int connection_ap_create_listener(struct sockaddr_in *bindaddr) { log(LOG_DEBUG,"connection_create_ap_listener starting"); - return connection_create_listener(local, CONN_TYPE_AP_LISTENER); + return connection_create_listener(bindaddr, CONN_TYPE_AP_LISTENER); } int connection_ap_handle_listener_read(connection_t *conn) { |