From: Florian Westphal Date: Sat, 12 Dec 2020 15:15:33 +0000 (+0100) Subject: xtables-monitor: fix packet family protocol X-Git-Tag: v1.8.7~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=946923b640afc2249cf98743ff60a97291108701;p=thirdparty%2Fiptables.git xtables-monitor: fix packet family protocol This prints the family passed on the command line (which might be 0). Print the table family instead. Signed-off-by: Florian Westphal --- diff --git a/iptables/xtables-monitor.c b/iptables/xtables-monitor.c index 364e600e..8850a120 100644 --- a/iptables/xtables-monitor.c +++ b/iptables/xtables-monitor.c @@ -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);