DCO: require valid netbits setting for non-primary iroutes.
PATCH 1/1 DCO: require valid netbits setting for non-primary iroutes.
The existing DCO code had extra logic for "if this is not MR_WITH_NETBITS, set 32/128 as address length", but only for iroute addition. For iroute deletion, this was missing, and subsequently iroute deletion for IPv4 host routes failed on FreeBSD DCO (commit 3433577a99).
Iroute handling differenciates between "primary" iroutes (coming from anm IP pool or ccd/ifconfig-push), and "non-primary" iroutes, coming from --iroute and --iroute-ipv6 statements in per-client config.
"Primary" iroutes always use "-1" for their netbits, but since these are not installed via DCO, this is of no concern here. Whether these can and should be changed needs further study on internal route learning and cleanup.
Refactor options.c and multi.c to ensure that netbits is always set for non-primary iroutes - and ASSERT() on this in the DCO path, so we can find out if there might be other code violating this.
Change options.c::option_iroute() to always set netbits=32 for IPv4 host routes (options_iroute_ipv6() never differenciated). Since netmask_to_netbits() also insists on "-1" for host routes, change to netmask_to_netbits2().
Remove all the extra MR_WITH_NETBITS logic from dco.c, where it should have never appeared.
--- src/openvpn/dco.c | 16 ++-------------- src/openvpn/multi.c | 2 ++ src/openvpn/options.c | 6 ++++-- 3 files changed, 8 insertions(+), 16 deletions(-)
src/openvpn/dco.c +2 -14
@@ -603,26 +603,14 @@ dco_install_iroute(struct multi_context *m, struct multi_instance *mi,if (addrtype ==MR_ADDR_IPV6 ) { -int netbits =128 ; -if (addr->type &MR_WITH_NETBITS ) - { - netbits = addr->netbits; - } - -net_route_v6_add (&m->top.net_ctx, &addr->v6.addr, netbits, +net_route_v6_add (&m->top.net_ctx, &addr->v6.addr, addr->netbits, &mi->context.c2.push_ifconfig_ipv6_local, dev,0 ,DCO_IROUTE_METRIC ); }else if (addrtype ==MR_ADDR_IPV4 ) { -int netbits =32 ; -if (addr->type &MR_WITH_NETBITS ) - { - netbits = addr->netbits; - } -in_addr_t dest =htonl (addr->v4.addr); -net_route_v4_add (&m->top.net_ctx, &dest, netbits, +net_route_v4_add (&m->top.net_ctx, &dest, addr->netbits, &mi->context.c2.push_ifconfig_local, dev,0 ,DCO_IROUTE_METRIC ); }
src/openvpn/multi.c +2 -0
@@ -1241,6 +1241,7 @@ multi_learn_in_addr_t(struct multi_context *m,/* "primary" is the VPN ifconfig address of the peer and already * known to DCO, so only install "extra" iroutes (primary = false) */ +ASSERT (netbits>=0 );/* DCO requires populated netbits */ dco_install_iroute (m, mi, &addr); }
@@ -1280,6 +1281,7 @@ multi_learn_in6_addr(struct multi_context *m,/* "primary" is the VPN ifconfig address of the peer and already * known to DCO, so only install "extra" iroutes (primary = false) */ +ASSERT (netbits>=0 );/* DCO requires populated netbits */ dco_install_iroute (m, mi, &addr); }
src/openvpn/options.c +4 -2
@@ -1572,12 +1572,14 @@ option_iroute(struct options *o, ALLOC_OBJ_GC(ir, struct iroute, &o->gc); ir->network =getaddr (GETADDR_HOST_ORDER , network_str,0 ,NULL ,NULL ); - ir->netbits =-1 ; + ir->netbits =32 ;/* host route if no netmask given */ if (netmask_str) {const in_addr_t netmask =getaddr (GETADDR_HOST_ORDER , netmask_str,0 ,NULL ,NULL ); -if (!netmask_to_netbits (ir->network, netmask, &ir->netbits)) + ir->netbits =netmask_to_netbits2 (netmask); + +if (ir->netbits<0 ) { msg(msglevel, "in --iroute %s %s : Bad network/subnet specification", network_str,
Signature · 1 line
2.37.1
Quoted 24 lines · Gert Doering
The existing DCO code had extra logic for "if this is not
MR_WITH_NETBITS, set 32/128 as address length", but only for iroute addition. For iroute deletion, this was missing, and subsequently iroute deletion for IPv4 host routes failed on FreeBSD DCO (commit3433577a99).Iroute handling differenciates between "primary" iroutes (coming from anm IP pool or ccd/ifconfig-push), and "non-primary" iroutes, coming from --iroute and --iroute-ipv6 statements in per-client config.
"Primary" iroutes always use "-1" for their netbits, but since these are not installed via DCO, this is of no concern here. Whether these can and should be changed needs further study on internal route learning and cleanup.
Refactor
options.candmulti.cto ensure that netbits is always set for non-primary iroutes - andASSERT()on this in the DCO path, so we can find out if there might be other code violating this.Change
options.c::option_iroute()to always set netbits=32 for IPv4 host routes (options_iroute_ipv6()never differenciated). Sincenetmask_to_netbits()also insists on "-1" for host routes, change tonetmask_to_netbits2().
Quoted 4 lines
Remove all the extra
MR_WITH_NETBITSlogic fromdco.c, where it should have never appeared.Signed-off-by Gert Doering <[email protected]...>
Seems sane to me. Passes the FreeBSD automated tests. Minor style nitpicks below.
src/openvpn/multi.c multi_learn_in_addr_t(struct multi_context *m, · line 1244
Quoted 9 lines
src/openvpn/multi.c +1
-0@@ -1241,6 +1241,7 @@ multi_learn_in_addr_t(struct multi_context *m,/* "primary" is the VPN ifconfig address of the peer and already * known to DCO, so only install "extra" iroutes (primary = false) */ +ASSERT (netbits>=0 );/* DCO requires populated netbits */
I’d put spaces around the comparison, so ‘ASSERT(netbits >= 0);’. That seems to be what’s done in all conditionals anyway.
Quoted 8 lines
src/openvpn/options.c +0
-0@@ -1572,12 +1572,14 @@ option_iroute(struct options *o, ALLOC_OBJ_GC(ir, struct iroute, &o->gc); ir->network =getaddr (GETADDR_HOST_ORDER , network_str,0 ,NULL ,NULL );
src/openvpn/options.c option_iroute(struct options *o, · line 1582
Quoted 10 lines
src/openvpn/options.c +4
-2- ir->netbits =-1 ; + ir->netbits =32 ;/* host route if no netmask given */ if (netmask_str) {const in_addr_t netmask =getaddr (GETADDR_HOST_ORDER , netmask_str,0 ,NULL ,NULL ); -if (!netmask_to_netbits (ir->network, netmask, &ir->netbits)) + ir->netbits =netmask_to_netbits2 (netmask); + +if (ir->netbits<0 )
And here too. So ‘if (ir->netbits < 0)’
src/openvpn/options.c option_iroute(struct options *o, · line 1585
Quoted 3 lines
src/openvpn/options.c +0
-0{ msg(msglevel, "in --iroute %s %s : Bad network/subnet specification", network_str,
Regards,
Kristof
Hi,
Quoted 24 lines · Gert Doering
The existing DCO code had extra logic for "if this is not
MR_WITH_NETBITS, set 32/128 as address length", but only for iroute addition. For iroute deletion, this was missing, and subsequently iroute deletion for IPv4 host routes failed on FreeBSD DCO (commit3433577a99).Iroute handling differenciates between "primary" iroutes (coming from anm IP pool or ccd/ifconfig-push), and "non-primary" iroutes, coming from --iroute and --iroute-ipv6 statements in per-client config.
"Primary" iroutes always use "-1" for their netbits, but since these are not installed via DCO, this is of no concern here. Whether these can and should be changed needs further study on internal route learning and cleanup.
Refactor
options.candmulti.cto ensure that netbits is always set for non-primary iroutes - andASSERT()on this in the DCO path, so we can find out if there might be other code violating this.Change
options.c::option_iroute()to always set netbits=32 for IPv4 host routes (options_iroute_ipv6()never differenciated). Sincenetmask_to_netbits()also insists on "-1" for host routes, change tonetmask_to_netbits2().
Quoted 4 lines
Remove all the extra
MR_WITH_NETBITSlogic fromdco.c, where it should have never appeared.Signed-off-by Gert Doering <[email protected]...>
Thanks for this. It indeed makes sense and helps cleaning up a bit this netbits madness.
I agree with Kristof that you need to have spaces around boolean operator. (How come that uncrustify did not complain? we may need to add another toggle..)
sitnl does the right thing:
2022-08-24 00:50:50 net_route_v4_add: 8.8.8.8/32 via 10.10.0.3 dev tun0 table 0 metric 100
So, other than the space issue:
Signature · 1 line
Antonio Quartulli
Thanks for the reviewes. Dunno why I thought that "we must have no spaces around operators" :-) - so, fixed that whitespace plus 3 tabs that escaped.
Patch has been applied to the master branch.
commit 104e4ef1e3d49cccb3bc677bab9c24158f91b97b
Author: Gert Doering Date: Sat Aug 20 16:01:24 2022 +0200
DCO: require valid netbits setting for non-primary iroutes.
Signed-off-by: Gert Doering <[email protected]...>
Acked-by: Kristof Provost <[email protected]...>
Acked-by: Antonio Quartulli <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg25044.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering