X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2Fconnect.h;h=f0ae5c074443078540414597e35a9aad52d46dd8;hb=d9fea91a0a319e348adb504bd3edff148ff3d8a0;hp=a0c830c6c5b2da5b36347e0ab9659a633220ed91;hpb=8ccc51e5afc854116094d9d827209218b1f47174;p=wget

diff --git a/src/connect.h b/src/connect.h
index a0c830c6..f0ae5c07 100644
--- a/src/connect.h
+++ b/src/connect.h
@@ -47,8 +47,8 @@ enum {
 int connect_to_host PARAMS ((const char *, int));
 int connect_to_ip PARAMS ((const ip_address *, int, const char *));
 
-uerr_t bindport PARAMS ((const ip_address *, int *, int *));
-uerr_t acceptport PARAMS ((int, int *));
+int bind_local PARAMS ((const ip_address *, int *));
+int accept_connection PARAMS ((int));
 
 enum {
   ENDPOINT_LOCAL,
@@ -56,6 +56,8 @@ enum {
 };
 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,
@@ -63,16 +65,19 @@ enum {
 };
 int select_fd PARAMS ((int, double, int));
 int test_socket_open PARAMS ((int));
+int socket_has_inet6 PARAMS ((void));
+
+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 *));
 
-typedef int (*xreader_t) PARAMS ((int, char *, int, void *));
-typedef int (*xwriter_t) PARAMS ((int, char *, int, void *));
-typedef int (*xpoller_t) PARAMS ((int, double, int, void *));
-typedef void (*xcloser_t) PARAMS ((int, void *));
-void register_extended PARAMS ((int,
-				xreader_t, xwriter_t, xpoller_t, xcloser_t,
-				void *));
-
-int xread PARAMS ((int, char *, int, double));
-int xwrite PARAMS ((int, char *, int, double));
-void xclose PARAMS ((int));
+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 */