diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-05 13:19:59 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-05 14:34:09 -0400 |
| commit | ad9190404b1cbba3f7e17f8db20034e986093f21 (patch) | |
| tree | 18e102503b6cff9c0ae9919ef5b42b242b957b71 /src/or | |
| parent | fead6449564f4d946662fc32e0f42bfe852f62a3 (diff) | |
| download | tor-ad9190404b1cbba3f7e17f8db20034e986093f21.tar.gz tor-ad9190404b1cbba3f7e17f8db20034e986093f21.zip | |
Add a fuzzer for HTTP CONNECT
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/connection_edge.c | 11 | ||||
| -rw-r--r-- | src/or/connection_edge.h | 9 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 8d2b562d89..5d8b1ca1c1 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -127,7 +127,6 @@ static int connection_ap_handshake_process_socks(entry_connection_t *conn); static int connection_ap_process_natd(entry_connection_t *conn); -static int connection_ap_process_http_connect(entry_connection_t *conn); static int connection_exit_connect_dir(edge_connection_t *exitconn); static int consider_plaintext_ports(entry_connection_t *conn, uint16_t port); static int connection_ap_supports_optimistic_data(const entry_connection_t *); @@ -1184,10 +1183,10 @@ consider_plaintext_ports(entry_connection_t *conn, uint16_t port) * See connection_ap_handshake_rewrite_and_attach()'s * documentation for arguments and return value. */ -int -connection_ap_rewrite_and_attach_if_allowed(entry_connection_t *conn, - origin_circuit_t *circ, - crypt_path_t *cpath) +MOCK_IMPL(int, +connection_ap_rewrite_and_attach_if_allowed,(entry_connection_t *conn, + origin_circuit_t *circ, + crypt_path_t *cpath)) { const or_options_t *options = get_options(); @@ -2362,7 +2361,7 @@ connection_ap_process_natd(entry_connection_t *conn) * connection's socks_request field and try to attach the connection. On * failure, send an HTTP reply, and mark the connection. */ -static int +STATIC int connection_ap_process_http_connect(entry_connection_t *conn) { if (BUG(ENTRY_TO_CONN(conn)->state != AP_CONN_STATE_HTTP_CONNECT_WAIT)) diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h index 9987f88b85..10ad97be47 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); @@ -187,6 +188,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 |