Changeset 5537

Timestamp:

05/28/08 01:23:41 (4 months ago)

Author:

morris

Message:

wi_socket_wait_descriptor() no longer sets error, do it ourselves in functions that can time out

Files:

• libwired/trunk/libwired/net/wi-socket.c (modified) (5 diffs)

libwired/trunk/libwired/net/wi-socket.c

@@ -1169 +1169 @@
-wi_boolean_t wi_socket_accept_tls(wi_socket_t *socket, wi_socket_tls_t *tls, wi_time_interval_t timeout) {
-#ifdef WI_SSL
-
+
+
-        
-        ssl = SSL_new(tls->ssl_ctx);
@@ -1194 +1195 @@
-        
-        if(timeout > 0.0) {
-
+
+
+
+
+
+
-                        goto err;
+                }
-        }
-
@@ -1356 +1363 @@
-
-wi_integer_t wi_socket_write_buffer(wi_socket_t *socket, wi_time_interval_t timeout, const void *buffer, size_t length) {
-
+
+
-        
-        if(timeout > 0.0) {
-
+
+
+
+
+
+
-                        return -1;
+                }
-        }
-
@@ -1473 +1487 @@
-
-wi_integer_t wi_socket_read_buffer(wi_socket_t *socket, wi_time_interval_t timeout, void *buffer, size_t length) {
-
+
+
-        
-        if(timeout > 0.0) {
@@ -1479 +1494 @@
-                if(!socket->ssl || (socket->ssl && SSL_pending(socket->ssl) == 0)) {
-#endif
-
+
+
+
+
+
+
-                                return -1;
+                        }
-#ifdef WI_SSL
-                }