Whitespace and formatting changes.(Aesthetic only)

[wget] / src / connect.h

diff --git a/src/connect.h b/src/connect.h
index 8b0ed4b31d57605e8ac9ed87248fb7bb877a4fb6..3826aa41172b18a12da3b3599ddee09f86f4361b 100644 (file)
--- a/src/connect.h
+++ b/src/connect.h
@@ -1,11 +1,13 @@
 /* Declarations for connect.
 /* Declarations for connect.

-   Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007, 2008, 2009, 2010, 2011 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,59 +16,68 @@ 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.
-
-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.  */
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.
+
+Additional permission under GNU GPL version 3 section 7
+
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work.  */

 
 #ifndef CONNECT_H
 #define CONNECT_H
 
 
 #ifndef CONNECT_H
 #define CONNECT_H
 

-#include "host.h"              /* for definition of ip_address */
+#include "host.h"       /* for definition of ip_address */
+
+/* Function declarations */

 
 /* Returned by connect_to_host when host name cannot be resolved.  */
 enum {
   E_HOST = -100
 };
 
 /* Returned by connect_to_host when host name cannot be resolved.  */
 enum {
   E_HOST = -100
 };

+int connect_to_host (const char *, int);
+int connect_to_ip (const ip_address *, int, const char *);
+
+int bind_local (const ip_address *, int *);
+int accept_connection (int);

 
 

-/* Flags for select_fd's WAIT argument. */

 enum {
 enum {

-  WAIT_READ = 1,
-  WAIT_WRITE = 2
+  ENDPOINT_LOCAL,
+  ENDPOINT_PEER

 };
 };

+bool socket_ip_address (int, ip_address *, int);
+int  socket_family (int sock, int endpoint);

 
 

-/* 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 */
+bool retryable_socket_connect_error (int);

 
 

-/* Function declarations */
-
-int connect_to_ip PARAMS ((const ip_address *, int, const char *));
-int connect_to_host PARAMS ((const char *, int));
-
-void sockaddr_get_data PARAMS ((const struct sockaddr *, ip_address *, int *));
-
-int test_socket_open PARAMS ((int));
-int select_fd PARAMS ((int, double, int));
-uerr_t bindport PARAMS ((const ip_address *, int *, int *));
-uerr_t acceptport PARAMS ((int, int *));
-int conaddr PARAMS ((int, ip_address *));
+/* Flags for select_fd's WAIT_FOR argument. */
+enum {
+  WAIT_FOR_READ = 1,
+  WAIT_FOR_WRITE = 2
+};
+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 *);
+};

 
 

-int iread PARAMS ((int, char *, int));
-int iwrite PARAMS ((int, char *, int));
+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 */