aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.inc4
-rw-r--r--lib/connect.c55
-rw-r--r--lib/connect.h3
-rw-r--r--lib/curlx.h3
-rw-r--r--lib/ftp.c2
-rw-r--r--lib/socks.c14
6 files changed, 15 insertions, 66 deletions
diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 412f5dece..99a6a723c 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -10,7 +10,7 @@ CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c \
hostares.c hostasyn.c hostip4.c hostip6.c hostsyn.c hostthre.c \
inet_ntop.c parsedate.c select.c gtls.c sslgen.c tftp.c splay.c \
strdup.c socks.c ssh.c nss.c qssl.c rawstr.c curl_addrinfo.c \
- socks_gssapi.c socks_sspi.c curl_sspi.c slist.c
+ socks_gssapi.c socks_sspi.c curl_sspi.c slist.c nonblock.c
HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h \
progress.h formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h \
@@ -21,4 +21,4 @@ HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h \
strtoofft.h strerror.h inet_ntop.h curlx.h curl_memory.h setup.h \
transfer.h select.h easyif.h multiif.h parsedate.h sslgen.h gtls.h \
tftp.h sockaddr.h splay.h strdup.h setup_once.h socks.h ssh.h nssg.h \
- curl_base64.h rawstr.h curl_addrinfo.h curl_sspi.h slist.h
+ curl_base64.h rawstr.h curl_addrinfo.h curl_sspi.h slist.h nonblock.h
diff --git a/lib/connect.c b/lib/connect.c
index 49914e82f..7865216bd 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -177,59 +177,6 @@ long Curl_timeleft(struct connectdata *conn,
return timeout_ms;
}
-
-/*
- * Curl_nonblock() set the given socket to either blocking or non-blocking
- * mode based on the 'nonblock' boolean argument. This function is highly
- * portable.
- */
-int Curl_nonblock(curl_socket_t sockfd, /* operate on this */
- int nonblock /* TRUE or FALSE */)
-{
-#if defined(USE_BLOCKING_SOCKETS)
-
- return 0; /* returns success */
-
-#elif defined(HAVE_FCNTL_O_NONBLOCK)
-
- /* most recent unix versions */
- int flags;
- flags = fcntl(sockfd, F_GETFL, 0);
- if(FALSE != nonblock)
- return fcntl(sockfd, F_SETFL, flags | O_NONBLOCK);
- else
- return fcntl(sockfd, F_SETFL, flags & (~O_NONBLOCK));
-
-#elif defined(HAVE_IOCTL_FIONBIO)
-
- /* older unix versions */
- int flags;
- flags = nonblock;
- return ioctl(sockfd, FIONBIO, &flags);
-
-#elif defined(HAVE_IOCTLSOCKET_FIONBIO)
-
- /* Windows */
- unsigned long flags;
- flags = nonblock;
- return ioctlsocket(sockfd, FIONBIO, &flags);
-
-#elif defined(HAVE_IOCTLSOCKET_CAMEL_FIONBIO)
-
- /* Amiga */
- return IoctlSocket(sockfd, FIONBIO, (long)nonblock);
-
-#elif defined(HAVE_SETSOCKOPT_SO_NONBLOCK)
-
- /* BeOS */
- long b = nonblock ? 1 : 0;
- return setsockopt(sockfd, SOL_SOCKET, SO_NONBLOCK, &b, sizeof(b));
-
-#else
-# error "no non-blocking method was found/used/set"
-#endif
-}
-
/*
* waitconnect() waits for a TCP connect on the given socket for the specified
* number if milliseconds. It returns:
@@ -846,7 +793,7 @@ singleipconnect(struct connectdata *conn,
}
/* set socket non-blocking */
- Curl_nonblock(sockfd, TRUE);
+ curlx_nonblock(sockfd, TRUE);
/* Connect TCP sockets, bind UDP */
if(conn->socktype == SOCK_STREAM)
diff --git a/lib/connect.h b/lib/connect.h
index ae47c2174..e8261776a 100644
--- a/lib/connect.h
+++ b/lib/connect.h
@@ -23,8 +23,7 @@
* $Id$
***************************************************************************/
-int Curl_nonblock(curl_socket_t sockfd, /* operate on this */
- int nonblock /* TRUE or FALSE */);
+#include "nonblock.h" /* for curlx_nonblock(), formerly Curl_nonblock() */
CURLcode Curl_is_connected(struct connectdata *conn,
int sockindex,
diff --git a/lib/curlx.h b/lib/curlx.h
index 9558845e9..1e03a05fc 100644
--- a/lib/curlx.h
+++ b/lib/curlx.h
@@ -53,6 +53,9 @@
curlx_tvdiff_secs()
*/
+#include "nonblock.h"
+/* "nonblock.h" provides curlx_nonblock() */
+
/* Now setup curlx_ * names for the functions that are to become curlx_ and
be removed from a future libcurl official API:
curlx_getenv
diff --git a/lib/ftp.c b/lib/ftp.c
index 8360e5859..d2a80e07f 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -351,7 +351,7 @@ static CURLcode AllowServerConnect(struct connectdata *conn)
infof(data, "Connection accepted from server\n");
conn->sock[SECONDARYSOCKET] = s;
- Curl_nonblock(s, TRUE); /* enable non-blocking */
+ curlx_nonblock(s, TRUE); /* enable non-blocking */
}
break;
}
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! */
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 01:55:10 +0000