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, 9 insertions, 4 deletions

diff --git a/socks.c b/socks.c
index 79e1170..838758d 100644
--- a/socks.c
+++ b/socks.c
@@ -51,11 +51,10 @@ socks_adjust_frame_parameters (struct frame *frame, int proto)
 }
 
 struct socks_proxy_info *
-new_socks_proxy (const char *server,
+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)
 {
   struct socks_proxy_info *p;
 
@@ -71,7 +70,7 @@ new_socks_proxy (const char *server,
 	}
     }
 
-  ALLOC_OBJ_CLEAR_GC (p, struct socks_proxy_info, gc);
+  ALLOC_OBJ_CLEAR (p, struct socks_proxy_info);
 
   ASSERT (server);
   ASSERT (legal_ipv4_port (port));
@@ -84,6 +83,12 @@ new_socks_proxy (const char *server,
   return p;
 }
 
+void
+socks_proxy_close (struct socks_proxy_info *sp)
+{
+  free (sp);
+}
+
 static bool
 socks_handshake (socket_descriptor_t sd, volatile int *signal_received)
 {