cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1309?usp=email )
Change subject: mroute: Remove unused mask argument of mroute_get_in* ...................................................................... mroute: Remove unused mask argument of mroute_get_in* These are obsolete since the removal of pf feature. Avoids spurious conversion warnings. Change-Id: I501bf780957a9c685eed5994a15de09c28efc3f0 Signed-off-by: Frank Lichtenheld <[email protected]> Acked-by: Gert Doering <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1309 Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg33939.html Signed-off-by: Gert Doering <[email protected]> --- M src/openvpn/mroute.c 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/src/openvpn/mroute.c b/src/openvpn/mroute.c index 88ea647..b50d48f 100644 --- a/src/openvpn/mroute.c +++ b/src/openvpn/mroute.c @@ -103,17 +103,12 @@ return true; } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" -#endif - static inline void -mroute_get_in_addr_t(struct mroute_addr *ma, const in_addr_t src, unsigned int mask) +mroute_get_in_addr_t(struct mroute_addr *ma, const in_addr_t src) { if (ma) { - ma->type = MR_ADDR_IPV4 | mask; + ma->type = MR_ADDR_IPV4; ma->netbits = 0; ma->len = 4; ma->v4.addr = src; @@ -121,11 +116,11 @@ } static inline void -mroute_get_in6_addr(struct mroute_addr *ma, const struct in6_addr src, unsigned int mask) +mroute_get_in6_addr(struct mroute_addr *ma, const struct in6_addr src) { if (ma) { - ma->type = MR_ADDR_IPV6 | mask; + ma->type = MR_ADDR_IPV6; ma->netbits = 0; ma->len = 16; ma->v6.addr = src; @@ -161,8 +156,8 @@ { const struct openvpn_iphdr *ip = (const struct openvpn_iphdr *)BPTR(buf); - mroute_get_in_addr_t(src, ip->saddr, 0); - mroute_get_in_addr_t(dest, ip->daddr, 0); + mroute_get_in_addr_t(src, ip->saddr); + mroute_get_in_addr_t(dest, ip->daddr); /* multicast packet? */ if (mroute_is_mcast(ip->daddr)) @@ -192,8 +187,8 @@ gc_free(&gc); #endif - mroute_get_in6_addr(src, ipv6->saddr, 0); - mroute_get_in6_addr(dest, ipv6->daddr, 0); + mroute_get_in6_addr(src, ipv6->saddr); + mroute_get_in6_addr(dest, ipv6->daddr); if (mroute_is_mcast_ipv6(ipv6->daddr)) { @@ -342,7 +337,7 @@ } else { - ma->v6.addr.s6_addr[byte--] &= (IPV4_NETMASK_HOST << bits_to_clear); + ma->v6.addr.s6_addr[byte--] &= (0xFF << bits_to_clear); bits_to_clear = 0; } } @@ -552,10 +547,6 @@ } } -#if defined(__GNUC__) || defined(__clang__) -#pragma GCC diagnostic pop -#endif - void mroute_helper_free(struct mroute_helper *mh) { -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1309?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I501bf780957a9c685eed5994a15de09c28efc3f0 Gerrit-Change-Number: 1309 Gerrit-PatchSet: 3 Gerrit-Owner: flichtenheld <[email protected]> Gerrit-Reviewer: cron2 <[email protected]> Gerrit-Reviewer: plaisthos <[email protected]> Gerrit-CC: openvpn-devel <[email protected]>
_______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
