Skip to contentSkip to conversation

add nfq_snprintf_xml() to output a packet in XML format

PATCH In review Pablo Neira Ayuso 2 participants 4 messages May 26, 2010 – May 27, 2010 netfilter

lore
Share & tools
lore

Pablo Neira Ayuso

author maintainer
#0 lore raw

PATCH 1/1 add nfq_snprintf_xml() to output a packet in XML format

This patch adds a new function to output the packet in XML format.

---
 include/libnetfilter_queue/libnetfilter_queue.h |   11 ++
 src/libnetfilter_queue.c                        |  109 +++++++++++++++++++++++
 2 files changed, 120 insertions(+), 0 deletions(-)
include/libnetfilter_queue/libnetfilter_queue.h +11 -0
index 88a9b8c..165ace5 100644
@@ -106,6 +106,17 @@ extern struct nfqnl_msg_packet_hw *nfq_get_packet_hw(struct nfq_data *nfad);
 /* return -1 if problem, length otherwise */
 extern int nfq_get_payload(struct nfq_data *nfad, char **data);
 
+enum {
+	NFQ_XML_HW	= (1 << 0),
+	NFQ_XML_MARK	= (1 << 1),
+	NFQ_XML_DEV	= (1 << 2),
+	NFQ_XML_PHYSDEV	= (1 << 3),
+	NFQ_XML_PAYLOAD	= (1 << 4),
+	NFQ_XML_ALL	= ~0U,
+};
+
+extern int nfq_snprintf_xml(char *buf, int len, struct nfq_data *tb, int flags);
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
src/libnetfilter_queue.c +109 -0

115 lines not on this page · raw message

#1 lore raw
Quoted 9 lines · Pablo Neira Ayuso

This patch adds a new function to output the packet in XML format.

src/libnetfilter_queue.c +7 -0
+int nfq_snprintf_xml(char *buf, int len, struct nfq_data *tb, int flags)
+{
+	struct nfqnl_msg_packet_hdr *ph;
+	struct nfqnl_msg_packet_hw *hwph;
+	u_int32_t mark, ifi;
+	int size, offset = 0, ret;
+	char *data;

src/libnetfilter_queue.c int nfq_get_payload(struct nfq_data *nfad, char **data) · line 1038

Quoted 10 lines
src/libnetfilter_queue.c +10 -0
+
+	size = snprintf(buf + offset, len, "<pkt>");
+	SNPRINTF_FAILURE(size, len, offset);
+
+	ph = nfq_get_msg_packet_hdr(tb);
+	if (ph) {
+		size = snprintf(buf + offset, len,
+				"<hook>%u</hook><id>%u</id>",
+				ph->hook, ntohl(ph->packet_id));
+		SNPRINTF_FAILURE(size, len, offset);

Couldn't libxml be used to generate the XML?

src/libnetfilter_queue.c int nfq_get_payload(struct nfq_data *nfad, char **data) · line 1108

Quoted 9 lines
src/libnetfilter_queue.c +9 -0
+	ret = nfq_get_payload(tb, &data);
+	if (ret >= 0 && (flags & NFQ_XML_PAYLOAD)) {
+		int i;
+
+		size = snprintf(buf + offset, len, "<payload>");
+		SNPRINTF_FAILURE(size, len, offset);
+
+		for (i=0; i<ret; i++) {
+			size = snprintf(buf + offset, len, "x%02x",

What's the leading x for? It seems to add no value.

Quoted 14 lines
src/libnetfilter_queue.c +14 -0
+					data[i] & 0xff);
+			SNPRINTF_FAILURE(size, len, offset);
+		}
+
+		size = snprintf(buf + offset, len, "</payload>");
+		SNPRINTF_FAILURE(size, len, offset);
+	}
+
+	size = snprintf(buf + offset, len, "</pkt>");
+	SNPRINTF_FAILURE(size, len, offset);
+
+	return size;
+}
+
author maintainer
#2 lore raw
Quoted 15 lines · Jan Engelhardt
Quoted 13 lines · Pablo Neira Ayuso

This patch adds a new function to output the packet in XML format.

src/libnetfilter_queue.c +11 -0
+int nfq_snprintf_xml(char *buf, int len, struct nfq_data *tb, int flags)
+{
+	struct nfqnl_msg_packet_hdr *ph;
+	struct nfqnl_msg_packet_hw *hwph;
+	u_int32_t mark, ifi;
+	int size, offset = 0, ret;
+	char *data;
+
+	size = snprintf(buf + offset, len, "<pkt>");
+	SNPRINTF_FAILURE(size, len, offset);
+
Quoted 8 lines

src/libnetfilter_queue.c int nfq_get_payload(struct nfq_data *nfad, char **data) · line 1038

Quoted 6 lines
src/libnetfilter_queue.c +6 -0
+	ph = nfq_get_msg_packet_hdr(tb);
+	if (ph) {
+		size = snprintf(buf + offset, len,
+				"<hook>%u</hook><id>%u</id>",
+				ph->hook, ntohl(ph->packet_id));
+		SNPRINTF_FAILURE(size, len, offset);

Couldn't libxml be used to generate the XML?

Adding such a dependency is overkill. One of the good things of these libraries is that they are small and they have small dependencies.

Quoted 11 lines

src/libnetfilter_queue.c int nfq_get_payload(struct nfq_data *nfad, char **data) · line 1108

Quoted 9 lines
src/libnetfilter_queue.c +9 -0
+	ret = nfq_get_payload(tb, &data);
+	if (ret >= 0 && (flags & NFQ_XML_PAYLOAD)) {
+		int i;
+
+		size = snprintf(buf + offset, len, "<payload>");
+		SNPRINTF_FAILURE(size, len, offset);
+
+		for (i=0; i<ret; i++) {
+			size = snprintf(buf + offset, len, "x%02x",

What's the leading x for? It seems to add no value.

We can remove that or include a backslash before the 'x'.

author maintainer
#3 lore raw

New version of this patch including NFQ_XML_TIME.

add nfq_snprintf_xml() to output a packet in XML format

This patch adds a new function to output the packet in XML format.

---
 include/libnetfilter_queue/libnetfilter_queue.h |   12 ++
 src/libnetfilter_queue.c                        |  151 +++++++++++++++++++++++
 2 files changed, 163 insertions(+), 0 deletions(-)
include/libnetfilter_queue/libnetfilter_queue.h +12 -0
index 88a9b8c..c33a134 100644
@@ -106,6 +106,18 @@ extern struct nfqnl_msg_packet_hw *nfq_get_packet_hw(struct nfq_data *nfad);
 /* return -1 if problem, length otherwise */
 extern int nfq_get_payload(struct nfq_data *nfad, char **data);
 
+enum {
+	NFQ_XML_HW	= (1 << 0),
+	NFQ_XML_MARK	= (1 << 1),
+	NFQ_XML_DEV	= (1 << 2),
+	NFQ_XML_PHYSDEV	= (1 << 3),
+	NFQ_XML_PAYLOAD	= (1 << 4),
+	NFQ_XML_TIME	= (1 << 5),
+	NFQ_XML_ALL	= ~0U,
+};
+
+extern int nfq_snprintf_xml(char *buf, size_t len, struct nfq_data *tb, int flags);
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
src/libnetfilter_queue.c +151 -0

157 lines not on this page · raw message