[svn] Remove the "rbuf" buffering layer. Provide peeking primitives instead.

[wget] / src / connect.h

diff --git a/src/connect.h b/src/connect.h
index 8c1cb935e42807b19a229a232d7faf1362c87c43..f0ae5c074443078540414597e35a9aad52d46dd8 100644 (file)
--- a/src/connect.h
+++ b/src/connect.h
@@ -6,7 +6,7 @@ This file is part of GNU Wget.
 GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+ (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,20 +15,69 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Wget; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+In addition, as a special exception, the Free Software Foundation
+gives permission to link the code of its release of Wget with the
+OpenSSL project's "OpenSSL" library (or with modified versions of it
+that use the same license as the "OpenSSL" library), and distribute
+the linked executables.  You must obey the GNU General Public License
+in all respects for all of the code used other than "OpenSSL".  If you
+modify this file, you may extend this exception to your version of the
+file, but you are not obligated to do so.  If you do not wish to do
+so, delete this exception statement from your version.  */
 
 #ifndef CONNECT_H
 #define CONNECT_H
 
+#include "host.h"              /* for definition of ip_address */
+
+#ifndef ENABLE_IPV6
+# ifndef HAVE_SOCKADDR_STORAGE
+#  define sockaddr_storage sockaddr_in
+# endif
+#endif /* ENABLE_IPV6 */
+
 /* Function declarations */
-uerr_t make_connection PARAMS ((int *, char *, unsigned short));
+
+/* Returned by connect_to_host when host name cannot be resolved.  */
+enum {
+  E_HOST = -100
+};
+int connect_to_host PARAMS ((const char *, int));
+int connect_to_ip PARAMS ((const ip_address *, int, const char *));
+
+int bind_local PARAMS ((const ip_address *, int *));
+int accept_connection PARAMS ((int));
+
+enum {
+  ENDPOINT_LOCAL,
+  ENDPOINT_PEER
+};
+int socket_ip_address PARAMS ((int, ip_address *, int));
+
+int retryable_socket_connect_error PARAMS ((int));
+
+/* Flags for select_fd's WAIT_FOR argument. */
+enum {
+  WAIT_FOR_READ = 1,
+  WAIT_FOR_WRITE = 2
+};
+int select_fd PARAMS ((int, double, int));
 int test_socket_open PARAMS ((int));
-uerr_t bindport PARAMS ((unsigned short *));
-uerr_t acceptport PARAMS ((int *));
-void closeport PARAMS ((int));
-unsigned char *conaddr PARAMS ((int));
+int socket_has_inet6 PARAMS ((void));
 
-int iread PARAMS ((int, char *, int));
-int iwrite PARAMS ((int, char *, int));
+typedef int (*fd_reader_t) PARAMS ((int, char *, int, void *));
+typedef int (*fd_writer_t) PARAMS ((int, char *, int, void *));
+typedef int (*fd_poller_t) PARAMS ((int, double, int, void *));
+typedef int (*fd_peeker_t) PARAMS ((int, char *, int, void *));
+typedef void (*fd_closer_t) PARAMS ((int, void *));
+void fd_register_transport PARAMS ((int, fd_reader_t, fd_writer_t,
+                                   fd_poller_t, fd_peeker_t, fd_closer_t,
+                                   void *));
 
+int fd_read PARAMS ((int, char *, int, double));
+int fd_write PARAMS ((int, char *, int, double));
+int fd_peek PARAMS ((int, char *, int, double));
+void fd_close PARAMS ((int));
 #endif /* CONNECT_H */