From 779cf25606490ef0335bca5cbb355e63ca575c99 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Mon, 20 Feb 2023 17:39:29 +0100 Subject: [PATCH] platform: introduce function to globally track local route rule The new function tracks local route rule in the GlobalTracker properly. It also allow the developer to specify the untrack user tag. (cherry picked from commit 79611e4fcc0c06fd12f7a13ff6fdcb0abc36616e) --- src/libnm-platform/nmp-global-tracker.c | 63 ++++++++++++++++--------- src/libnm-platform/nmp-global-tracker.h | 6 +++ 2 files changed, 47 insertions(+), 22 deletions(-) diff --git a/src/libnm-platform/nmp-global-tracker.c b/src/libnm-platform/nmp-global-tracker.c index 09f1e21711..122ba0ea7f 100644 --- a/src/libnm-platform/nmp-global-tracker.c +++ b/src/libnm-platform/nmp-global-tracker.c @@ -1155,17 +1155,7 @@ nmp_global_tracker_track_rule_default(NMPGlobalTracker *self, /* track the default rules. See also `man ip-rule`. */ if (NM_IN_SET(addr_family, AF_UNSPEC, AF_INET)) { - nmp_global_tracker_track_rule(self, - &((NMPlatformRoutingRule){ - .addr_family = AF_INET, - .priority = 0, - .table = RT_TABLE_LOCAL, - .action = FR_ACT_TO_TBL, - .protocol = RTPROT_KERNEL, - }), - track_priority, - user_tag, - NULL); + nmp_global_tracker_track_local_rule(self, addr_family, track_priority, user_tag, NULL); nmp_global_tracker_track_rule(self, &((NMPlatformRoutingRule){ .addr_family = AF_INET, @@ -1190,17 +1180,7 @@ nmp_global_tracker_track_rule_default(NMPGlobalTracker *self, NULL); } if (NM_IN_SET(addr_family, AF_UNSPEC, AF_INET6)) { - nmp_global_tracker_track_rule(self, - &((NMPlatformRoutingRule){ - .addr_family = AF_INET6, - .priority = 0, - .table = RT_TABLE_LOCAL, - .action = FR_ACT_TO_TBL, - .protocol = RTPROT_KERNEL, - }), - track_priority, - user_tag, - NULL); + nmp_global_tracker_track_local_rule(self, addr_family, track_priority, user_tag, NULL); nmp_global_tracker_track_rule(self, &((NMPlatformRoutingRule){ .addr_family = AF_INET6, @@ -1215,6 +1195,45 @@ nmp_global_tracker_track_rule_default(NMPGlobalTracker *self, } } +void +nmp_global_tracker_track_local_rule(NMPGlobalTracker *self, + int addr_family, + gint32 track_priority, + gconstpointer user_tag, + gconstpointer user_tag_untrack) +{ + g_return_if_fail(NMP_IS_GLOBAL_TRACKER(self)); + + nm_assert(NM_IN_SET(addr_family, AF_UNSPEC, AF_INET, AF_INET6)); + + if (NM_IN_SET(addr_family, AF_UNSPEC, AF_INET)) { + nmp_global_tracker_track_rule(self, + &((NMPlatformRoutingRule){ + .addr_family = AF_INET, + .priority = 0, + .table = RT_TABLE_LOCAL, + .action = FR_ACT_TO_TBL, + .protocol = RTPROT_KERNEL, + }), + track_priority, + user_tag, + user_tag_untrack); + } + if (NM_IN_SET(addr_family, AF_UNSPEC, AF_INET6)) { + nmp_global_tracker_track_rule(self, + &((NMPlatformRoutingRule){ + .addr_family = AF_INET6, + .priority = 0, + .table = RT_TABLE_LOCAL, + .action = FR_ACT_TO_TBL, + .protocol = RTPROT_KERNEL, + }), + track_priority, + user_tag, + user_tag_untrack); + } +} + /*****************************************************************************/ NMPGlobalTracker * diff --git a/src/libnm-platform/nmp-global-tracker.h b/src/libnm-platform/nmp-global-tracker.h index 08a4d85f41..c6d7bc11d0 100644 --- a/src/libnm-platform/nmp-global-tracker.h +++ b/src/libnm-platform/nmp-global-tracker.h @@ -46,6 +46,12 @@ void nmp_global_tracker_track_rule_default(NMPGlobalTracker *self, gint32 track_priority, gconstpointer user_tag); +void nmp_global_tracker_track_local_rule(NMPGlobalTracker *self, + int addr_family, + gint32 track_priority, + gconstpointer user_tag, + gconstpointer user_tag_untrack); + void nmp_global_tracker_track_rule_from_platform(NMPGlobalTracker *self, NMPlatform *platform, int addr_family,