]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
xtables-monitor: fix packet family protocol
authorFlorian Westphal <fw@strlen.de>
Sat, 12 Dec 2020 15:15:33 +0000 (16:15 +0100)
committerFlorian Westphal <fw@strlen.de>
Mon, 14 Dec 2020 15:55:22 +0000 (16:55 +0100)
This prints the family passed on the command line (which might be 0).
Print the table family instead.

Signed-off-by: Florian Westphal <fw@strlen.de>
iptables/xtables-monitor.c

index 364e600e1b38af7df6171f8cc3d215e4acc68680..8850a12032d26d397c932f05a351549ebad69a13 100644 (file)
@@ -273,14 +273,14 @@ static void trace_print_packet(const struct nftnl_trace *nlt, struct cb_arg *arg
        uint32_t mark;
        char name[IFNAMSIZ];
 
-       printf("PACKET: %d %08x ", args->nfproto, nftnl_trace_get_u32(nlt, NFTNL_TRACE_ID));
+       family = nftnl_trace_get_u32(nlt, NFTNL_TRACE_FAMILY);
+       printf("PACKET: %d %08x ", family, nftnl_trace_get_u32(nlt, NFTNL_TRACE_ID));
 
        if (nftnl_trace_is_set(nlt, NFTNL_TRACE_IIF))
                printf("IN=%s ", if_indextoname(nftnl_trace_get_u32(nlt, NFTNL_TRACE_IIF), name));
        if (nftnl_trace_is_set(nlt, NFTNL_TRACE_OIF))
                printf("OUT=%s ", if_indextoname(nftnl_trace_get_u32(nlt, NFTNL_TRACE_OIF), name));
 
-       family = nftnl_trace_get_u32(nlt, NFTNL_TRACE_FAMILY);
        nfproto = family;
        if (nftnl_trace_is_set(nlt, NFTNL_TRACE_NFPROTO)) {
                nfproto = nftnl_trace_get_u32(nlt, NFTNL_TRACE_NFPROTO);