diff options
| author | Thomas Haller <thaller@redhat.com> | 2022-09-13 20:18:35 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2022-09-29 16:49:15 +0200 |
| commit | abf19e8f8cff018fcb1f90b81077bb0b84957901 (patch) | |
| tree | 6ae9aced455a635b03e5c745a481e117ccd6810e | |
| parent | 730385e68cdb4a14e915d82f14abd5d31f8da1c5 (diff) | |
| download | NetworkManager-abf19e8f8cff018fcb1f90b81077bb0b84957901.tar.gz | |
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)
(cherry picked from commit 558bcd5aae51330cd7ec778b9d973f5fc1657ec1)
(cherry picked from commit 5235dce25960cf8b5e63d16e5369f709ac2da9e4)
| -rw-r--r-- | src/core/devices/nm-device.c | 4 | ||||
| -rw-r--r-- | src/core/nm-firewall-utils.c | 4 | ||||
| -rw-r--r-- | 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 ae081bcb45..b63b4b2df2 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -11969,7 +11969,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); } @@ -12117,7 +12117,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 f89604b0a7..16cbea791e 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__ */ |