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

firewall/trivial: rename nm_firewall_config_apply() to nm_firewall_config_apply_sync()

Browse source 
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 dc66fb7d04)
This commit is contained in:
Thomas Haller 2022-09-13 20:18:35 +02:00
parent bbf3d01e82
commit 558bcd5aae
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/devices/nm-device.c
View file

@ -12210,7 +12210,7 @@ _dev_ipsharedx_cleanup(NMDevice *self, int addr_family)
} }
if (priv->ipshared_data_4.v4.firewall_config) { 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); 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 = priv->ipshared_data_4.v4.firewall_config =
nm_firewall_config_new_shared(ip_iface, ip4_addr.address, ip4_addr.plen); 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); 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); _dev_l3_register_l3cds_set_one(self, L3_CONFIG_DATA_TYPE_SHARED_4, l3cd, FALSE);

4
src/core/nm-firewall-utils.c
View file

@ -717,8 +717,10 @@ nm_firewall_config_free(NMFirewallConfig *self)
nm_g_slice_free(self); nm_g_slice_free(self);
} }
/*****************************************************************************/
void void
nm_firewall_config_apply(NMFirewallConfig *self, gboolean up) nm_firewall_config_apply_sync(NMFirewallConfig *self, gboolean up)
{ {
switch (nm_firewall_utils_get_backend()) { switch (nm_firewall_utils_get_backend()) {
case NM_FIREWALL_BACKEND_IPTABLES: case NM_FIREWALL_BACKEND_IPTABLES:

2
src/core/nm-firewall-utils.h
View file

@ -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_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__ */ #endif /* __NM_FIREWALL_UTILS_H__ */