2002-09-03 07:52:59 -04:00
|
|
|
/***************************************************************************
|
2004-06-03 07:41:05 -04:00
|
|
|
* _ _ ____ _
|
|
|
|
* Project ___| | | | _ \| |
|
|
|
|
* / __| | | | |_) | |
|
|
|
|
* | (__| |_| | _ <| |___
|
1999-12-29 09:20:26 -05:00
|
|
|
* \___|\___/|_| \_\_____|
|
|
|
|
*
|
2005-03-13 19:00:45 -05:00
|
|
|
* Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.
|
1999-12-29 09:20:26 -05:00
|
|
|
*
|
2002-09-03 07:52:59 -04:00
|
|
|
* This software is licensed as described in the file COPYING, which
|
|
|
|
* you should have received as part of this distribution. The terms
|
|
|
|
* are also available at http://curl.haxx.se/docs/copyright.html.
|
2004-06-03 07:41:05 -04:00
|
|
|
*
|
2001-01-03 04:29:33 -05:00
|
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
|
|
* copies of the Software, and permit persons to whom the Software is
|
2002-09-03 07:52:59 -04:00
|
|
|
* furnished to do so, under the terms of the COPYING file.
|
1999-12-29 09:20:26 -05:00
|
|
|
*
|
2001-01-03 04:29:33 -05:00
|
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
|
|
* KIND, either express or implied.
|
1999-12-29 09:20:26 -05:00
|
|
|
*
|
2001-01-03 04:29:33 -05:00
|
|
|
* $Id$
|
2002-09-03 07:52:59 -04:00
|
|
|
***************************************************************************/
|
1999-12-29 09:20:26 -05:00
|
|
|
|
2000-08-24 10:26:33 -04:00
|
|
|
#include "setup.h"
|
|
|
|
|
1999-12-29 09:20:26 -05:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdarg.h>
|
|
|
|
#include <stdlib.h>
|
2002-01-18 04:25:58 -05:00
|
|
|
#include <errno.h>
|
|
|
|
|
2001-12-11 10:08:27 -05:00
|
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
|
|
#include <sys/types.h>
|
|
|
|
#endif
|
1999-12-29 09:20:26 -05:00
|
|
|
|
2001-12-04 08:03:08 -05:00
|
|
|
#ifdef HAVE_SYS_SOCKET_H
|
2004-10-06 03:50:18 -04:00
|
|
|
#include <sys/socket.h> /* required for send() & recv() prototypes */
|
2001-12-04 08:03:08 -05:00
|
|
|
#endif
|
|
|
|
|
1999-12-29 09:20:26 -05:00
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
#include <unistd.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <curl/curl.h>
|
|
|
|
#include "urldata.h"
|
2000-10-03 07:01:32 -04:00
|
|
|
#include "sendf.h"
|
2003-05-01 09:36:28 -04:00
|
|
|
#include "connect.h" /* for the Curl_ourerrno() proto */
|
2005-04-07 11:27:13 -04:00
|
|
|
#include "sslgen.h"
|
1999-12-29 09:20:26 -05:00
|
|
|
|
2000-10-12 04:22:16 -04:00
|
|
|
#define _MPRINTF_REPLACE /* use the internal *printf() functions */
|
1999-12-29 09:20:26 -05:00
|
|
|
#include <curl/mprintf.h>
|
|
|
|
|
2003-12-02 08:27:29 -05:00
|
|
|
#ifdef HAVE_KRB4
|
2005-03-13 19:00:45 -05:00
|
|
|
#include "krb4.h"
|
2005-04-07 11:27:13 -04:00
|
|
|
#else
|
|
|
|
#define Curl_sec_write(a,b,c,d) -1
|
|
|
|
#define Curl_sec_read(a,b,c,d) -1
|
2000-09-21 04:49:16 -04:00
|
|
|
#endif
|
2005-04-07 11:27:13 -04:00
|
|
|
|
2000-12-30 08:12:30 -05:00
|
|
|
#include <string.h>
|
2004-05-11 07:30:23 -04:00
|
|
|
#include "memory.h"
|
2004-10-12 08:49:38 -04:00
|
|
|
#include "strerror.h"
|
2006-04-07 17:50:47 -04:00
|
|
|
#include "easyif.h" /* for the Curl_convert_from_network prototype */
|
2000-10-09 07:12:34 -04:00
|
|
|
/* The last #include file should be: */
|
|
|
|
#include "memdebug.h"
|
2000-09-21 04:49:16 -04:00
|
|
|
|
2001-03-02 02:42:11 -05:00
|
|
|
/* returns last node in linked list */
|
|
|
|
static struct curl_slist *slist_get_last(struct curl_slist *list)
|
|
|
|
{
|
2004-10-06 03:50:18 -04:00
|
|
|
struct curl_slist *item;
|
2002-08-22 15:38:17 -04:00
|
|
|
|
|
|
|
/* if caller passed us a NULL, return now */
|
|
|
|
if (!list)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* loop through to find the last item */
|
|
|
|
item = list;
|
|
|
|
while (item->next) {
|
|
|
|
item = item->next;
|
|
|
|
}
|
|
|
|
return item;
|
2001-03-02 02:42:11 -05:00
|
|
|
}
|
|
|
|
|
2004-05-10 10:21:19 -04:00
|
|
|
/*
|
|
|
|
* curl_slist_append() appends a string to the linked list. It always retunrs
|
|
|
|
* the address of the first record, so that you can sure this function as an
|
|
|
|
* initialization function as well as an append function. If you find this
|
|
|
|
* bothersome, then simply create a separate _init function and call it
|
|
|
|
* appropriately from within the proram.
|
|
|
|
*/
|
2001-03-02 02:42:11 -05:00
|
|
|
struct curl_slist *curl_slist_append(struct curl_slist *list,
|
|
|
|
const char *data)
|
|
|
|
{
|
2004-10-06 03:50:18 -04:00
|
|
|
struct curl_slist *last;
|
|
|
|
struct curl_slist *new_item;
|
2002-08-22 15:38:17 -04:00
|
|
|
|
|
|
|
new_item = (struct curl_slist *) malloc(sizeof(struct curl_slist));
|
|
|
|
if (new_item) {
|
2004-05-10 10:21:19 -04:00
|
|
|
char *dup = strdup(data);
|
|
|
|
if(dup) {
|
|
|
|
new_item->next = NULL;
|
|
|
|
new_item->data = dup;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
free(new_item);
|
|
|
|
return NULL;
|
|
|
|
}
|
2002-08-22 15:38:17 -04:00
|
|
|
}
|
2004-05-10 10:21:19 -04:00
|
|
|
else
|
2002-08-22 15:38:17 -04:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (list) {
|
|
|
|
last = slist_get_last(list);
|
|
|
|
last->next = new_item;
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* if this is the first item, then new_item *is* the list */
|
|
|
|
return new_item;
|
2001-03-02 02:42:11 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
/* be nice and clean up resources */
|
|
|
|
void curl_slist_free_all(struct curl_slist *list)
|
|
|
|
{
|
2004-10-06 03:50:18 -04:00
|
|
|
struct curl_slist *next;
|
|
|
|
struct curl_slist *item;
|
2001-03-02 02:42:11 -05:00
|
|
|
|
2002-08-22 15:38:17 -04:00
|
|
|
if (!list)
|
|
|
|
return;
|
2001-03-02 02:42:11 -05:00
|
|
|
|
2002-08-22 15:38:17 -04:00
|
|
|
item = list;
|
|
|
|
do {
|
|
|
|
next = item->next;
|
2004-06-03 07:41:05 -04:00
|
|
|
|
2002-08-22 15:38:17 -04:00
|
|
|
if (item->data) {
|
|
|
|
free(item->data);
|
|
|
|
}
|
|
|
|
free(item);
|
|
|
|
item = next;
|
|
|
|
} while (next);
|
2001-03-02 02:42:11 -05:00
|
|
|
}
|
|
|
|
|
2001-03-13 08:22:58 -05:00
|
|
|
/* Curl_infof() is for info message along the way */
|
1999-12-29 09:20:26 -05:00
|
|
|
|
2001-08-30 18:48:34 -04:00
|
|
|
void Curl_infof(struct SessionHandle *data, const char *fmt, ...)
|
1999-12-29 09:20:26 -05:00
|
|
|
{
|
2003-08-11 05:56:06 -04:00
|
|
|
if(data && data->set.verbose) {
|
|
|
|
va_list ap;
|
2002-04-12 03:21:11 -04:00
|
|
|
char print_buffer[1024 + 1];
|
1999-12-29 09:20:26 -05:00
|
|
|
va_start(ap, fmt);
|
2002-04-12 03:21:11 -04:00
|
|
|
vsnprintf(print_buffer, 1024, fmt, ap);
|
1999-12-29 09:20:26 -05:00
|
|
|
va_end(ap);
|
2004-06-03 07:41:05 -04:00
|
|
|
Curl_debug(data, CURLINFO_TEXT, print_buffer, strlen(print_buffer), NULL);
|
1999-12-29 09:20:26 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-12-11 08:13:01 -05:00
|
|
|
/* Curl_failf() is for messages stating why we failed.
|
|
|
|
* The message SHALL NOT include any LF or CR.
|
|
|
|
*/
|
1999-12-29 09:20:26 -05:00
|
|
|
|
2001-08-30 18:48:34 -04:00
|
|
|
void Curl_failf(struct SessionHandle *data, const char *fmt, ...)
|
1999-12-29 09:20:26 -05:00
|
|
|
{
|
|
|
|
va_list ap;
|
2004-12-21 09:22:10 -05:00
|
|
|
size_t len;
|
2004-12-21 09:33:37 -05:00
|
|
|
va_start(ap, fmt);
|
2004-12-21 09:22:10 -05:00
|
|
|
|
|
|
|
vsnprintf(data->state.buffer, BUFSIZE, fmt, ap);
|
|
|
|
|
2001-11-02 17:30:34 -05:00
|
|
|
if(data->set.errorbuffer && !data->state.errorbuf) {
|
2004-12-21 09:22:10 -05:00
|
|
|
snprintf(data->set.errorbuffer, CURL_ERROR_SIZE, "%s", data->state.buffer);
|
2001-11-02 17:30:34 -05:00
|
|
|
data->state.errorbuf = TRUE; /* wrote error string */
|
2004-12-06 18:04:30 -05:00
|
|
|
}
|
|
|
|
if(data->set.verbose) {
|
2004-12-21 09:22:10 -05:00
|
|
|
len = strlen(data->state.buffer);
|
|
|
|
if(len < BUFSIZE - 1) {
|
|
|
|
data->state.buffer[len] = '\n';
|
|
|
|
data->state.buffer[++len] = '\0';
|
|
|
|
}
|
|
|
|
Curl_debug(data, CURLINFO_TEXT, data->state.buffer, len, NULL);
|
2001-11-02 17:30:34 -05:00
|
|
|
}
|
2004-12-06 18:04:30 -05:00
|
|
|
|
1999-12-29 09:20:26 -05:00
|
|
|
va_end(ap);
|
|
|
|
}
|
|
|
|
|
2001-01-25 07:20:30 -05:00
|
|
|
/* Curl_sendf() sends formated data to the server */
|
2004-03-09 17:52:50 -05:00
|
|
|
CURLcode Curl_sendf(curl_socket_t sockfd, struct connectdata *conn,
|
2001-10-31 10:07:45 -05:00
|
|
|
const char *fmt, ...)
|
1999-12-29 09:20:26 -05:00
|
|
|
{
|
2001-08-30 18:48:34 -04:00
|
|
|
struct SessionHandle *data = conn->data;
|
2002-01-16 09:49:08 -05:00
|
|
|
ssize_t bytes_written;
|
2004-02-26 08:40:43 -05:00
|
|
|
size_t write_len;
|
2002-03-13 08:09:37 -05:00
|
|
|
CURLcode res;
|
1999-12-29 09:20:26 -05:00
|
|
|
char *s;
|
2002-03-13 08:09:37 -05:00
|
|
|
char *sptr;
|
1999-12-29 09:20:26 -05:00
|
|
|
va_list ap;
|
|
|
|
va_start(ap, fmt);
|
2001-01-25 07:20:30 -05:00
|
|
|
s = vaprintf(fmt, ap); /* returns an allocated string */
|
1999-12-29 09:20:26 -05:00
|
|
|
va_end(ap);
|
|
|
|
if(!s)
|
2002-03-13 08:09:37 -05:00
|
|
|
return CURLE_OUT_OF_MEMORY; /* failure */
|
|
|
|
|
|
|
|
bytes_written=0;
|
|
|
|
write_len = strlen(s);
|
|
|
|
sptr = s;
|
|
|
|
|
2004-01-29 08:56:45 -05:00
|
|
|
while (1) {
|
2002-03-13 08:09:37 -05:00
|
|
|
/* Write the buffer to the socket */
|
|
|
|
res = Curl_write(conn, sockfd, sptr, write_len, &bytes_written);
|
|
|
|
|
|
|
|
if(CURLE_OK != res)
|
|
|
|
break;
|
|
|
|
|
2002-04-12 03:21:11 -04:00
|
|
|
if(data->set.verbose)
|
2005-01-21 04:32:32 -05:00
|
|
|
Curl_debug(data, CURLINFO_DATA_OUT, sptr, bytes_written, conn);
|
2002-04-12 03:21:11 -04:00
|
|
|
|
2004-02-26 08:40:43 -05:00
|
|
|
if((size_t)bytes_written != write_len) {
|
2002-03-13 08:09:37 -05:00
|
|
|
/* if not all was written at once, we must advance the pointer, decrease
|
|
|
|
the size left and try again! */
|
|
|
|
write_len -= bytes_written;
|
|
|
|
sptr += bytes_written;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
break;
|
2004-01-29 08:56:45 -05:00
|
|
|
}
|
2001-01-25 07:20:30 -05:00
|
|
|
|
1999-12-29 09:20:26 -05:00
|
|
|
free(s); /* free the output string */
|
2001-01-25 07:20:30 -05:00
|
|
|
|
2002-03-13 08:09:37 -05:00
|
|
|
return res;
|
1999-12-29 09:20:26 -05:00
|
|
|
}
|
|
|
|
|
2001-01-25 07:20:30 -05:00
|
|
|
/*
|
|
|
|
* Curl_write() is an internal write function that sends plain (binary) data
|
|
|
|
* to the server. Works with plain sockets, SSL or kerberos.
|
|
|
|
*/
|
2003-11-24 02:15:37 -05:00
|
|
|
CURLcode Curl_write(struct connectdata *conn,
|
2004-03-09 17:52:50 -05:00
|
|
|
curl_socket_t sockfd,
|
|
|
|
void *mem,
|
|
|
|
size_t len,
|
2002-01-16 09:49:08 -05:00
|
|
|
ssize_t *written)
|
2000-08-24 08:33:16 -04:00
|
|
|
{
|
2002-01-16 09:49:08 -05:00
|
|
|
ssize_t bytes_written;
|
2003-06-06 10:56:50 -04:00
|
|
|
CURLcode retcode;
|
2003-11-24 02:15:37 -05:00
|
|
|
int num = (sockfd == conn->sock[SECONDARYSOCKET]);
|
2005-04-07 11:27:13 -04:00
|
|
|
|
|
|
|
if (conn->ssl[num].use)
|
|
|
|
/* only TRUE if SSL enabled */
|
|
|
|
bytes_written = Curl_ssl_send(conn, num, mem, len);
|
2000-09-21 04:49:16 -04:00
|
|
|
else {
|
2005-04-07 11:27:13 -04:00
|
|
|
if(conn->sec_complete)
|
|
|
|
/* only TRUE if krb4 enabled */
|
2001-08-17 06:14:06 -04:00
|
|
|
bytes_written = Curl_sec_write(conn, sockfd, mem, len);
|
2000-09-21 04:49:16 -04:00
|
|
|
else
|
2004-02-26 08:40:43 -05:00
|
|
|
bytes_written = (ssize_t)swrite(sockfd, mem, len);
|
2005-04-07 11:27:13 -04:00
|
|
|
|
2002-01-16 09:49:08 -05:00
|
|
|
if(-1 == bytes_written) {
|
2003-05-01 09:36:28 -04:00
|
|
|
int err = Curl_ourerrno();
|
2003-06-06 10:56:50 -04:00
|
|
|
|
|
|
|
if(
|
|
|
|
#ifdef WSAEWOULDBLOCK
|
|
|
|
/* This is how Windows does it */
|
|
|
|
(WSAEWOULDBLOCK == err)
|
2002-01-16 09:49:08 -05:00
|
|
|
#else
|
2003-06-06 10:56:50 -04:00
|
|
|
/* As pointed out by Christophe Demory on March 11 2003, errno
|
|
|
|
may be EWOULDBLOCK or on some systems EAGAIN when it returned
|
|
|
|
due to its inability to send off data without blocking. We
|
|
|
|
therefor treat both error codes the same here */
|
|
|
|
(EWOULDBLOCK == err) || (EAGAIN == err) || (EINTR == err)
|
2002-01-16 09:49:08 -05:00
|
|
|
#endif
|
2003-06-06 10:56:50 -04:00
|
|
|
)
|
2002-01-16 09:49:08 -05:00
|
|
|
/* this is just a case of EWOULDBLOCK */
|
2003-06-06 10:56:50 -04:00
|
|
|
bytes_written=0;
|
2004-10-12 03:24:19 -04:00
|
|
|
else
|
|
|
|
failf(conn->data, "Send failure: %s",
|
|
|
|
Curl_strerror(conn, err));
|
2002-01-16 09:49:08 -05:00
|
|
|
}
|
2000-09-21 04:49:16 -04:00
|
|
|
}
|
2001-01-25 07:20:30 -05:00
|
|
|
*written = bytes_written;
|
2003-06-06 10:56:50 -04:00
|
|
|
retcode = (-1 != bytes_written)?CURLE_OK:CURLE_SEND_ERROR;
|
|
|
|
|
|
|
|
return retcode;
|
2000-08-24 08:33:16 -04:00
|
|
|
}
|
|
|
|
|
2000-11-22 07:53:56 -05:00
|
|
|
/* client_write() sends data to the write callback(s)
|
|
|
|
|
|
|
|
The bit pattern defines to what "streams" to write to. Body and/or header.
|
|
|
|
The defines are in sendf.h of course.
|
|
|
|
*/
|
2001-08-30 18:48:34 -04:00
|
|
|
CURLcode Curl_client_write(struct SessionHandle *data,
|
2001-01-05 05:11:41 -05:00
|
|
|
int type,
|
|
|
|
char *ptr,
|
|
|
|
size_t len)
|
2000-11-22 07:53:56 -05:00
|
|
|
{
|
|
|
|
size_t wrote;
|
|
|
|
|
|
|
|
if(0 == len)
|
|
|
|
len = strlen(ptr);
|
|
|
|
|
2006-04-07 17:50:47 -04:00
|
|
|
#ifdef CURL_DOES_CONVERSIONS
|
|
|
|
if(type & CLIENTWRITE_BODY) {
|
|
|
|
if(data->ftp_in_ascii_mode) {
|
|
|
|
/* convert from the network encoding */
|
|
|
|
size_t rc;
|
|
|
|
rc = Curl_convert_from_network(data, ptr, len);
|
|
|
|
/* Curl_convert_from_network calls failf if unsuccessful */
|
|
|
|
if(rc != CURLE_OK) {
|
|
|
|
return(rc);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (len) {
|
|
|
|
wrote = data->set.fwrite(ptr, 1, len, data->set.out);
|
|
|
|
} else {
|
|
|
|
wrote = len;
|
|
|
|
}
|
|
|
|
if(wrote != len) {
|
|
|
|
failf (data, "Failed writing body");
|
|
|
|
return CURLE_WRITE_ERROR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#else
|
2000-11-22 07:53:56 -05:00
|
|
|
if(type & CLIENTWRITE_BODY) {
|
2001-08-30 18:48:34 -04:00
|
|
|
wrote = data->set.fwrite(ptr, 1, len, data->set.out);
|
2000-11-22 07:53:56 -05:00
|
|
|
if(wrote != len) {
|
|
|
|
failf (data, "Failed writing body");
|
|
|
|
return CURLE_WRITE_ERROR;
|
|
|
|
}
|
|
|
|
}
|
2006-04-07 17:50:47 -04:00
|
|
|
#endif /* CURL_DOES_CONVERSIONS */
|
|
|
|
|
2001-08-06 04:22:26 -04:00
|
|
|
if((type & CLIENTWRITE_HEADER) &&
|
2001-08-30 18:48:34 -04:00
|
|
|
(data->set.fwrite_header || data->set.writeheader) ) {
|
2001-04-10 02:49:32 -04:00
|
|
|
/*
|
|
|
|
* Write headers to the same callback or to the especially setup
|
|
|
|
* header callback function (added after version 7.7.1).
|
|
|
|
*/
|
|
|
|
curl_write_callback writeit=
|
2001-08-30 18:48:34 -04:00
|
|
|
data->set.fwrite_header?data->set.fwrite_header:data->set.fwrite;
|
2001-04-10 02:49:32 -04:00
|
|
|
|
2006-04-07 17:50:47 -04:00
|
|
|
/* Note: The header is in the host encoding
|
|
|
|
regardless of the ftp transfer mode (ASCII/Image) */
|
|
|
|
|
2001-08-30 18:48:34 -04:00
|
|
|
wrote = writeit(ptr, 1, len, data->set.writeheader);
|
2000-11-22 07:53:56 -05:00
|
|
|
if(wrote != len) {
|
|
|
|
failf (data, "Failed writing header");
|
|
|
|
return CURLE_WRITE_ERROR;
|
|
|
|
}
|
|
|
|
}
|
2004-06-03 07:41:05 -04:00
|
|
|
|
2000-11-22 07:53:56 -05:00
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
2001-01-25 07:20:30 -05:00
|
|
|
/*
|
|
|
|
* Internal read-from-socket function. This is meant to deal with plain
|
|
|
|
* sockets, SSL sockets and kerberos sockets.
|
2002-01-14 18:14:59 -05:00
|
|
|
*
|
|
|
|
* If the read would block (EWOULDBLOCK) we return -1. Otherwise we return
|
|
|
|
* a regular CURLcode value.
|
2001-01-25 07:20:30 -05:00
|
|
|
*/
|
2004-03-08 07:37:46 -05:00
|
|
|
int Curl_read(struct connectdata *conn, /* connection data */
|
2004-03-09 17:52:50 -05:00
|
|
|
curl_socket_t sockfd, /* read from this socket */
|
2004-03-08 07:37:46 -05:00
|
|
|
char *buf, /* store read data here */
|
|
|
|
size_t buffersize, /* max amount to read */
|
|
|
|
ssize_t *n) /* amount bytes read */
|
2001-01-25 07:20:30 -05:00
|
|
|
{
|
2001-01-31 08:54:12 -05:00
|
|
|
ssize_t nread;
|
2005-04-07 11:27:13 -04:00
|
|
|
|
2003-11-24 02:15:37 -05:00
|
|
|
/* Set 'num' to 0 or 1, depending on which socket that has been sent here.
|
|
|
|
If it is the second socket, we set num to 1. Otherwise to 0. This lets
|
|
|
|
us use the correct ssl handle. */
|
|
|
|
int num = (sockfd == conn->sock[SECONDARYSOCKET]);
|
|
|
|
|
2002-12-19 10:45:15 -05:00
|
|
|
*n=0; /* reset amount to zero */
|
2001-01-25 07:20:30 -05:00
|
|
|
|
2005-04-07 11:27:13 -04:00
|
|
|
if(conn->ssl[num].use) {
|
|
|
|
nread = Curl_ssl_recv(conn, num, buf, buffersize);
|
|
|
|
|
|
|
|
if(nread == -1)
|
|
|
|
return -1; /* -1 from Curl_ssl_recv() means EWOULDBLOCK */
|
2001-01-25 07:20:30 -05:00
|
|
|
}
|
|
|
|
else {
|
2003-11-24 02:15:37 -05:00
|
|
|
*n=0; /* reset amount to zero */
|
2001-01-25 07:20:30 -05:00
|
|
|
if(conn->sec_complete)
|
2001-08-17 06:14:06 -04:00
|
|
|
nread = Curl_sec_read(conn, sockfd, buf, buffersize);
|
2001-01-25 07:20:30 -05:00
|
|
|
else
|
2003-11-24 02:15:37 -05:00
|
|
|
nread = sread(sockfd, buf, buffersize);
|
2002-01-14 18:14:59 -05:00
|
|
|
|
|
|
|
if(-1 == nread) {
|
2003-05-01 09:36:28 -04:00
|
|
|
int err = Curl_ourerrno();
|
2002-01-14 18:14:59 -05:00
|
|
|
#ifdef WIN32
|
2003-05-01 09:36:28 -04:00
|
|
|
if(WSAEWOULDBLOCK == err)
|
2002-01-14 18:14:59 -05:00
|
|
|
#else
|
2003-05-06 04:19:36 -04:00
|
|
|
if((EWOULDBLOCK == err) || (EAGAIN == err) || (EINTR == err))
|
2002-01-14 18:14:59 -05:00
|
|
|
#endif
|
|
|
|
return -1;
|
|
|
|
}
|
2001-01-25 07:20:30 -05:00
|
|
|
}
|
|
|
|
*n = nread;
|
|
|
|
return CURLE_OK;
|
|
|
|
}
|
|
|
|
|
2002-04-12 03:21:11 -04:00
|
|
|
/* return 0 on success */
|
2004-06-03 07:41:05 -04:00
|
|
|
static int showit(struct SessionHandle *data, curl_infotype type,
|
|
|
|
char *ptr, size_t size)
|
2002-04-12 03:21:11 -04:00
|
|
|
{
|
|
|
|
static const char * const s_infotype[CURLINFO_END] = {
|
2004-06-18 02:20:43 -04:00
|
|
|
"* ", "< ", "> ", "{ ", "} ", "{ ", "} " };
|
2002-04-12 03:21:11 -04:00
|
|
|
|
2006-04-07 17:50:47 -04:00
|
|
|
#ifdef CURL_DOES_CONVERSIONS
|
|
|
|
char buf[BUFSIZE+1];
|
|
|
|
|
|
|
|
switch(type) {
|
|
|
|
case CURLINFO_HEADER_OUT:
|
|
|
|
/* assume output headers are ASCII */
|
|
|
|
/* copy the data into my buffer so the original is unchanged */
|
|
|
|
if (size > BUFSIZE) {
|
|
|
|
size = BUFSIZE; /* truncate if necessary */
|
|
|
|
buf[BUFSIZE] = '\0';
|
|
|
|
}
|
|
|
|
memcpy(buf, ptr, size);
|
|
|
|
Curl_convert_from_network(data, buf, size);
|
|
|
|
/* Curl_convert_from_network calls failf if unsuccessful */
|
|
|
|
/* we might as well continue even if it fails... */
|
|
|
|
ptr = buf; /* switch pointer to use my buffer instead */
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* leave everything else as-is */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
#endif /* CURL_DOES_CONVERSIONS */
|
|
|
|
|
2002-04-12 03:21:11 -04:00
|
|
|
if(data->set.fdebug)
|
|
|
|
return (*data->set.fdebug)(data, type, ptr, size,
|
|
|
|
data->set.debugdata);
|
|
|
|
|
2002-05-04 11:36:07 -04:00
|
|
|
switch(type) {
|
|
|
|
case CURLINFO_TEXT:
|
|
|
|
case CURLINFO_HEADER_OUT:
|
2003-04-09 07:57:06 -04:00
|
|
|
case CURLINFO_HEADER_IN:
|
2002-05-04 11:36:07 -04:00
|
|
|
fwrite(s_infotype[type], 2, 1, data->set.err);
|
|
|
|
fwrite(ptr, size, 1, data->set.err);
|
|
|
|
break;
|
|
|
|
default: /* nada */
|
|
|
|
break;
|
|
|
|
}
|
2002-04-12 03:21:11 -04:00
|
|
|
return 0;
|
|
|
|
}
|
2004-06-03 07:41:05 -04:00
|
|
|
|
|
|
|
int Curl_debug(struct SessionHandle *data, curl_infotype type,
|
2005-01-21 04:32:32 -05:00
|
|
|
char *ptr, size_t size,
|
|
|
|
struct connectdata *conn)
|
2004-06-03 07:41:05 -04:00
|
|
|
{
|
|
|
|
int rc;
|
2005-01-21 04:32:32 -05:00
|
|
|
if(data->set.printhost && conn && conn->host.dispname) {
|
2004-06-03 07:41:05 -04:00
|
|
|
char buffer[160];
|
2004-06-07 06:28:14 -04:00
|
|
|
const char *t=NULL;
|
2005-01-21 04:32:32 -05:00
|
|
|
const char *w="Data";
|
2004-06-07 03:01:29 -04:00
|
|
|
switch (type) {
|
|
|
|
case CURLINFO_HEADER_IN:
|
2005-01-21 04:32:32 -05:00
|
|
|
w = "Header";
|
2004-06-07 03:01:29 -04:00
|
|
|
case CURLINFO_DATA_IN:
|
|
|
|
t = "from";
|
|
|
|
break;
|
|
|
|
case CURLINFO_HEADER_OUT:
|
2005-01-21 04:32:32 -05:00
|
|
|
w = "Header";
|
2004-06-07 03:01:29 -04:00
|
|
|
case CURLINFO_DATA_OUT:
|
|
|
|
t = "to";
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(t) {
|
2005-01-21 04:32:32 -05:00
|
|
|
snprintf(buffer, sizeof(buffer), "[%s %s %s%s]", w, t,
|
|
|
|
conn->xfertype==NORMAL?"":
|
|
|
|
(conn->xfertype==SOURCE3RD?"source ":"target "),
|
|
|
|
conn->host.dispname);
|
2004-06-07 03:01:29 -04:00
|
|
|
rc = showit(data, CURLINFO_TEXT, buffer, strlen(buffer));
|
|
|
|
if(rc)
|
|
|
|
return rc;
|
|
|
|
}
|
2004-06-03 07:41:05 -04:00
|
|
|
}
|
|
|
|
rc = showit(data, type, ptr, size);
|
|
|
|
return rc;
|
|
|
|
}
|