diff options
| author | Michael Biebl <biebl@debian.org> | 2020-08-19 10:14:39 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2020-08-19 10:14:39 +0200 |
| commit | c61fd724fffbf1225fdd233a8e450d9a1ddcc849 (patch) | |
| tree | 43e0feb9d3cf8842022ed94b164324c0603855fc /src/nm-ip4-config.h | |
| parent | f86436e83639986f20fb44663edcccf36c3c150c (diff) | |
| parent | e7b44ef4c80907346ec7492a09c45277459924fc (diff) | |
Update upstream source from tag 'upstream/1.26.2'
Update to upstream version '1.26.2' with Debian dir ba5e61f5f737f4e42f743638f9a83bd5cd708a3c
Diffstat (limited to 'src/nm-ip4-config.h')
| -rw-r--r-- | src/nm-ip4-config.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/nm-ip4-config.h b/src/nm-ip4-config.h index d4694d93..ea061749 100644 --- a/src/nm-ip4-config.h +++ b/src/nm-ip4-config.h @@ -83,7 +83,8 @@ nm_ip_config_best_default_route_is (const NMPObject *obj) * Note that this only considers the main routing table. */ return r && NM_PLATFORM_IP_ROUTE_IS_DEFAULT (r) - && nm_platform_route_table_is_main (r->table_coerced); + && nm_platform_route_table_is_main (r->table_coerced) + && r->type_coerced == nm_platform_route_type_coerce (1 /*RTN_UNICAST*/); } const NMPObject *_nm_ip_config_best_default_route_find_better (const NMPObject *obj_cur, const NMPObject *obj_cmp); @@ -157,9 +158,10 @@ NMDedupMultiIndex *nm_ip4_config_get_multi_idx (const NMIP4Config *self); NMIP4Config *nm_ip4_config_capture (NMDedupMultiIndex *multi_idx, NMPlatform *platform, int ifindex); void nm_ip4_config_add_dependent_routes (NMIP4Config *self, - guint32 route_table, - guint32 route_metric, - GPtrArray **out_ip4_dev_route_blacklist); + guint32 route_table, + guint32 route_metric, + gboolean is_vrf, + GPtrArray ** out_ip4_dev_route_blacklist); gboolean nm_ip4_config_commit (const NMIP4Config *self, NMPlatform *platform, |