[svn] Merge of fix for bugs 20341 and 20410.

[wget] / src / connect.h

diff --git a/src/connect.h b/src/connect.h
index aa485c1c6c38510e2f5d098f2605a2e53253e508..de6899ccf855c8b937d7422fecb6a453d12d5250 100644 (file)
--- a/src/connect.h
+++ b/src/connect.h
@@ -1,11 +1,11 @@
 /* Declarations for connect.
 /* Declarations for connect.

-   Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996-2006 Free Software Foundation, Inc.

 
 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
 
 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
+the Free Software Foundation; either version 3 of the License, or

  (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,
  (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,


@@ -14,8 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 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.
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.

 
 In addition, as a special exception, the Free Software Foundation
 gives permission to link the code of its release of Wget with the
 
 In addition, as a special exception, the Free Software Foundation
 gives permission to link the code of its release of Wget with the


@@ -32,51 +31,49 @@ so, delete this exception statement from your version.  */
 
 #include "host.h"              /* for definition of ip_address */
 
 
 #include "host.h"              /* for definition of ip_address */
 

-/* bindport flags */
-#define BIND_ON_IPV4_ONLY LH_IPV4_ONLY
-#define BIND_ON_IPV6_ONLY LH_IPV6_ONLY
-
-#ifndef ENABLE_IPV6
-# ifndef HAVE_SOCKADDR_STORAGE
-#  define sockaddr_storage sockaddr_in
-# endif
-#endif /* ENABLE_IPV6 */
-

 /* Function declarations */
 
 /* Returned by connect_to_host when host name cannot be resolved.  */
 enum {
   E_HOST = -100
 };
 /* Function declarations */
 
 /* 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 connect_to_host (const char *, int);
+int connect_to_ip (const ip_address *, int, const char *);

 
 

-uerr_t bindport PARAMS ((const ip_address *, int *, int *));
-uerr_t acceptport PARAMS ((int, int *));
+int bind_local (const ip_address *, int *);
+int accept_connection (int);

 
 enum {
   ENDPOINT_LOCAL,
   ENDPOINT_PEER
 };
 
 enum {
   ENDPOINT_LOCAL,
   ENDPOINT_PEER
 };

-int socket_ip_address PARAMS ((int, ip_address *, int));
+bool socket_ip_address (int, ip_address *, int);
+
+bool retryable_socket_connect_error (int);

 
 /* Flags for select_fd's WAIT_FOR argument. */
 enum {
   WAIT_FOR_READ = 1,
   WAIT_FOR_WRITE = 2
 };
 
 /* 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));
-
-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 select_fd (int, double, int);
+bool test_socket_open (int);
+
+struct transport_implementation {
+  int (*reader) (int, char *, int, void *);
+  int (*writer) (int, char *, int, void *);
+  int (*poller) (int, double, int, void *);
+  int (*peeker) (int, char *, int, void *);
+  const char *(*errstr) (int, void *);
+  void (*closer) (int, void *);
+};
+
+void fd_register_transport (int, struct transport_implementation *, void *);
+void *fd_transport_context (int);
+int fd_read (int, char *, int, double);
+int fd_write (int, char *, int, double);
+int fd_peek (int, char *, int, double);
+const char *fd_errstr (int);
+void fd_close (int);
+

 #endif /* CONNECT_H */
 #endif /* CONNECT_H */