diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2009-07-09 21:47:24 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2009-07-09 21:47:24 +0000 |
| commit | d709cb2ae37c9d9512fe3a9724dd95b0fe49d108 (patch) | |
| tree | d68c12351c40178ee635c4aa25679f4af44627c8 /lib/socks.c | |
| parent | 444bb03fab4ffd0149d1e4479e24fb038388a6fd (diff) | |
- Eric Wong introduced curlx_nonblock() that the curl tool now (re-)uses for
setting a file descriptor non-blocking. Used by the functionality Eric
himself brough on June 15th.
Diffstat (limited to 'lib/socks.c')
| -rw-r--r-- | lib/socks.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/socks.c b/lib/socks.c index 826e1383a..fba0bef38 100644 --- a/lib/socks.c +++ b/lib/socks.c @@ -144,7 +144,7 @@ CURLcode Curl_SOCKS4(const char *proxy_name, return CURLE_OPERATION_TIMEDOUT; } - Curl_nonblock(sock, FALSE); + curlx_nonblock(sock, FALSE); /* * Compose socks4 request @@ -344,7 +344,7 @@ CURLcode Curl_SOCKS4(const char *proxy_name, } } - Curl_nonblock(sock, TRUE); + curlx_nonblock(sock, TRUE); return CURLE_OK; /* Proxy was successful! */ } @@ -406,7 +406,7 @@ CURLcode Curl_SOCKS5(const char *proxy_name, return CURLE_OPERATION_TIMEDOUT; } - Curl_nonblock(sock, TRUE); + curlx_nonblock(sock, TRUE); /* wait until socket gets connected */ result = Curl_socket_ready(CURL_SOCKET_BAD, sock, (int)timeout); @@ -437,7 +437,7 @@ CURLcode Curl_SOCKS5(const char *proxy_name, socksreq[3] = 2; /* username/password */ #endif - Curl_nonblock(sock, FALSE); + curlx_nonblock(sock, FALSE); code = Curl_write_plain(conn, sock, (char *)socksreq, (2 + (int)socksreq[1]), &written); @@ -446,7 +446,7 @@ CURLcode Curl_SOCKS5(const char *proxy_name, return CURLE_COULDNT_CONNECT; } - Curl_nonblock(sock, TRUE); + curlx_nonblock(sock, TRUE); result = Curl_socket_ready(sock, CURL_SOCKET_BAD, (int)timeout); @@ -464,7 +464,7 @@ CURLcode Curl_SOCKS5(const char *proxy_name, return CURLE_RECV_ERROR; } - Curl_nonblock(sock, FALSE); + curlx_nonblock(sock, FALSE); result=Curl_blockread_all(conn, sock, (char *)socksreq, 2, &actualread, timeout); @@ -719,7 +719,7 @@ CURLcode Curl_SOCKS5(const char *proxy_name, } #endif - Curl_nonblock(sock, TRUE); + curlx_nonblock(sock, TRUE); return CURLE_OK; /* Proxy was successful! */ } |