diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2009-01-28 21:33:58 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2009-01-28 21:33:58 +0000 |
| commit | de4610a55f9e99bebaf448ca33e2e43baf977c74 (patch) | |
| tree | 108574cc0c8a3593046f08e16cc898f29f77626c /lib/socks.h | |
| parent | 6e34c2d59a96b406a76d8922561a9d57c55e0dbc (diff) | |
- Markus Moeller introduced two new options to libcurl:
CURLOPT_SOCKS5_GSSAPI_SERVICE and CURLOPT_SOCKS5_GSSAPI_NEC to allow libcurl
to do GSS-style authentication with SOCKS5 proxies. The curl tool got the
options called --socks5-gssapi-service and --socks5-gssapi-nec to enable
these.
Diffstat (limited to 'lib/socks.h')
| -rw-r--r-- | lib/socks.h | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/lib/socks.h b/lib/socks.h index 756ecc3db..9f4c6f09a 100644 --- a/lib/socks.h +++ b/lib/socks.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -24,6 +24,20 @@ ***************************************************************************/ /* + * Helper read-from-socket functions. Does the same as Curl_read() but it + * blocks until all bytes amount of buffersize will be read. No more, no less. + * + * This is STUPID BLOCKING behaviour which we frown upon, but right now this + * is what we have... + */ +int Curl_blockread_all(struct connectdata *conn, + curl_socket_t sockfd, + char *buf, + ssize_t buffersize, + ssize_t *n, + long conn_timeout); + +/* * This function logs in to a SOCKS4(a) proxy and sends the specifics to the * final destination server. */ @@ -45,4 +59,12 @@ CURLcode Curl_SOCKS5(const char *proxy_name, int sockindex, struct connectdata *conn); +#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI) +/* + * This function handles the sockss5 gssapie negotiation and initialisation + */ +CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex, + struct connectdata *conn); #endif + +#endif /* __SOCKS_H */ |