Merged connection profiles from

http://svn.openvpn.net/projects/openvpn/test/conn


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@2993 e7ae566f-a301-0410-adde-c780ea21d3b5

1 files changed, 4 insertions, 3 deletions

diff --git a/socks.h b/socks.h
index 506aeb3..c868fbb 100644
--- a/socks.h
+++ b/socks.h
@@ -47,11 +47,12 @@ struct socks_proxy_info {
 
 void socks_adjust_frame_parameters (struct frame *frame, int proto);
 
-struct socks_proxy_info *new_socks_proxy (const char *server,
+struct socks_proxy_info *socks_proxy_new (const char *server,
 					  int port,
 					  bool retry,
-					  struct auto_proxy_info *auto_proxy_info,
-					  struct gc_arena *gc);
+					  struct auto_proxy_info *auto_proxy_info);
+
+void socks_proxy_close (struct socks_proxy_info *sp);
 
 void establish_socks_proxy_passthru (struct socks_proxy_info *p,
 				     socket_descriptor_t sd, /* already open to proxy */