diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-03-24 15:58:11 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-03-24 15:58:11 +0000 |
| commit | da6bd21b72153b84a4c6831467d956ddd86f2532 (patch) | |
| tree | 4d411800eb8f1c827ccf983332c77b41b0d491c0 /src/or/or.h | |
| parent | 306d5400c367460936523f8417102f043a98fa78 (diff) | |
| download | tor-da6bd21b72153b84a4c6831467d956ddd86f2532.tar tor-da6bd21b72153b84a4c6831467d956ddd86f2532.tar.gz | |
r12644@0-41-wifi: nickm | 2007-03-23 16:02:23 -0400
Eliminate more redundant circuit_t arguments when edge_connection_t is already supplied and the circuit is already attached.
svn:r9900
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/or/or.h b/src/or/or.h index a46879220..0201607c9 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2195,10 +2195,8 @@ int connection_edge_end_errno(edge_connection_t *conn); int connection_edge_finished_flushing(edge_connection_t *conn); int connection_edge_finished_connecting(edge_connection_t *conn); -int connection_ap_handshake_send_begin(edge_connection_t *ap_conn, - origin_circuit_t *circ); -int connection_ap_handshake_send_resolve(edge_connection_t *ap_conn, - origin_circuit_t *circ); +int connection_ap_handshake_send_begin(edge_connection_t *ap_conn); +int connection_ap_handshake_send_resolve(edge_connection_t *ap_conn); int connection_ap_make_bridge(char *address, uint16_t port, const char *digest, int command); @@ -2477,7 +2475,7 @@ void connection_dns_remove(edge_connection_t *conn); void assert_connection_edge_not_dns_pending(edge_connection_t *conn); void assert_all_pending_dns_resolves_ok(void); void dns_cancel_pending_resolve(const char *question); -int dns_resolve(edge_connection_t *exitconn, or_circuit_t *circ); +int dns_resolve(edge_connection_t *exitconn); void dns_launch_correctness_checks(void); int dns_seems_to_be_broken(void); void dns_reset_correctness_checks(void); @@ -2619,7 +2617,7 @@ void relay_header_unpack(relay_header_t *dest, const char *src); int relay_send_command_from_edge(uint16_t stream_id, circuit_t *circ, int relay_command, const char *payload, size_t payload_len, crypt_path_t *cpath_layer); -int connection_edge_send_command(edge_connection_t *fromconn, circuit_t *circ, +int connection_edge_send_command(edge_connection_t *fromconn, int relay_command, const char *payload, size_t payload_len); int connection_edge_package_raw_inbuf(edge_connection_t *conn, |