diff options
| author | Thomas Haller <thaller@redhat.com> | 2022-09-15 09:06:58 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2022-09-29 15:23:01 +0200 |
| commit | ff0440539160eca3aa42732c0444e659288218c4 (patch) | |
| tree | 21be6b53c4aaaa127b982d538c008cadb7f6a9d0 | |
| parent | 4ac934cbe4d71efe68e5df46844877677f22c45e (diff) | |
| download | NetworkManager-ff0440539160eca3aa42732c0444e659288218c4.tar.gz | |
firewall: move logging stdin argument to nft call
(cherry picked from commit b74e2cbfaa3eb93765b431612a10d95cb4b04104)
(cherry picked from commit 8139b2758461146182a2e5e99e2785d4d76b4771)
| -rw-r--r-- | src/core/nm-firewall-utils.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/nm-firewall-utils.c b/src/core/nm-firewall-utils.c index 4ada350cd9..3752928d94 100644 --- a/src/core/nm-firewall-utils.c +++ b/src/core/nm-firewall-utils.c @@ -497,6 +497,7 @@ nm_firewall_nft_call(GBytes *stdin_buf, gs_unref_object GSubprocessLauncher *subprocess_launcher = NULL; gs_free_error GError *error = NULL; FwNftCallData *call_data; + gs_free char *ss1 = NULL; call_data = g_slice_new(FwNftCallData); *call_data = (FwNftCallData){ @@ -506,6 +507,12 @@ nm_firewall_nft_call(GBytes *stdin_buf, .timeout_source = NULL, }; + nm_log_trace(LOGD_SHARING, + "firewall: nft: call command: [ '%s' ]", + nm_utils_buf_utf8safe_escape_bytes(stdin_buf, + NM_UTILS_STR_UTF8_SAFE_FLAG_ESCAPE_CTRL, + &ss1)); + if (cancellable) { call_data->cancellable_id = g_cancellable_connect(cancellable, G_CALLBACK(_fw_nft_call_cancelled_cb), @@ -608,7 +615,6 @@ _fw_nft_set_shared_construct(gboolean up, const char *ip_iface, in_addr_t addr, { nm_auto_str_buf NMStrBuf strbuf = NM_STR_BUF_INIT(NM_UTILS_GET_NEXT_REALLOC_SIZE_1000, FALSE); gs_free char *table_name = NULL; - gs_free char *ss1 = NULL; char str_subnet[_SHARE_IPTABLES_SUBNET_TO_STR_LEN]; table_name = _share_iptables_get_name(FALSE, "nm-shared", ip_iface); @@ -674,12 +680,6 @@ _fw_nft_set_shared_construct(gboolean up, const char *ip_iface, in_addr_t addr, ip_iface); } - nm_log_trace(LOGD_SHARING, - "firewall: nft command: [ %s ]", - nm_utils_str_utf8safe_escape(nm_str_buf_get_str(&strbuf), - NM_UTILS_STR_UTF8_SAFE_FLAG_ESCAPE_CTRL, - &ss1)); - return nm_str_buf_finalize_to_gbytes(&strbuf); } |