From 558bcd5aae51330cd7ec778b9d973f5fc1657ec1 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 13 Sep 2022 20:18:35 +0200 Subject: [PATCH] firewall/trivial: rename nm_firewall_config_apply() to nm_firewall_config_apply_sync() Sync/blocking methods are ugly. Their name should highlight this. Also, we may have an async variant, so we will need the "good" name for apply() and apply_finish(). (cherry picked from commit dc66fb7d04514166c890737a5396f6cc1faa470d) --- src/core/devices/nm-device.c | 4 ++-- src/core/nm-firewall-utils.c | 4 +++- src/core/nm-firewall-utils.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index 921eb10ecd..08b7c01ac1 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -12210,7 +12210,7 @@ _dev_ipsharedx_cleanup(NMDevice *self, int addr_family) } if (priv->ipshared_data_4.v4.firewall_config) { - nm_firewall_config_apply(priv->ipshared_data_4.v4.firewall_config, FALSE); + nm_firewall_config_apply_sync(priv->ipshared_data_4.v4.firewall_config, FALSE); nm_clear_pointer(&priv->ipshared_data_4.v4.firewall_config, nm_firewall_config_free); } @@ -12358,7 +12358,7 @@ _dev_ipshared4_start(NMDevice *self) priv->ipshared_data_4.v4.firewall_config = nm_firewall_config_new_shared(ip_iface, ip4_addr.address, ip4_addr.plen); - nm_firewall_config_apply(priv->ipshared_data_4.v4.firewall_config, TRUE); + nm_firewall_config_apply_sync(priv->ipshared_data_4.v4.firewall_config, TRUE); priv->ipshared_data_4.v4.l3cd = nm_l3_config_data_ref(l3cd); _dev_l3_register_l3cds_set_one(self, L3_CONFIG_DATA_TYPE_SHARED_4, l3cd, FALSE); diff --git a/src/core/nm-firewall-utils.c b/src/core/nm-firewall-utils.c index 2ea53bd5ec..65aacb1feb 100644 --- a/src/core/nm-firewall-utils.c +++ b/src/core/nm-firewall-utils.c @@ -717,8 +717,10 @@ nm_firewall_config_free(NMFirewallConfig *self) nm_g_slice_free(self); } +/*****************************************************************************/ + void -nm_firewall_config_apply(NMFirewallConfig *self, gboolean up) +nm_firewall_config_apply_sync(NMFirewallConfig *self, gboolean up) { switch (nm_firewall_utils_get_backend()) { case NM_FIREWALL_BACKEND_IPTABLES: diff --git a/src/core/nm-firewall-utils.h b/src/core/nm-firewall-utils.h index 16fe7bd6c6..95fda89008 100644 --- a/src/core/nm-firewall-utils.h +++ b/src/core/nm-firewall-utils.h @@ -24,6 +24,6 @@ NMFirewallConfig *nm_firewall_config_new_shared(const char *ip_iface, in_addr_t void nm_firewall_config_free(NMFirewallConfig *self); -void nm_firewall_config_apply(NMFirewallConfig *self, gboolean up); +void nm_firewall_config_apply_sync(NMFirewallConfig *self, gboolean up); #endif /* __NM_FIREWALL_UTILS_H__ */