[src/trunk]: src/usr.sbin/npf/npfctl npfctl: implement table replace subcommand.

[rmind <rmind%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/44e45acf1b1d
branches:  trunk
changeset: 454849:44e45acf1b1d
user:      rmind <rmind%NetBSD.org@localhost>
date:      Sun Sep 29 18:51:08 2019 +0000

description:
npfctl: implement table replace subcommand.
Contributed by Timshel Knoll-Miller.

(missed a file in previous commit; cvs is so helpful..)

diffstat:

 usr.sbin/npf/npfctl/npf_build.c |  58 +++++++++++++++++++++++++++-------------
 1 files changed, 39 insertions(+), 19 deletions(-)

diffs (115 lines):

diff -r 58286e7ba68b -r 44e45acf1b1d usr.sbin/npf/npfctl/npf_build.c
--- a/usr.sbin/npf/npfctl/npf_build.c   Sun Sep 29 17:00:29 2019 +0000
+++ b/usr.sbin/npf/npfctl/npf_build.c   Sun Sep 29 18:51:08 2019 +0000
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: npf_build.c,v 1.51 2019/08/08 21:29:15 rmind Exp $");
+__RCSID("$NetBSD: npf_build.c,v 1.52 2019/09/29 18:51:08 rmind Exp $");
 
 #include <sys/types.h>
 #define        __FAVOR_BSD
@@ -151,25 +151,32 @@
        return 0;
 }
 
-unsigned
-npfctl_table_getid(const char *name)
+nl_table_t *
+npfctl_table_getbyname(nl_config_t *ncf, const char *name)
 {
-       unsigned tid = (unsigned)-1;
        nl_iter_t i = NPF_ITER_BEGIN;
        nl_table_t *tl;
 
        /* XXX dynamic ruleset */
-       if (!npf_conf) {
-               return (unsigned)-1;
+       if (!ncf) {
+               return NULL;
        }
-       while ((tl = npf_table_iterate(npf_conf, &i)) != NULL) {
+       while ((tl = npf_table_iterate(ncf, &i)) != NULL) {
                const char *tname = npf_table_getname(tl);
                if (strcmp(tname, name) == 0) {
-                       tid = npf_table_getid(tl);
                        break;
                }
        }
-       return tid;
+       return tl;
+}
+
+unsigned
+npfctl_table_getid(const char *name)
+{
+       nl_table_t *tl;
+
+       tl = npfctl_table_getbyname(npf_conf, name);
+       return tl ? npf_table_getid(tl) : (unsigned)-1;
 }
 
 const char *
@@ -873,15 +880,13 @@
  * npfctl_fill_table: fill NPF table with entries from a specified file.
  */
 static void
-npfctl_fill_table(nl_table_t *tl, u_int type, const char *fname)
+npfctl_fill_table(nl_table_t *tl, u_int type, const char *fname, FILE *fp)
 {
        char *buf = NULL;
        int l = 0;
-       FILE *fp;
        size_t n;
 
-       fp = fopen(fname, "r");
-       if (fp == NULL) {
+       if (fp == NULL && (fp = fopen(fname, "r")) == NULL) {
                err(EXIT_FAILURE, "open '%s'", fname);
        }
        while (l++, getline(&buf, &n, fp) != -1) {
@@ -908,6 +913,23 @@
 }
 
 /*
+ * npfctl_load_table: create an NPF table and fill with contents from a file.
+ */
+nl_table_t *
+npfctl_load_table(const char *tname, int tid, u_int type,
+    const char *fname, FILE *fp)
+{
+       nl_table_t *tl;
+
+       tl = npf_table_create(tname, tid, type);
+       if (tl && fname) {
+               npfctl_fill_table(tl, type, fname, fp);
+       }
+
+       return tl;
+}
+
+/*
  * npfctl_build_table: create an NPF table, add to the configuration and,
  * if required, fill with contents from a file.
  */
@@ -916,15 +938,13 @@
 {
        nl_table_t *tl;
 
-       tl = npf_table_create(tname, npfctl_tid_counter++, type);
-       assert(tl != NULL);
-
-       if (fname) {
-               npfctl_fill_table(tl, type, fname);
-       } else if (type == NPF_TABLE_CONST) {
+       if (type == NPF_TABLE_CONST && !fname) {
                yyerror("table type 'const' must be loaded from a file");
        }
 
+       tl = npfctl_load_table(tname, npfctl_tid_counter++, type, fname, NULL);
+       assert(tl != NULL);
+
        if (npf_table_insert(npf_conf, tl)) {
                yyerror("table '%s' is already defined", tname);
        }