fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-02 05:20:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform: add delayed_action_schedule_refresh_all() helper and avoid refreshing tc cache

Browse source 
If nm_platform_get_cache_tc() is disabled, there is no need to refresh
it. Filter those flags out.

Also, don't duplicate the code and add a helper function
delayed_action_schedule_refresh_all().
This commit is contained in:
Thomas Haller 2022-07-07 14:52:38 +02:00
parent a27e9b21cf
commit 8d42b5c52a
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/libnm-platform/nm-linux-platform.c
View file

@ -6317,6 +6317,24 @@ delayed_action_schedule(NMPlatform *platform, DelayedActionType action_type, gpo
}
}
static void
delayed_action_schedule_refresh_all(NMPlatform *platform)
{
DelayedActionType action_type;
action_type =
DELAYED_ACTION_TYPE_REFRESH_ALL_LINKS | DELAYED_ACTION_TYPE_REFRESH_ALL_IP4_ADDRESSES
| DELAYED_ACTION_TYPE_REFRESH_ALL_IP6_ADDRESSES | DELAYED_ACTION_TYPE_REFRESH_ALL_IP4_ROUTES
| DELAYED_ACTION_TYPE_REFRESH_ALL_IP6_ROUTES
| DELAYED_ACTION_TYPE_REFRESH_ALL_ROUTING_RULES_ALL;
if (nm_platform_get_cache_tc(platform)) {
action_type |=
(DELAYED_ACTION_TYPE_REFRESH_ALL_QDISCS | DELAYED_ACTION_TYPE_REFRESH_ALL_TFILTERS);
}
delayed_action_schedule(platform, action_type, NULL);
}
static void
delayed_action_schedule_WAIT_FOR_NL_RESPONSE(NMPlatform *platform,
guint32 seq_number,
@ -6476,8 +6494,10 @@ cache_on_change(NMPlatform *platform,
| DELAYED_ACTION_TYPE_REFRESH_ALL_IP4_ROUTES
| DELAYED_ACTION_TYPE_REFRESH_ALL_IP6_ROUTES
| DELAYED_ACTION_TYPE_REFRESH_ALL_ROUTING_RULES_ALL
| DELAYED_ACTION_TYPE_REFRESH_ALL_QDISCS
| DELAYED_ACTION_TYPE_REFRESH_ALL_TFILTERS,
| (nm_platform_get_cache_tc(platform)
? (DELAYED_ACTION_TYPE_REFRESH_ALL_QDISCS
| DELAYED_ACTION_TYPE_REFRESH_ALL_TFILTERS)
: DELAYED_ACTION_TYPE_NONE),
NULL);
}
}
@ -9512,17 +9532,7 @@ event_handler_read_netlink(NMPlatform *platform, gboolean wait_for_acks)
delayed_action_wait_for_nl_response_complete_all(
platform,
WAIT_FOR_NL_RESPONSE_RESULT_FAILED_RESYNC);
delayed_action_schedule(platform,
DELAYED_ACTION_TYPE_REFRESH_ALL_LINKS
| DELAYED_ACTION_TYPE_REFRESH_ALL_IP4_ADDRESSES
| DELAYED_ACTION_TYPE_REFRESH_ALL_IP6_ADDRESSES
| DELAYED_ACTION_TYPE_REFRESH_ALL_IP4_ROUTES
| DELAYED_ACTION_TYPE_REFRESH_ALL_IP6_ROUTES
| DELAYED_ACTION_TYPE_REFRESH_ALL_ROUTING_RULES_ALL
| DELAYED_ACTION_TYPE_REFRESH_ALL_QDISCS
| DELAYED_ACTION_TYPE_REFRESH_ALL_TFILTERS,
NULL);
delayed_action_schedule_refresh_all(platform);
break;
default:
_LOGE("netlink: read: failed to retrieve incoming events: %s (%d)",
@ -9818,15 +9828,7 @@ constructed(GObject *_object)
G_OBJECT_CLASS(nm_linux_platform_parent_class)->constructed(_object);
_LOGD("populate platform cache");
delayed_action_schedule(
platform,
DELAYED_ACTION_TYPE_REFRESH_ALL_LINKS | DELAYED_ACTION_TYPE_REFRESH_ALL_IP4_ADDRESSES
| DELAYED_ACTION_TYPE_REFRESH_ALL_IP6_ADDRESSES
| DELAYED_ACTION_TYPE_REFRESH_ALL_IP4_ROUTES
| DELAYED_ACTION_TYPE_REFRESH_ALL_IP6_ROUTES
| DELAYED_ACTION_TYPE_REFRESH_ALL_ROUTING_RULES_ALL
| DELAYED_ACTION_TYPE_REFRESH_ALL_QDISCS | DELAYED_ACTION_TYPE_REFRESH_ALL_TFILTERS,
NULL);
delayed_action_schedule_refresh_all(platform);
delayed_action_handle_all(platform, FALSE);