X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=proxy.h;h=7c8d948439a5d8a24599c9fe07034f26bd734bf8;hb=afbd7779e49eaf5f36a8cc94a6ccde1db6d0ba16;hp=43d92cb0aa9c7f0a8d881d019315670eddc93f33;hpb=eabd704d1ecf72868794284d0f24e8d69ec9ce76;p=PuTTY.git

diff --git a/proxy.h b/proxy.h
index 43d92cb0..7c8d9484 100644
--- a/proxy.h
+++ b/proxy.h
@@ -80,24 +80,6 @@ struct Socket_proxy_tag {
     /* accepting */
     void *accepting_sock;
 
-    /* spin locks, for the critical switch from negotiating
-     * to active state. we have to dump all of our pending
-     * buffers without new events (read, writes, etc) corrupting
-     * things. we should not have built up a large amount of
-     * pending data during negotiation, so hopefully this will
-     * not have a large effect on performance.
-     */
-
-    char lock_close;
-    char lock_write;
-    char lock_write_oob;
-    char lock_receive;
-    char lock_flush;
-    char lock_closing;
-    char lock_sent;
-    char lock_accepting;
-    char lock_freeze;
-
 };
 
 typedef struct Plug_proxy_tag * Proxy_Plug;
@@ -114,6 +96,7 @@ extern void proxy_activate (Proxy_Socket);
 
 extern int proxy_http_negotiate (Proxy_Socket, int);
 extern int proxy_telnet_negotiate (Proxy_Socket, int);
-extern int proxy_socks_negotiate (Proxy_Socket, int);
+extern int proxy_socks4_negotiate (Proxy_Socket, int);
+extern int proxy_socks5_negotiate (Proxy_Socket, int);
 
 #endif