diff options
| author | Thomas Haller <thaller@redhat.com> | 2022-09-13 19:24:50 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2022-09-29 15:22:59 +0200 |
| commit | a5fdaec77467684cd3a865865ddcce8c6de7ec29 (patch) | |
| tree | 5272204876f0162547dca35de08471c77bd70601 | |
| parent | 4dfe52762c44f08010c2578e962cdc673551e19a (diff) | |
| download | NetworkManager-a5fdaec77467684cd3a865865ddcce8c6de7ec29.tar.gz | |
firewall/trivial: rename nm_firewall_config_new() to nm_firewall_config_new_shared()
(cherry picked from commit 7ad3fb195608bb868e8ece1aefce0773a7d12e79)
(cherry picked from commit bfb4452f7d785fec280161cb6c7b1eb2be9ef45a)
| -rw-r--r-- | src/core/devices/nm-device.c | 2 | ||||
| -rw-r--r-- | src/core/nm-firewall-utils.c | 6 | ||||
| -rw-r--r-- | src/core/nm-firewall-utils.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index 99fa33f602..5e8286050e 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -12124,7 +12124,7 @@ _dev_ipshared4_start(NMDevice *self) goto out_fail; priv->ipshared_data_4.v4.firewall_config = - nm_firewall_config_new(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); priv->ipshared_data_4.v4.l3cd = nm_l3_config_data_ref(l3cd); diff --git a/src/core/nm-firewall-utils.c b/src/core/nm-firewall-utils.c index 1a9ca465be..fa14350c22 100644 --- a/src/core/nm-firewall-utils.c +++ b/src/core/nm-firewall-utils.c @@ -599,7 +599,7 @@ _fw_nft_call_sync(GBytes *stdin_buf, GError **error) /*****************************************************************************/ static void -_fw_nft_set(gboolean up, const char *ip_iface, in_addr_t addr, guint8 plen) +_fw_nft_set_shared(gboolean up, const char *ip_iface, in_addr_t addr, guint8 plen) { nm_auto_str_buf NMStrBuf strbuf = NM_STR_BUF_INIT(NM_UTILS_GET_NEXT_REALLOC_SIZE_1000, FALSE); gs_unref_bytes GBytes *stdin_buf = NULL; @@ -692,7 +692,7 @@ struct _NMFirewallConfig { }; NMFirewallConfig * -nm_firewall_config_new(const char *ip_iface, in_addr_t addr, guint8 plen) +nm_firewall_config_new_shared(const char *ip_iface, in_addr_t addr, guint8 plen) { NMFirewallConfig *self; @@ -728,7 +728,7 @@ nm_firewall_config_apply(NMFirewallConfig *self, gboolean up) _share_iptables_set_shared(up, self->ip_iface, self->addr, self->plen); break; case NM_FIREWALL_BACKEND_NFTABLES: - _fw_nft_set(up, self->ip_iface, self->addr, self->plen); + _fw_nft_set_shared(up, self->ip_iface, self->addr, self->plen); break; case NM_FIREWALL_BACKEND_NONE: break; diff --git a/src/core/nm-firewall-utils.h b/src/core/nm-firewall-utils.h index 7ef5222751..16fe7bd6c6 100644 --- a/src/core/nm-firewall-utils.h +++ b/src/core/nm-firewall-utils.h @@ -20,7 +20,7 @@ NMFirewallBackend nm_firewall_utils_get_backend(void); typedef struct _NMFirewallConfig NMFirewallConfig; -NMFirewallConfig *nm_firewall_config_new(const char *ip_iface, in_addr_t addr, guint8 plen); +NMFirewallConfig *nm_firewall_config_new_shared(const char *ip_iface, in_addr_t addr, guint8 plen); void nm_firewall_config_free(NMFirewallConfig *self); |