moved curl_read() and curl_write() to sendf.c
This commit is contained in:
parent
e49a82b06c
commit
30eab8ca51
61
lib/url.c
61
lib/url.c
@ -546,67 +546,6 @@ RETSIGTYPE alarmfunc(int signal)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
CURLcode curl_write(CURLconnect *c_conn, char *buf, size_t amount,
|
|
||||||
size_t *n)
|
|
||||||
{
|
|
||||||
struct connectdata *conn = (struct connectdata *)c_conn;
|
|
||||||
struct UrlData *data;
|
|
||||||
size_t bytes_written;
|
|
||||||
|
|
||||||
if(!n || !conn || (conn->handle != STRUCT_CONNECT))
|
|
||||||
return CURLE_FAILED_INIT;
|
|
||||||
data = conn->data;
|
|
||||||
|
|
||||||
#ifdef USE_SSLEAY
|
|
||||||
if (data->ssl.use) {
|
|
||||||
bytes_written = SSL_write(data->ssl.handle, buf, amount);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
#endif
|
|
||||||
#ifdef KRB4
|
|
||||||
if(conn->sec_complete)
|
|
||||||
bytes_written = sec_write(conn, conn->writesockfd, buf, amount);
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
bytes_written = swrite(conn->writesockfd, buf, amount);
|
|
||||||
#ifdef USE_SSLEAY
|
|
||||||
}
|
|
||||||
#endif /* USE_SSLEAY */
|
|
||||||
|
|
||||||
*n = bytes_written;
|
|
||||||
return CURLE_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
CURLcode curl_read(CURLconnect *c_conn, char *buf, size_t buffersize,
|
|
||||||
size_t *n)
|
|
||||||
{
|
|
||||||
struct connectdata *conn = (struct connectdata *)c_conn;
|
|
||||||
struct UrlData *data;
|
|
||||||
size_t nread;
|
|
||||||
|
|
||||||
if(!n || !conn || (conn->handle != STRUCT_CONNECT))
|
|
||||||
return CURLE_FAILED_INIT;
|
|
||||||
data = conn->data;
|
|
||||||
|
|
||||||
#ifdef USE_SSLEAY
|
|
||||||
if (data->ssl.use) {
|
|
||||||
nread = SSL_read (data->ssl.handle, buf, buffersize);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
#endif
|
|
||||||
#ifdef KRB4
|
|
||||||
if(conn->sec_complete)
|
|
||||||
nread = sec_read(conn, conn->sockfd, buf, buffersize);
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
nread = sread (conn->sockfd, buf, buffersize);
|
|
||||||
#ifdef USE_SSLEAY
|
|
||||||
}
|
|
||||||
#endif /* USE_SSLEAY */
|
|
||||||
*n = nread;
|
|
||||||
return CURLE_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
CURLcode curl_disconnect(CURLconnect *c_connect)
|
CURLcode curl_disconnect(CURLconnect *c_connect)
|
||||||
{
|
{
|
||||||
struct connectdata *conn = c_connect;
|
struct connectdata *conn = c_connect;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user