aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2001-01-25 12:20:30 +0000
committerDaniel Stenberg <daniel@haxx.se>2001-01-25 12:20:30 +0000
commit1552bd9c8c01a9df4dc023b654e2533875bf5bc4 (patch)
tree2a8f4713c857565a633fdc59756da7150c800689 /lib
parent939c0c552163b8cb65acb99b2d1590841aa2f6b8 (diff)
sendf is now only Curl_sendf
Curl_write() and Curl_read() are here
Diffstat (limited to 'lib')
-rw-r--r--lib/sendf.c119
-rw-r--r--lib/sendf.h14
2 files changed, 110 insertions, 23 deletions
diff --git a/lib/sendf.c b/lib/sendf.c
index 69dc2ea14..a0850d53d 100644
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -77,59 +77,87 @@ void Curl_failf(struct UrlData *data, char *fmt, ...)
va_end(ap);
}
-/* sendf() sends the formated data to the server */
-size_t Curl_sendf(int fd, struct UrlData *data, char *fmt, ...)
+/* Curl_sendf() sends formated data to the server */
+size_t Curl_sendf(int sockfd, struct connectdata *conn,
+ char *fmt, ...)
{
+ struct UrlData *data = conn->data;
size_t bytes_written;
char *s;
va_list ap;
va_start(ap, fmt);
- s = vaprintf(fmt, ap);
+ s = vaprintf(fmt, ap); /* returns an allocated string */
va_end(ap);
if(!s)
return 0; /* failure */
if(data->bits.verbose)
fprintf(data->err, "> %s", s);
-#ifndef USE_SSLEAY
- bytes_written = swrite(fd, s, strlen(s));
-#else /* USE_SSLEAY */
- if (data->ssl.use) {
- bytes_written = SSL_write(data->ssl.handle, s, strlen(s));
- } else {
- bytes_written = swrite(fd, s, strlen(s));
- }
-#endif /* USE_SSLEAY */
+ /* Write the buffer to the socket */
+ Curl_write(conn, sockfd, s, strlen(s), &bytes_written);
+
free(s); /* free the output string */
- return(bytes_written);
+
+ return bytes_written;
}
-/* ssend() sends plain (binary) data to the server */
-size_t Curl_ssend(int fd, struct connectdata *conn, void *mem, size_t len)
+/*
+ * Curl_write() is an internal write function that sends plain (binary) data
+ * to the server. Works with plain sockets, SSL or kerberos.
+ *
+ */
+CURLcode Curl_write(struct connectdata *conn, int sockfd,
+ void *mem, size_t len,
+ size_t *written)
{
size_t bytes_written;
struct UrlData *data=conn->data; /* conn knows data, not vice versa */
#ifdef USE_SSLEAY
if (data->ssl.use) {
- bytes_written = SSL_write(data->ssl.handle, mem, len);
+ int loop=100; /* just a precaution to never loop endlessly */
+ while(loop--) {
+ bytes_written = SSL_write(data->ssl.handle, mem, len);
+ if((-1 != bytes_written) ||
+ (SSL_ERROR_WANT_WRITE != SSL_get_error(data->ssl.handle,
+ bytes_written) ))
+ break;
+ }
}
else {
#endif
#ifdef KRB4
if(conn->sec_complete) {
- bytes_written = sec_write(conn, fd, mem, len);
+ bytes_written = sec_write(conn, sockfd, mem, len);
}
else
#endif /* KRB4 */
- bytes_written = swrite(fd, mem, len);
+ bytes_written = swrite(sockfd, mem, len);
#ifdef USE_SSLEAY
}
#endif
- return bytes_written;
+ *written = bytes_written;
+ return CURLE_OK;
}
+/*
+ * External write-function, writes to the data-socket.
+ * Takes care of plain sockets, SSL or kerberos transparently.
+ */
+CURLcode curl_write(CURLconnect *c_conn, char *buf, size_t amount,
+ size_t *n)
+{
+ struct connectdata *conn = (struct connectdata *)c_conn;
+
+ if(!n || !conn || (conn->handle != STRUCT_CONNECT))
+ return CURLE_FAILED_INIT;
+
+ return Curl_write(conn, conn->sockfd, buf, amount, n);
+}
+
+
+
/* client_write() sends data to the write callback(s)
The bit pattern defines to what "streams" to write to. Body and/or header.
@@ -163,3 +191,56 @@ CURLcode Curl_client_write(struct UrlData *data,
return CURLE_OK;
}
+
+/*
+ * Internal read-from-socket function. This is meant to deal with plain
+ * sockets, SSL sockets and kerberos sockets.
+ */
+CURLcode Curl_read(struct connectdata *conn, int sockfd,
+ char *buf, size_t buffersize,
+ size_t *n)
+{
+ struct UrlData *data = conn->data;
+ size_t nread;
+
+#ifdef USE_SSLEAY
+ if (data->ssl.use) {
+ int loop=100; /* just a precaution to never loop endlessly */
+ while(loop--) {
+ nread = SSL_read(data->ssl.handle, buf, buffersize);
+ if((-1 != nread) ||
+ (SSL_ERROR_WANT_READ != SSL_get_error(data->ssl.handle, nread) ))
+ break;
+ }
+ }
+ else {
+#endif
+#ifdef KRB4
+ if(conn->sec_complete)
+ nread = sec_read(conn, sockfd, buf, buffersize);
+ else
+#endif
+ nread = sread (sockfd, buf, buffersize);
+#ifdef USE_SSLEAY
+ }
+#endif /* USE_SSLEAY */
+ *n = nread;
+ return CURLE_OK;
+}
+
+/*
+ * The public read function reads from the 'sockfd' file descriptor only.
+ * Use the Curl_read() internally when you want to specify fd.
+ */
+
+CURLcode curl_read(CURLconnect *c_conn, char *buf, size_t buffersize,
+ size_t *n)
+{
+ struct connectdata *conn = (struct connectdata *)c_conn;
+
+ if(!n || !conn || (conn->handle != STRUCT_CONNECT))
+ return CURLE_FAILED_INIT;
+
+ return Curl_read(conn, conn->sockfd, buf, buffersize, n);
+}
+
diff --git a/lib/sendf.h b/lib/sendf.h
index 26771f38b..5c1510f89 100644
--- a/lib/sendf.h
+++ b/lib/sendf.h
@@ -23,13 +23,10 @@
* $Id$
*****************************************************************************/
-size_t Curl_sendf(int fd, struct UrlData *, char *fmt, ...);
-size_t Curl_ssend(int fd, struct connectdata *, void *fmt, size_t len);
+size_t Curl_sendf(int fd, struct connectdata *, char *fmt, ...);
void Curl_infof(struct UrlData *, char *fmt, ...);
void Curl_failf(struct UrlData *, char *fmt, ...);
-#define sendf Curl_sendf
-#define ssend Curl_ssend
#define infof Curl_infof
#define failf Curl_failf
@@ -47,4 +44,13 @@ typedef struct send_buffer send_buffer;
CURLcode Curl_client_write(struct UrlData *data, int type, char *ptr,
size_t len);
+/* internal read-function, does plain socket, SSL and krb4 */
+CURLcode Curl_read(struct connectdata *conn, int sockfd,
+ char *buf, size_t buffersize,
+ size_t *n);
+/* internal write-function, does plain socket, SSL and krb4 */
+CURLcode Curl_write(struct connectdata *conn, int sockfd,
+ void *mem, size_t len,
+ size_t *written);
+
#endif