]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
monitor: Don't print newgen message with JSON output
authorPhil Sutter <phil@nwl.cc>
Wed, 17 Feb 2021 11:38:42 +0000 (12:38 +0100)
committerPhil Sutter <phil@nwl.cc>
Wed, 17 Feb 2021 13:09:14 +0000 (14:09 +0100)
Iff this should be printed, it must adhere to output format settings. In
its current form it breaks JSON syntax, so skip it for non-default
output formats.

Fixes: cb7e02f44d6a6 ("src: enable json echo output when reading native syntax")
Signed-off-by: Phil Sutter <phil@nwl.cc>
src/monitor.c

index af2998d4272b28348d357261656e00d5b84b2b84..047d89db933a4c8bc41e3f614af7b2a7fc12f90d 100644 (file)
@@ -842,6 +842,9 @@ static int netlink_events_newgen_cb(const struct nlmsghdr *nlh, int type,
        char name[256] = "";
        int genid = -1, pid = -1;
 
+       if (monh->format != NFTNL_OUTPUT_DEFAULT)
+               return MNL_CB_OK;
+
        mnl_attr_for_each(attr, nlh, sizeof(struct nfgenmsg)) {
                switch (mnl_attr_get_type(attr)) {
                case NFTA_GEN_ID: