print_pkt() only read NFULA_PACKET_HDR and NFULA_HWADDR. Extend this to include NFULA_HWTYPE/NFULA_HWLEN/NFULA_HWHEADER and fix up the existing test case to expect the new output. While at it, also print the bridge port, if any, so that future test cases can check for their presence. Signed-off-by: Florian Westphal --- utils/nfulnl_test.c | 26 ++++++++++++++++++++++++++ utils/nfulnl_test.sh | 4 ++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/utils/nfulnl_test.c b/utils/nfulnl_test.c index 840c0bea3a86..b6427957e01b 100644 --- a/utils/nfulnl_test.c +++ b/utils/nfulnl_test.c @@ -11,9 +11,11 @@ static int print_pkt(struct nflog_data *nfad) uint32_t outdev, indev, hw_addrlen; struct nfulnl_msg_packet_hdr *ph; struct nfulnl_msg_packet_hw *hw; + uint16_t hwhdrlen; int payload_len; char *payload; char *prefix; + char *hwhdr; int i; ph = nflog_get_msg_packet_hdr(nfad); @@ -34,16 +36,40 @@ static int print_pkt(struct nflog_data *nfad) printf("%02x ", hw->hw_addr[hw_addrlen - 1]); } + /* NFULA_HWTYPE/NFULA_HWLEN/NFULA_HWHEADER: emitted by + * nfulnl_put_hwheader() in the kernel, independently of + * NFULA_HWADDR above. Only printed when the kernel decided the + * hook is on indev's input path (see nfulnl_pre_egress()); a + * missing hw_header= token is how a test asserts that exclusion. + */ + hwhdr = nflog_get_msg_packet_hwhdr(nfad); + if (hwhdr) { + hwhdrlen = nflog_get_msg_packet_hwhdrlen(nfad); + + printf("hw_type=0x%04x hw_hdrlen=%u hw_header=", + nflog_get_hwtype(nfad), hwhdrlen); + for (i = 0; i < hwhdrlen; i++) + printf("%02x", (unsigned char)hwhdr[i]); + printf(" "); + } + printf("mark=%u ", nflog_get_nfmark(nfad)); indev = nflog_get_indev(nfad); if (indev > 0) printf("indev=%u ", indev); + indev = nflog_get_physindev(nfad); + if (indev > 0) + printf("physindev=%u ", indev); + outdev = nflog_get_outdev(nfad); if (outdev > 0) printf("outdev=%u ", outdev); + outdev = nflog_get_physoutdev(nfad); + if (outdev > 0) + printf("physoutdev=%u ", outdev); prefix = nflog_get_prefix(nfad); if (prefix) diff --git a/utils/nfulnl_test.sh b/utils/nfulnl_test.sh index b23ccab04bae..d97f82a366ab 100755 --- a/utils/nfulnl_test.sh +++ b/utils/nfulnl_test.sh @@ -49,8 +49,8 @@ ping6 -q -c "$PING_COUNT" ::1 > /dev/null wait set +e -cnt4=$(grep -c '^hw_protocol=0x0800 hook=0 hw_addrlen=6 hw_addr=00:00:00:00:00:00 mark=0 indev=1 prefix="test icmp " payload_len=84' "$out") -cnt6=$(grep -c '^hw_protocol=0x86dd hook=0 hw_addrlen=6 hw_addr=00:00:00:00:00:00 mark=0 indev=1 prefix="test icmp6 " payload_len=104' "$out") +cnt4=$(grep -c '^hw_protocol=0x0800 hook=0 hw_addrlen=6 hw_addr=00:00:00:00:00:00 hw_type=0x0304 hw_hdrlen=14 hw_header=0000000000000000000000000800 mark=0 indev=1 prefix="test icmp " payload_len=84' "$out") +cnt6=$(grep -c '^hw_protocol=0x86dd hook=0 hw_addrlen=6 hw_addr=00:00:00:00:00:00 hw_type=0x0304 hw_hdrlen=14 hw_header=00000000000000000000000086dd mark=0 indev=1 prefix="test icmp6 " payload_len=104' "$out") [ "$cnt4" -ne 4 ] && die "Expected 2 counts each for ipv4 and ipv6, got $cnt4, $cnt6" [ "$cnt6" -ne 4 ] && die "Expected 2 counts each for ipv4 and ipv6, got $cnt4, $cnt6" -- 2.56.1