- 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.
This commit is contained in:
24
lib/socks.h
24
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
|
||||
@@ -23,6 +23,20 @@
|
||||
* $Id$
|
||||
***************************************************************************/
|
||||
|
||||
/*
|
||||
* 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 */
|
||||
|
Reference in New Issue
Block a user