More preparatory work: remove the <windows.h> include from lots of

[u/mdw/putty] / network.h

diff --git a/network.h b/network.h
index 0e1420a..8d5ba1e 100644 (file)
--- a/network.h
+++ b/network.h
@@ -27,6 +27,9 @@ struct socket_function_table {
     int (*write) (Socket s, char *data, int len);
     int (*write_oob) (Socket s, char *data, int len);
     void (*flush) (Socket s);
+    void (*set_private_ptr) (Socket s, void *ptr);
+    void *(*get_private_ptr) (Socket s);
+    void (*set_frozen) (Socket s, int is_frozen);
     /* ignored by tcp, but vital for ssl */
     char *(*socket_error) (Socket s);
 };
@@ -54,22 +57,34 @@ struct plug_function_table {
      * on a socket is cleared or partially cleared. The new backlog
      * size is passed in the `bufsize' parameter.
      */
-    int (*accepting)(Plug p, struct sockaddr *addr, void *sock);
+    int (*accepting)(Plug p, void *sock);
     /*
      * returns 0 if the host at address addr is a valid host for connecting or error
      */
 };
 
+/* proxy indirection layer */
+Socket new_connection(SockAddr addr, char *hostname,
+                     int port, int privport,
+                     int oobinline, int nodelay, Plug plug);
+Socket new_listener(int port, Plug plug, int local_host_only);
+
+/* socket functions */
 
 void sk_init(void);                   /* called once at program startup */
+void sk_cleanup(void);                /* called just before program exit */
 
 SockAddr sk_namelookup(char *host, char **canonicalname);
+void sk_getaddr(SockAddr addr, char *buf, int buflen);
+enum { ADDRTYPE_IPV4, ADDRTYPE_IPV6 };
+int sk_addrtype(SockAddr addr);
+void sk_addrcopy(SockAddr addr, char *buf);
 void sk_addr_free(SockAddr addr);
 
 Socket sk_new(SockAddr addr, int port, int privport, int oobinline,
-             Plug p);
+             int nodelay, Plug p);
 
-Socket sk_newlistenner(int port, Plug plug);
+Socket sk_newlistener(int port, Plug plug, int local_host_only);
 
 Socket sk_register(void *sock, Plug plug);
 
@@ -83,7 +98,7 @@ Socket sk_register(void *sock, Plug plug);
 #define plug_closing(p,msg,code,callback) (((*p)->closing) (p, msg, code, callback))
 #define plug_receive(p,urgent,buf,len) (((*p)->receive) (p, urgent, buf, len))
 #define plug_sent(p,bufsize) (((*p)->sent) (p, bufsize))
-#define plug_accepting(p, addr, sock) (((*p)->accepting)(p, addr, sock))
+#define plug_accepting(p, sock) (((*p)->accepting)(p, sock))
 #endif
 
 /*
@@ -93,8 +108,8 @@ Socket sk_register(void *sock, Plug plug);
  * This is perhaps unnecessary now that we have the notion of a plug,
  * but there is some existing code that uses it, so it stays.
  */
-void sk_set_private_ptr(Socket s, void *ptr);
-void *sk_get_private_ptr(Socket s);
+#define sk_set_private_ptr(s, ptr) (((*s)->set_private_ptr) (s, ptr))
+#define sk_get_private_ptr(s) (((*s)->get_private_ptr) (s))
 
 /*
  * Special error values are returned from sk_namelookup and sk_new
@@ -121,7 +136,22 @@ char *sk_addr_error(SockAddr addr);
  *    associated local socket in order to avoid unbounded buffer
  *    growth.
  */
-void sk_set_frozen(Socket sock, int is_frozen);
+#define sk_set_frozen(s, is_frozen) (((*s)->set_frozen) (s, is_frozen))
+
+/*
+ * Call this after an operation that might have tried to send on a
+ * socket, to clean up any pending network errors.
+ */
+void net_pending_errors(void);
+
+/*
+ * Simple wrapper on getservbyname(), needed by ssh.c. Returns the
+ * port number, in host byte order (suitable for printf and so on).
+ * Returns 0 on failure. Any platform not supporting getservbyname
+ * can just return 0 - this function is not required to handle
+ * numeric port specifications.
+ */
+int net_service_lookup(char *service);
 
 /********** SSL stuff **********/