merge: branch 'protect_vpn'

vpn: Place gateway route to table defined in ipvx.route-table

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2085
This commit is contained in:
Gris Ge 2024-12-17 08:47:49 +00:00
commit c60dd5c9e0

View file

@ -1243,6 +1243,7 @@ _parent_device_l3cd_add_gateway_route(NML3ConfigData *l3cd,
.gateway = parent_gw.addr4,
.rt_source = NM_IP_CONFIG_SOURCE_VPN,
.metric_any = TRUE,
.table_any = TRUE,
};
} else {
route.r6 = (NMPlatformIP6Route) {
@ -1252,6 +1253,7 @@ _parent_device_l3cd_add_gateway_route(NML3ConfigData *l3cd,
.gateway = parent_gw.addr6,
.rt_source = NM_IP_CONFIG_SOURCE_VPN,
.metric_any = TRUE,
.table_any = TRUE,
};
}
nm_l3_config_data_add_route(l3cd, addr_family, NULL, &route.rx);
@ -1268,6 +1270,7 @@ _parent_device_l3cd_add_gateway_route(NML3ConfigData *l3cd,
.plen = 32,
.rt_source = NM_IP_CONFIG_SOURCE_VPN,
.metric_any = TRUE,
.table_any = TRUE,
};
} else {
route.r6 = (NMPlatformIP6Route) {
@ -1275,6 +1278,7 @@ _parent_device_l3cd_add_gateway_route(NML3ConfigData *l3cd,
.plen = 128,
.rt_source = NM_IP_CONFIG_SOURCE_VPN,
.metric_any = TRUE,
.table_any = TRUE,
};
}
nm_l3_config_data_add_route(l3cd, addr_family, NULL, &route.rx);