From e8f2d8f2e508a6cce7640a5dcbab9f6ef24b887b Mon Sep 17 00:00:00 2001 From: Daniel Harding Date: Tue, 27 Oct 2020 09:27:01 +0300 Subject: ipsets: allow blank/commented lines with loadfile When loading ipset files using the loadfile option, skip blank lines and lines that start with '#' (disregarding any leading whitespace). Signed-off-by: Daniel Harding --- ipsets.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ipsets.c b/ipsets.c index 280845b..ba31e64 100644 --- a/ipsets.c +++ b/ipsets.c @@ -16,6 +16,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include + #include "ipsets.h" @@ -337,6 +339,7 @@ load_file(struct fw3_ipset *ipset) { FILE *f; char line[128]; + char *p; if (!ipset->loadfile) return; @@ -350,8 +353,13 @@ load_file(struct fw3_ipset *ipset) return; } - while (fgets(line, sizeof(line), f)) - fw3_pr("add %s %s", ipset->name, line); + while (fgets(line, sizeof(line), f)) { + p = line; + while (isspace(*p)) + p++; + if (*p && *p != '#') + fw3_pr("add %s %s", ipset->name, line); + } fclose(f); } -- cgit v1.2.1