[libEtPan-commits] CVS: libetpan/src/data-types mailstream_ssl.c,1.23,1.24

[DINH V. H. <ho...@us...>]

Update of /cvsroot/libetpan/libetpan/src/data-types
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2538/src/data-types

Modified Files:
	mailstream_ssl.c 
Log Message:
fixed GNUTLS compatibility

Index: mailstream_ssl.c
===================================================================
RCS file: /cvsroot/libetpan/libetpan/src/data-types/mailstream_ssl.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- mailstream_ssl.c	13 Aug 2005 14:59:42 -0000	1.23
+++ mailstream_ssl.c	12 Sep 2005 13:57:24 -0000	1.24
@@ -154,10 +154,6 @@
   if (SSL_set_fd(ssl_conn, fd) == 0)
     goto free_ssl_conn;
   
-#ifndef USE_GNUTLS
-  SSL_set_read_ahead(ssl_conn, 1);
-#endif
-  
   r = SSL_connect(ssl_conn);
   if (r <= 0)
     goto free_ssl_conn;
@@ -272,35 +268,11 @@
     int ssl_r;
     fd_set fds_read;
     struct timeval timeout;
-#ifdef USE_GNUTLS
-    fd_set fds_excp;
-#endif
-    
-#ifdef USE_GNUTLS
-    timeout = mailstream_network_delay;
-    
-    FD_ZERO(&fds_read);
-    FD_SET(ssl_data->fd, &fds_read);
-    FD_ZERO(&fds_excp);
-    FD_SET(ssl_data->fd, &fds_excp);
-    r = select(ssl_data->fd + 1, &fds_read, NULL, &fds_excp, &timeout);
-    if (r==0) {
-      return -1;
-    }
-    if (FD_ISSET(ssl_data->fd, &fds_excp))
-      return -1;
-    if (!FD_ISSET(ssl_data->fd, &fds_read))
-      return 0;
-#endif
     
     r = SSL_read(ssl_data->ssl_conn, buf, count);
     if (r > 0)
       return r;
     
-#ifdef USE_GNUTLS
-    if ((errno != EAGAIN) && (errno != EWOULDBLOCK))
-        return r;
-#else
     ssl_r = SSL_get_error(ssl_data->ssl_conn, r);
     switch (ssl_r) {
     case SSL_ERROR_NONE:
@@ -322,7 +294,6 @@
     default:
       return r;
     }
-#endif
   }
 }