[PATCH firewall3 v3] ipsets: allow blank/commented lines with loadfile
Daniel Harding
dharding at living180.net
Tue Oct 27 02:27:01 EDT 2020
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 at living180.net>
---
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 <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);
}
--
2.29.1
More information about the openwrt-devel
mailing list