Ensure our network layer is properly cleaned up before PuTTY exits.

[u/mdw/putty] / network.h

diff --git a/network.h b/network.h
index 0e1420a..2cab438 100644 (file)
--- a/network.h
+++ b/network.h
@@ -54,7 +54,7 @@ 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
      */
@@ -62,14 +62,16 @@ struct plug_function_table {
 
 
 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);
 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 +85,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
 
 /*
@@ -123,6 +125,12 @@ char *sk_addr_error(SockAddr addr);
  */
 void sk_set_frozen(Socket sock, int 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);
+
 /********** SSL stuff **********/
 
 /*