From 269685fcecb0562420b99fa63329278dc49d2e8f Mon Sep 17 00:00:00 2001 From: "/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=laforge/emailAddress=laforge@netfilter.org" Date: Fri, 23 Sep 2005 14:40:53 +0000 Subject: use new accessor functions (Eric Leblond, Harald Welte) --- utils/nfqnl_test.c | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) (limited to 'utils') diff --git a/utils/nfqnl_test.c b/utils/nfqnl_test.c index accd127..ae8c072 100644 --- a/utils/nfqnl_test.c +++ b/utils/nfqnl_test.c @@ -11,36 +11,34 @@ static u_int32_t print_pkt (struct nfattr *tb[]) { int id = 0; - - if (tb[NFQA_PACKET_HDR-1]) { - struct nfqnl_msg_packet_hdr *ph = - NFA_DATA(tb[NFQA_PACKET_HDR-1]); + struct nfqnl_msg_packet_hdr *ph; + u_int32_t mark,ifi; + int ret; + unsigned int datalength; + char * data; + + ph = nfqnl_get_msg_packet_hdr(tb); + if (ph){ id = ntohl(ph->packet_id); printf("hw_protocol=0x%04x hook=%u id=%u ", ntohs(ph->hw_protocol), ph->hook, id); } - - if (tb[NFQA_MARK-1]) { - u_int32_t mark = - ntohl(*(u_int32_t *)NFA_DATA(tb[NFQA_MARK-1])); + + mark = nfqnl_get_nfmark(tb); + if (mark) printf("mark=%u ", mark); - } - if (tb[NFQA_IFINDEX_INDEV-1]) { - u_int32_t ifi = - ntohl(*(u_int32_t *)NFA_DATA(tb[NFQA_IFINDEX_INDEV-1])); + ifi = nfqnl_get_indev(tb); + if (ifi) printf("indev=%u ", ifi); - } - if (tb[NFQA_IFINDEX_OUTDEV-1]) { - u_int32_t ifi = - ntohl(*(u_int32_t *)NFA_DATA(tb[NFQA_IFINDEX_OUTDEV-1])); + ifi = nfqnl_get_outdev(tb); + if (ifi) printf("outdev=%u ", ifi); - } - if (tb[NFQA_PAYLOAD-1]) { - printf("payload_len=%d ", NFA_PAYLOAD(tb[NFQA_PAYLOAD-1])); - } + ret = nfqnl_get_payload(tb, &data, &datalength); + if (ret) + printf("payload_len=%d ", datalength); fputc('\n', stdout); -- cgit v1.2.3