svn merge -r 618:619 $SO/patches/openvpn-2-0_rc16-mh/openvpn

Merged --multihome patch + aggregated sockflags.
Pre-2.1_beta3


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

1 files changed, 6 insertions, 3 deletions

diff --git a/socks.h b/socks.h
index 12958b8..3d3f067 100644
--- a/socks.h
+++ b/socks.h
@@ -34,6 +34,9 @@
 
 #include "buffer.h"
 
+struct openvpn_sockaddr;
+struct link_socket_actual;
+
 struct socks_proxy_info {
   bool defined;
   bool retry;
@@ -58,14 +61,14 @@ void establish_socks_proxy_passthru (struct socks_proxy_info *p,
 void establish_socks_proxy_udpassoc (struct socks_proxy_info *p,
 				     socket_descriptor_t ctrl_sd, /* already open to proxy */
 				     socket_descriptor_t udp_sd,
-				     struct sockaddr_in *relay_addr,
+				     struct openvpn_sockaddr *relay_addr,
 				     volatile int *signal_received);
 
 void socks_process_incoming_udp (struct buffer *buf,
-				struct sockaddr_in *from);
+				struct link_socket_actual *from);
 
 int socks_process_outgoing_udp (struct buffer *buf,
-				struct sockaddr_in *to);
+				const struct link_socket_actual *to);
 
 #endif
 #endif