From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: duncan_roe@optusnet.com.au
Subject: [PATCH libnetfilter_queue 2/3] example: nf-queue: use pkt_buff
Date: Sun, 26 Apr 2020 15:23:55 +0200 [thread overview]
Message-ID: <20200426132356.8346-3-pablo@netfilter.org> (raw)
In-Reply-To: <20200426132356.8346-1-pablo@netfilter.org>
Update example file to use the pkt_buff structure to store the payload.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
examples/nf-queue.c | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/examples/nf-queue.c b/examples/nf-queue.c
index 3da2c249da23..f0d4c2ee7276 100644
--- a/examples/nf-queue.c
+++ b/examples/nf-queue.c
@@ -14,6 +14,7 @@
#include <linux/netfilter/nfnetlink_queue.h>
#include <libnetfilter_queue/libnetfilter_queue.h>
+#include <libnetfilter_queue/pktbuff.h>
/* only for NFQA_CT, not needed otherwise: */
#include <linux/netfilter/nfnetlink_conntrack.h>
@@ -50,9 +51,12 @@ static int queue_cb(const struct nlmsghdr *nlh, void *data)
{
struct nfqnl_msg_packet_hdr *ph = NULL;
struct nlattr *attr[NFQA_MAX+1] = {};
+ struct pkt_buff *pktb = data;
uint32_t id = 0, skbinfo;
struct nfgenmsg *nfg;
+ uint8_t *payload;
uint16_t plen;
+ int i;
if (nfq_nlmsg_parse(nlh, attr) < 0) {
perror("problems parsing");
@@ -69,7 +73,8 @@ static int queue_cb(const struct nlmsghdr *nlh, void *data)
ph = mnl_attr_get_payload(attr[NFQA_PACKET_HDR]);
plen = mnl_attr_get_payload_len(attr[NFQA_PAYLOAD]);
- /* void *payload = mnl_attr_get_payload(attr[NFQA_PAYLOAD]); */
+
+ pktb_build_data(pktb, mnl_attr_get_payload(attr[NFQA_PAYLOAD]), plen);
skbinfo = attr[NFQA_SKB_INFO] ? ntohl(mnl_attr_get_u32(attr[NFQA_SKB_INFO])) : 0;
@@ -97,6 +102,14 @@ static int queue_cb(const struct nlmsghdr *nlh, void *data)
printf(", checksum not ready");
puts(")");
+ printf("payload (len=%d) [", plen);
+ payload = pktb_data(pktb);
+
+ for (i = 0; i < pktb_len(pktb); i++)
+ printf("%x", payload[i] & 0xff);
+
+ printf("]\n");
+
nfq_send_verdict(ntohs(nfg->res_id), id);
return MNL_CB_OK;
@@ -107,6 +120,7 @@ int main(int argc, char *argv[])
char *buf;
/* largest possible packet payload, plus netlink data overhead: */
size_t sizeof_buf = 0xffff + (MNL_SOCKET_BUFFER_SIZE/2);
+ struct pkt_buff *pktb;
struct nlmsghdr *nlh;
int ret;
unsigned int portid, queue_num;
@@ -161,6 +175,12 @@ int main(int argc, char *argv[])
ret = 1;
mnl_socket_setsockopt(nl, NETLINK_NO_ENOBUFS, &ret, sizeof(int));
+ pktb = pktb_alloc_head();
+ if (!pktb) {
+ perror("pktb_alloc");
+ exit(EXIT_FAILURE);
+ }
+
for (;;) {
ret = mnl_socket_recvfrom(nl, buf, sizeof_buf);
if (ret == -1) {
@@ -168,13 +188,14 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
- ret = mnl_cb_run(buf, ret, 0, portid, queue_cb, NULL);
+ ret = mnl_cb_run(buf, ret, 0, portid, queue_cb, pktb);
if (ret < 0){
perror("mnl_cb_run");
exit(EXIT_FAILURE);
}
}
+ pktb_free(pktb);
mnl_socket_close(nl);
return 0;
--
2.20.1
next prev parent reply other threads:[~2020-04-26 13:24 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-26 13:23 [PATCH libnetfilter_queue 0/3] pktbuff API updates Pablo Neira Ayuso
2020-04-26 13:23 ` [PATCH libnetfilter_queue 1/3] pktbuff: add pktb_alloc_head() and pktb_build_data() Pablo Neira Ayuso
2020-04-30 5:41 ` Duncan Roe
2020-04-26 13:23 ` Pablo Neira Ayuso [this message]
2020-05-14 4:35 ` [PATCH libnetfilter_queue 2/3] example: nf-queue: use pkt_buff Duncan Roe
2020-05-14 4:35 ` [PATCH libnetfilter_queue 1/1] example: nf-queue: use pkt_buff (updated) Duncan Roe
2020-04-26 13:23 ` [PATCH libnetfilter_queue 3/3] pktbuff: add pktb_reset_network_header() and pktb_set_network_header() Pablo Neira Ayuso
2020-04-27 11:06 ` [PATCH libnetfilter_queue 0/3] pktbuff API updates Duncan Roe
2020-04-27 17:06 ` Pablo Neira Ayuso
2020-04-28 4:33 ` Duncan Roe
2020-04-28 10:34 ` Pablo Neira Ayuso
2020-04-28 21:14 ` Duncan Roe
2020-04-28 22:55 ` Pablo Neira Ayuso
2020-04-29 13:28 ` Duncan Roe
2020-04-29 19:00 ` Pablo Neira Ayuso
2020-04-29 19:54 ` Duncan Roe
2020-04-29 21:12 ` Pablo Neira Ayuso
2020-04-29 19:10 ` Duncan Roe
2020-04-29 19:16 ` Pablo Neira Ayuso
2020-04-29 20:30 ` Duncan Roe
2020-04-29 21:05 ` Pablo Neira Ayuso
2020-04-30 6:34 ` Duncan Roe
2020-05-02 12:50 ` Duncan Roe
2020-05-05 12:30 ` Pablo Neira Ayuso
2020-05-06 0:57 ` Duncan Roe
2020-05-06 2:39 ` Duncan Roe
2020-05-08 1:13 ` Duncan Roe
2020-05-09 8:26 ` Duncan Roe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200426132356.8346-3-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=duncan_roe@optusnet.com.au \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).