X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=proxy.h;h=2e2324c078343ae5d2229a79e5b08d20659b10d0;hb=359b5c8eb45ff56c62032cf147fcdb3723d54324;hp=35c57982560b60b58f1a2ca3c329eccff2025d33;hpb=3af7d333401755a7decbb74c23037fc07017002c;p=PuTTY.git

diff --git a/proxy.h b/proxy.h
index 35c57982..2e2324c0 100644
--- a/proxy.h
+++ b/proxy.h
@@ -19,7 +19,7 @@ struct Socket_proxy_tag {
     const struct socket_function_table *fn;
     /* the above variable absolutely *must* be the first in this structure */
 
-    char * error;
+    const char *error;
 
     Socket sub_socket;
     Plug plug;
@@ -30,6 +30,7 @@ struct Socket_proxy_tag {
     bufchain pending_oob_output_data;
     int pending_flush;
     bufchain pending_input_data;
+    int pending_eof;
 
 #define PROXY_STATE_NEW    -1
 #define PROXY_STATE_ACTIVE  0
@@ -77,10 +78,11 @@ struct Socket_proxy_tag {
     int sent_bufsize;
 
     /* accepting */
-    OSSocket accepting_sock;
+    accept_fn_t accepting_constructor;
+    accept_ctx_t accepting_ctx;
 
     /* configuration, used to look up proxy settings */
-    Config cfg;
+    Conf *conf;
 
     /* CHAP transient data */
     int chap_num_attributes;
@@ -110,7 +112,7 @@ extern int proxy_socks5_negotiate (Proxy_Socket, int);
  * This may be reused by local-command proxies on individual
  * platforms.
  */
-char *format_telnet_command(SockAddr addr, int port, const Config *cfg);
+char *format_telnet_command(SockAddr addr, int port, Conf *conf);
 
 /*
  * These are implemented in cproxy.c or nocproxy.c, depending on