From 01380ebddeab08412be6df8271997e3f9ed0dff1 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Thu, 13 Jun 2024 13:08:36 -0400 Subject: [PATCH] MT#55283 honour userspace fallback ... even in the case of nftables setup failure. Change-Id: I6c5ad81354831c31a120afaecd17d8d4093bd5ea (cherry picked from commit 1a456213de0b47390c883f466ff87d3382e95f0c) (cherry picked from commit ebf47f6d962a223e205795b3496e94fb222cabf8) --- daemon/main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/daemon/main.c b/daemon/main.c index ff254134b..488a29a43 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -1243,8 +1243,12 @@ static void kernel_setup(void) { (nftables_args) {.table = rtpe_config.kernel_table, .append = rtpe_config.nftables_append, .family = rtpe_config.nftables_family}); - if (err) - die("Failed to create nftables chains or rules: %s (%s)", err, strerror(errno)); + if (err) { + if (rtpe_config.no_fallback) + die("Failed to create nftables chains or rules: %s (%s)", err, strerror(errno)); + ilog(LOG_ERR, "FAILED TO CREATE NFTABLES CHAINS OR RULES, KERNEL FORWARDING POSSIBLY WON'T WORK: " + "%s (%s)", err, strerror(errno)); + } #endif if (!kernel_setup_table(rtpe_config.kernel_table) && rtpe_config.no_fallback) die("Userspace fallback disallowed - exiting");