Commit d64bd82b authored by Howard Chu's avatar Howard Chu Committed by Daniel Stenberg
Browse files

sendrecv: split the I/O handling into private handler 

Howard Chu brought the bulk work of this patch that properly
moves out the sending and recving of data to the parts of the
code that are properly responsible for the various ways of doing
so.

Daniel Stenberg assisted with polishing a few bits and fixed some
minor flaws in the original patch.

Another upside of this patch is that we now abuse CURLcodes less
with the "magic" -1 return codes and instead use CURLE_AGAIN more
consistently.
parent cb6647ce

lib/easy.c

+3 −7
Original line number Diff line number Diff line
@@ -1108,7 +1108,6 @@ CURLcode curl_easy_recv(CURL *curl, void *buffer, size_t buflen, size_t *n) 
{

  curl_socket_t sfd;

  CURLcode ret;

  int ret1;

  ssize_t n1;

  struct connectdata *c;

  struct SessionHandle *data = (struct SessionHandle *)curl;
@@ -1118,13 +1117,10 @@ CURLcode curl_easy_recv(CURL *curl, void *buffer, size_t buflen, size_t *n) 
    return ret;



  *n = 0;

  ret1 = Curl_read(c, sfd, buffer, buflen, &n1);

  ret = Curl_read(c, sfd, buffer, buflen, &n1);



  if(ret1 == -1)

    return CURLE_AGAIN;



  if(ret1 != CURLE_OK)

    return (CURLcode)ret1;

  if(ret != CURLE_OK)

    return ret;



  *n = (size_t)n1;

lib/gtls.c

+18 −15
Original line number Diff line number Diff line
@@ -419,6 +419,9 @@ gtls_connect_step1(struct connectdata *conn, 
  return CURLE_OK;

}



static Curl_recv gtls_recv;

static Curl_send gtls_send;



static CURLcode

gtls_connect_step3(struct connectdata *conn,

                   int sockindex)
@@ -630,6 +633,8 @@ gtls_connect_step3(struct connectdata *conn, 
  infof(data, "\t MAC: %s\n", ptr);



  conn->ssl[sockindex].state = ssl_connection_complete;

  conn->recv = gtls_recv;

  conn->send = gtls_send;



  {

    /* we always unconditionally get the session id here, as even if we
@@ -730,18 +735,17 @@ Curl_gtls_connect(struct connectdata *conn, 
  return CURLE_OK;

}



/* for documentation see Curl_ssl_send() in sslgen.h */

ssize_t Curl_gtls_send(struct connectdata *conn,

static ssize_t gtls_send(struct connectdata *conn,

                         int sockindex,

                         const void *mem,

                         size_t len,

                       int *curlcode)

                         CURLcode *curlcode)

{

  ssize_t rc = gnutls_record_send(conn->ssl[sockindex].session, mem, len);



  if(rc < 0 ) {

    *curlcode = (rc == GNUTLS_E_AGAIN)

      ? /* EWOULDBLOCK */ -1

      ? CURLE_AGAIN

      : CURLE_SEND_ERROR;



    rc = -1;
@@ -843,18 +847,17 @@ int Curl_gtls_shutdown(struct connectdata *conn, int sockindex) 
  return retval;

}



/* for documentation see Curl_ssl_recv() in sslgen.h */

ssize_t Curl_gtls_recv(struct connectdata *conn, /* connection data */

static ssize_t gtls_recv(struct connectdata *conn, /* connection data */

                         int num,                  /* socketindex */

                         char *buf,                /* store read data here */

                         size_t buffersize,        /* max amount to read */

                       int *curlcode)

                         CURLcode *curlcode)

{

  ssize_t ret;



  ret = gnutls_record_recv(conn->ssl[num].session, buf, buffersize);

  if((ret == GNUTLS_E_AGAIN) || (ret == GNUTLS_E_INTERRUPTED)) {

    *curlcode = -1;

    *curlcode = CURLE_AGAIN;

    return -1;

  }
@@ -866,7 +869,7 @@ ssize_t Curl_gtls_recv(struct connectdata *conn, /* connection data */ 
      /* handshake() writes error message on its own */

      *curlcode = rc;

    else

      *curlcode = -1; /* then return as if this was a wouldblock */

      *curlcode = CURLE_AGAIN; /* then return as if this was a wouldblock */

    return -1;

  }

lib/gtls.h

+0 −10
Original line number Diff line number Diff line
@@ -38,14 +38,6 @@ void Curl_gtls_close_all(struct SessionHandle *data); 
 /* close a SSL connection */

void Curl_gtls_close(struct connectdata *conn, int sockindex);



/* for documentation see Curl_ssl_send() in sslgen.h */

ssize_t Curl_gtls_send(struct connectdata *conn, int sockindex,

                       const void *mem, size_t len, int *curlcode);



/* for documentation see Curl_ssl_recv() in sslgen.h */

ssize_t Curl_gtls_recv(struct connectdata *conn, int num, char *buf,

                       size_t buffersize, int *curlcode);



void Curl_gtls_session_free(void *ptr);

size_t Curl_gtls_version(char *buffer, size_t size);

int Curl_gtls_shutdown(struct connectdata *conn, int sockindex);
@@ -63,8 +55,6 @@ int Curl_gtls_seed(struct SessionHandle *data); 
#define curlssl_set_engine(x,y) (x=x, y=y, CURLE_FAILED_INIT)

#define curlssl_set_engine_default(x) (x=x, CURLE_FAILED_INIT)

#define curlssl_engines_list(x) (x=x, (struct curl_slist *)NULL)

#define curlssl_send Curl_gtls_send

#define curlssl_recv Curl_gtls_recv

#define curlssl_version Curl_gtls_version

#define curlssl_check_cxn(x) (x=x, -1)

#define curlssl_data_pending(x,y) (x=x, y=y, 0)

lib/http.c

+3 −5
Original line number Diff line number Diff line
@@ -1283,7 +1283,6 @@ CURLcode Curl_proxyCONNECT(struct connectdata *conn, 
  struct SessionHandle *data=conn->data;

  struct SingleRequest *k = &data->req;

  CURLcode result;

  int res;

  long timeout =

    data->set.timeout?data->set.timeout:PROXY_TIMEOUT; /* in milliseconds */

  curl_socket_t tunnelsocket = conn->sock[sockindex];
@@ -1467,11 +1466,10 @@ CURLcode Curl_proxyCONNECT(struct connectdata *conn, 
          break;

        default:

          DEBUGASSERT(ptr+BUFSIZE-nread <= data->state.buffer+BUFSIZE+1);

          res = Curl_read(conn, tunnelsocket, ptr, BUFSIZE-nread, &gotbytes);

          if(res< 0)

            /* EWOULDBLOCK */

          result = Curl_read(conn, tunnelsocket, ptr, BUFSIZE-nread, &gotbytes);

          if(result==CURLE_AGAIN)

            continue; /* go loop yourself */

          else if(res)

          else if(result)

            keepon = FALSE;

          else if(gotbytes <= 0) {

            keepon = FALSE;

lib/krb4.h

+1 −4
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -51,14 +51,11 @@ int Curl_sec_fflush_fd(struct connectdata *conn, int fd); 
int Curl_sec_fprintf (struct connectdata *, FILE *, const char *, ...);

int Curl_sec_getc (struct connectdata *conn, FILE *);

int Curl_sec_putc (struct connectdata *conn, int, FILE *);

int Curl_sec_read (struct connectdata *conn, int, void *, int);

int Curl_sec_read_msg (struct connectdata *conn, char *, int);



int Curl_sec_vfprintf(struct connectdata *, FILE *, const char *, va_list);

int Curl_sec_fprintf2(struct connectdata *conn, FILE *f, const char *fmt, ...);

int Curl_sec_vfprintf2(struct connectdata *conn, FILE *, const char *, va_list);

ssize_t Curl_sec_send(struct connectdata *conn, int, const char *, int);

int Curl_sec_write(struct connectdata *conn, int, const char *, int);



void Curl_sec_end (struct connectdata *);

int Curl_sec_login (struct connectdata *);