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

firewall: extract helper function _shared_iptables_call() to spawn iptables

Browse source
This commit is contained in:
Thomas Haller 2021-05-05 16:03:42 +02:00
parent 2277c9490a
commit 27e325c6c2
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 36 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
src/core/NetworkManagerUtils.c
View file

@ -1637,6 +1637,40 @@ nm_utils_ip_routes_to_dbus(int addr_family,
/*****************************************************************************/
static void
_share_iptables_call_v(const char *const *argv)
{
gs_free_error GError *error = NULL;
gs_free char * argv_str = NULL;
int status;
nm_log_dbg(LOGD_SHARING, "iptables: %s", (argv_str = g_strjoinv(" ", (char **) argv)));
if (!g_spawn_sync("/",
(char **) argv,
(char **) NM_PTRARRAY_EMPTY(const char *),
G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
NULL,
NULL,
NULL,
NULL,
&status,
&error)) {
nm_log_warn(LOGD_SHARING,
"iptables: error executing command %s: %s",
argv[0],
error->message);
return FALSE;
}
if (!g_spawn_check_exit_status(status, &error)) {
nm_log_warn(LOGD_SHARING, "iptables: command %s failed: %s", argv[0], error->message);
return FALSE;
}
return TRUE;
}
struct _NMUtilsShareRules {
char * ip_iface;
in_addr_t addr;
@ -1870,36 +1904,10 @@ nm_utils_share_rules_apply(NMUtilsShareRules *self, gboolean shared)
i = 0;
for (;;) {
const ShareRule *const rule = &g_array_index(rules, ShareRule, i);
gs_free_error GError *error = NULL;
gs_free char * argv_str = NULL;
int status;
const ShareRule *rule = &g_array_index(rules, ShareRule, i);
nm_log_dbg(LOGD_SHARING,
"Executing: %s",
(argv_str = g_strjoinv(" ", (char **) rule->argv)));
_share_iptables_call_v(rule->argv);
if (!g_spawn_sync("/",
(char **) rule->argv,
(char **) NM_PTRARRAY_EMPTY(const char *),
G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
NULL,
NULL,
NULL,
NULL,
&status,
&error)) {
nm_log_warn(LOGD_SHARING, "Error executing command: %s", error->message);
goto next;
}
if (WEXITSTATUS(status)) {
nm_log_warn(LOGD_SHARING,
"** Command %s returned exit status %d",
rule->argv[0],
WEXITSTATUS(status));
}
next:
if (shared) {
if (i == 0)
break;