diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-05 14:34:29 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-05 14:34:29 -0400 |
| commit | 73b0e2e6fd02140d349ebc6d4ae44c6a28a0f39c (patch) | |
| tree | 4520ec8590003e12db93503b7b5973938b63f2a1 /src/or/connection_edge.h | |
| parent | c0b9f594b65f410cf219673d53226ed4eeeedc19 (diff) | |
| parent | ad9190404b1cbba3f7e17f8db20034e986093f21 (diff) | |
| download | tor-73b0e2e6fd02140d349ebc6d4ae44c6a28a0f39c.tar.gz tor-73b0e2e6fd02140d349ebc6d4ae44c6a28a0f39c.zip | |
Merge branch 'http_tunnel_squashed'
Diffstat (limited to 'src/or/connection_edge.h')
| -rw-r--r-- | src/or/connection_edge.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h index 914238fc1f..e47043f7fe 100644 --- a/src/or/connection_edge.h +++ b/src/or/connection_edge.h @@ -89,9 +89,10 @@ int connection_ap_process_transparent(entry_connection_t *conn); int address_is_invalid_destination(const char *address, int client); -int connection_ap_rewrite_and_attach_if_allowed(entry_connection_t *conn, - origin_circuit_t *circ, - crypt_path_t *cpath); +MOCK_DECL(int, connection_ap_rewrite_and_attach_if_allowed, + (entry_connection_t *conn, + origin_circuit_t *circ, + crypt_path_t *cpath)); int connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, origin_circuit_t *circ, crypt_path_t *cpath); @@ -188,6 +189,8 @@ typedef struct { STATIC void connection_ap_handshake_rewrite(entry_connection_t *conn, rewrite_result_t *out); + +STATIC int connection_ap_process_http_connect(entry_connection_t *conn); #endif #endif |