Commit ff871113 authored by Kamil Dudka's avatar Kamil Dudka
Browse files

refactorize interface of Curl_ssl_recv/Curl_ssl_send

parent 7425db3f

CHANGES

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
Kamil Dudka (4 Apr 2010)

- Eliminated a race condition in Curl_resolv_timeout().



- Refactorized interface of Curl_ssl_recv()/Curl_ssl_send().



Daniel Stenberg (1 Apr 2010)

- Matt Wixson found and fixed a bug in the SCP/SFTP area where the code

  treated a 0 return code from libssh2 to be the same as EAGAIN while in

lib/gtls.c

+17 −16
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

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

 *

 * Copyright (C) 1998 - 2009, 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
@@ -638,18 +638,21 @@ Curl_gtls_connect(struct connectdata *conn, 
}





/* return number of sent (non-SSL) bytes */

/* 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)

                       size_t len,

                       int *curlcode)

{

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



  if(rc < 0 ) {

    if(rc == GNUTLS_E_AGAIN)

      return 0; /* EWOULDBLOCK equivalent */

    rc = -1; /* generic error code for send failure */

    *curlcode = (rc == GNUTLS_E_AGAIN)

      ? /* EWOULDBLOCK */ -1

      : CURLE_SEND_ERROR;



    rc = -1;

  }



  return rc;
@@ -748,22 +751,18 @@ int Curl_gtls_shutdown(struct connectdata *conn, int sockindex) 
  return retval;

}



/*

 * If the read would block we return -1 and set 'wouldblock' to TRUE.

 * Otherwise we return the amount of data read. Other errors should return -1

 * and set 'wouldblock' to FALSE.

 */

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

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

                       int num,                  /* socketindex */

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

                       size_t buffersize,        /* max amount to read */

                       bool *wouldblock)

                       int *curlcode)

{

  ssize_t ret;



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

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

    *wouldblock = TRUE;

    *curlcode = -1;

    return -1;

  }
@@ -773,20 +772,22 @@ ssize_t Curl_gtls_recv(struct connectdata *conn, /* connection data */ 
    CURLcode rc = handshake(conn, conn->ssl[num].session, num, FALSE);

    if(rc)

      /* handshake() writes error message on its own */

      return rc;

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

      *curlcode = rc;

    else

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

    return -1;

  }



  *wouldblock = FALSE;

  if(!ret) {

    failf(conn->data, "Peer closed the TLS connection");

    *curlcode = CURLE_RECV_ERROR;

    return -1;

  }



  if(ret < 0) {

    failf(conn->data, "GnuTLS recv error (%d): %s",

          (int)ret, gnutls_strerror((int)ret));

    *curlcode = CURLE_RECV_ERROR;

    return -1;

  }

lib/gtls.h

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

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

 *

 * Copyright (C) 1998 - 2008, 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
@@ -35,14 +35,14 @@ void Curl_gtls_close_all(struct SessionHandle *data); 
 /* close a SSL connection */

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



/* return number of sent (non-SSL) bytes */

/* 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);

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

                       int num,                  /* socketindex */

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

                       size_t buffersize,        /* max amount to read */

                       bool *wouldblock);

                       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);

lib/nss.c

+17 −14
Original line number Diff line number Diff line
@@ -1340,47 +1340,50 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex) 
  return curlerr;

}



/* return number of sent (non-SSL) bytes */

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

int Curl_nss_send(struct connectdata *conn,  /* connection data */

                  int sockindex,             /* socketindex */

                  const void *mem,           /* send this data */

                  size_t len)                /* amount to write */

                  size_t len,                /* amount to write */

                  int *curlcode)

{

  int rc;



  rc = PR_Send(conn->ssl[sockindex].handle, mem, (int)len, 0, -1);



  if(rc < 0) {

    failf(conn->data, "SSL write: error %d", PR_GetError());

    PRInt32 err = PR_GetError();

    if(err == PR_WOULD_BLOCK_ERROR)

      *curlcode = -1; /* EWOULDBLOCK */

    else {

      failf(conn->data, "SSL write: error %d", err);

      *curlcode = CURLE_SEND_ERROR;

    }

    return -1;

  }

  return rc; /* number of bytes */

}



/*

 * If the read would block we return -1 and set 'wouldblock' to TRUE.

 * Otherwise we return the amount of data read. Other errors should return -1

 * and set 'wouldblock' to FALSE.

 */

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

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

                      int num,                   /* socketindex */

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

                      size_t buffersize,         /* max amount to read */

                      bool * wouldblock)

                      int *curlcode)

{

  ssize_t nread;



  nread = PR_Recv(conn->ssl[num].handle, buf, (int)buffersize, 0, -1);

  *wouldblock = FALSE;

  if(nread < 0) {

    /* failed SSL read */

    PRInt32 err = PR_GetError();



    if(err == PR_WOULD_BLOCK_ERROR) {

      *wouldblock = TRUE;

      return -1; /* basically EWOULDBLOCK */

    }

    if(err == PR_WOULD_BLOCK_ERROR)

      *curlcode = -1; /* EWOULDBLOCK */

    else {

      failf(conn->data, "SSL read: errno %d", err);

      *curlcode = CURLE_RECV_ERROR;

    }

    return -1;

  }

  return nread;

lib/nssg.h

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

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

 *

 * Copyright (C) 1998 - 2008, 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
@@ -42,15 +42,19 @@ int Curl_nss_close_all(struct SessionHandle *data); 
int Curl_nss_init(void);

void Curl_nss_cleanup(void);



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

int Curl_nss_send(struct connectdata *conn,

                  int sockindex,

                  const void *mem,

                  size_t len);

                  size_t len,

                  int *curlcode);



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

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

                      int num,                  /* socketindex */

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

                      size_t buffersize,        /* max amount to read */

                      bool *wouldblock);

                      int *curlcode);



size_t Curl_nss_version(char *buffer, size_t size);

int Curl_nss_check_cxn(struct connectdata *cxn);