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, 5 insertions, 3 deletions

diff --git a/mroute.h b/mroute.h
index 87e952c..fb7bee7 100644
--- a/mroute.h
+++ b/mroute.h
@@ -94,9 +94,11 @@ unsigned int mroute_extract_addr_from_packet (struct mroute_addr *src,
 					      struct buffer *buf,
 					      int tunnel_type);
 
-bool mroute_extract_sockaddr_in (struct mroute_addr *addr,
-				 const struct sockaddr_in *saddr,
-				 bool use_port);
+struct openvpn_sockaddr;
+
+bool mroute_extract_openvpn_sockaddr (struct mroute_addr *addr,
+				      const struct openvpn_sockaddr *osaddr,
+				      bool use_port);
 
 bool mroute_learnable_address (const struct mroute_addr *addr);