From 8bc93d7ffbc127e0b095c7274a68eb0c175f93ae Mon Sep 17 00:00:00 2001 From: james Date: Sat, 15 Oct 2005 08:44:02 +0000 Subject: 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 --- multi.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'multi.c') diff --git a/multi.c b/multi.c index 7bccfed..a42c561 100644 --- a/multi.c +++ b/multi.c @@ -982,13 +982,13 @@ multi_learn_in_addr_t (struct multi_context *m, in_addr_t a, int netbits) /* -1 if host route, otherwise # of network bits in address */ { - struct sockaddr_in remote_si; + struct openvpn_sockaddr remote_si; struct mroute_addr addr; CLEAR (remote_si); - remote_si.sin_family = AF_INET; - remote_si.sin_addr.s_addr = htonl (a); - ASSERT (mroute_extract_sockaddr_in (&addr, &remote_si, false)); + remote_si.sa.sin_family = AF_INET; + remote_si.sa.sin_addr.s_addr = htonl (a); + ASSERT (mroute_extract_openvpn_sockaddr (&addr, &remote_si, false)); if (netbits >= 0) { @@ -2180,15 +2180,15 @@ management_callback_kill_by_addr (void *arg, const in_addr_t addr, const int por struct multi_context *m = (struct multi_context *) arg; struct hash_iterator hi; struct hash_element *he; - struct sockaddr_in saddr; + struct openvpn_sockaddr saddr; struct mroute_addr maddr; int count = 0; CLEAR (saddr); - saddr.sin_family = AF_INET; - saddr.sin_addr.s_addr = htonl (addr); - saddr.sin_port = htons (port); - if (mroute_extract_sockaddr_in (&maddr, &saddr, true)) + saddr.sa.sin_family = AF_INET; + saddr.sa.sin_addr.s_addr = htonl (addr); + saddr.sa.sin_port = htons (port); + if (mroute_extract_openvpn_sockaddr (&maddr, &saddr, true)) { hash_iterator_init (m->iter, &hi, true); while ((he = hash_iterator_next (&hi))) -- cgit