colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform: ignore routes with non-zero TOS

Browse Source 
The identifying properties of a route are (in libnl)

    .o_id_attrs = (ROUTE_ATTR_FAMILY | ROUTE_ATTR_TOS |
                   ROUTE_ATTR_TABLE | ROUTE_ATTR_DST |
                   ROUTE_ATTR_PRIO),

NM ignores routes other then in table RT_TABLE_MAIN and considers
only the tuple 'family,network/plen,metric' as identifying for a route.

We must also ignore routes with TOS non-zero as we cannot
handle those, i.e. we cannot distinguish between them.
This commit is contained in:
Thomas Haller
2015-04-28 12:54:23 +02:00
parent 0ea1fb4e5e
commit af2c0ef771
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/platform/nm-linux-platform.c
View File

@@ -3863,6 +3863,7 @@ _route_match (struct rtnl_route *rtnlroute, int family, int ifindex, gboolean in
if (rtnl_route_get_type (rtnlroute) != RTN_UNICAST || if (rtnl_route_get_type (rtnlroute) != RTN_UNICAST ||
rtnl_route_get_table (rtnlroute) != RT_TABLE_MAIN || rtnl_route_get_table (rtnlroute) != RT_TABLE_MAIN ||
rtnl_route_get_tos (rtnlroute) != 0 ||
(!include_proto_kernel && rtnl_route_get_protocol (rtnlroute) == RTPROT_KERNEL) || (!include_proto_kernel && rtnl_route_get_protocol (rtnlroute) == RTPROT_KERNEL) ||
rtnl_route_get_family (rtnlroute) != family || rtnl_route_get_family (rtnlroute) != family ||
rtnl_route_get_nnexthops (rtnlroute) != 1 || rtnl_route_get_nnexthops (rtnlroute) != 1 ||
@@ -4130,8 +4131,8 @@ ip4_route_delete (NMPlatform *platform, int ifindex, in_addr_t network, int plen
} }
rtnl_route_set_scope ((struct rtnl_route *) route, scope); rtnl_route_set_scope ((struct rtnl_route *) route, scope);
if (cached_object) /* we only support routes with TOS zero. As such, delete_route() is also only able to delete
rtnl_route_set_tos ((struct rtnl_route *) route, rtnl_route_get_tos (cached_object)); * routes with tos==0. build_rtnl_route() already initializes tos properly. */
/* The following fields are also relevant when comparing the route, but the default values /* The following fields are also relevant when comparing the route, but the default values
* are already as we want them: * are already as we want them: