diff mbox series

[firewall3,v3] ipsets: allow blank/commented lines with loadfile

Message ID 20201027062701.2627547-1-dharding@living180.net
State Accepted
Headers show
Series [firewall3,v3] ipsets: allow blank/commented lines with loadfile | expand

Commit Message

Daniel Harding Oct. 27, 2020, 6:27 a.m. UTC 
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 <dharding@living180.net>
---
 ipsets.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

Comments

Jo-Philipp Wich Dec. 6, 2020, 1:47 p.m. UTC | #1 
Merged into project/firewall3.git, branch master at
http://git.openwrt.org/?p=project/firewall3.git.

Thank you!
diff mbox series

Patch

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 <ctype.h>
+
 #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);
 }