diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-07-13 12:12:16 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-07-13 12:12:16 -0400 |
| commit | 1aab5b6b391ca179d9acded9465ee4941ec4700b (patch) | |
| tree | d9f4426a604f0f75e8a422b0f4e8181776374124 /src/or/buffers.h | |
| parent | 9a6642f6f5681fe92b17b87304126d2a3b2dec02 (diff) | |
| parent | 16c5a62a66098274dde726c8e02110238866fe0b (diff) | |
| download | tor-1aab5b6b391ca179d9acded9465ee4941ec4700b.tar.gz tor-1aab5b6b391ca179d9acded9465ee4941ec4700b.zip | |
Merge remote-tracking branch 'public/bug1666'
Conflicts:
doc/spec/socks-extensions.txt
src/or/buffers.c
src/or/config.c
src/or/connection_edge.c
Diffstat (limited to 'src/or/buffers.h')
| -rw-r--r-- | src/or/buffers.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/buffers.h b/src/or/buffers.h index 613001066c..b0161b9c2c 100644 --- a/src/or/buffers.h +++ b/src/or/buffers.h @@ -41,6 +41,8 @@ int fetch_from_buf_http(buf_t *buf, char **headers_out, size_t max_headerlen, char **body_out, size_t *body_used, size_t max_bodylen, int force_complete); +socks_request_t *socks_request_new(void); +void socks_request_free(socks_request_t *req); int fetch_from_buf_socks(buf_t *buf, socks_request_t *req, int log_sockstype, int safe_socks); int fetch_from_buf_socks_client(buf_t *buf, int state, char **reason); |