diff mbox series

[libnetfilter_queue] src: add pkt_buff function for ICMP

Message ID 57E75703-5B8A-4E88-810C-E5F0963BF6E7@apple.com
State Superseded
Delegated to: Pablo Neira
Headers show
Series [libnetfilter_queue] src: add pkt_buff function for ICMP | expand

Commit Message

Etan Kissling Jan. 13, 2021, 9:37 a.m. UTC 
Add support for processing ICMP packets using pkt_buff, similar to
existing library support for TCP and UDP.

Signed-off-by: Etan Kissling <etan_kissling@apple.com>
---
 include/libnetfilter_queue/Makefile.am        |  1 +
 .../libnetfilter_queue_icmp.h                 |  8 ++++
 src/Makefile.am                               |  1 +
 src/extra/icmp.c                              | 48 +++++++++++++++++++
 4 files changed, 58 insertions(+)
 create mode 100644 include/libnetfilter_queue/libnetfilter_queue_icmp.h
 create mode 100644 src/extra/icmp.c

Comments

Pablo Neira Ayuso Feb. 9, 2021, 4:32 p.m. UTC | #1 
On Wed, Jan 13, 2021 at 10:37:30AM +0100, Etan Kissling wrote:
> Add support for processing ICMP packets using pkt_buff, similar to
> existing library support for TCP and UDP.

Applied, thanks.
diff mbox series

Patch

diff --git a/include/libnetfilter_queue/Makefile.am b/include/libnetfilter_queue/Makefile.am
index 902fbf9..e436bab 100644
--- a/include/libnetfilter_queue/Makefile.am
+++ b/include/libnetfilter_queue/Makefile.am
@@ -1,5 +1,6 @@ 
 pkginclude_HEADERS = libnetfilter_queue.h	\
 		     linux_nfnetlink_queue.h	\
+		     libnetfilter_queue_icmp.h	\
 		     libnetfilter_queue_ipv4.h	\
 		     libnetfilter_queue_ipv6.h	\
 		     libnetfilter_queue_tcp.h	\
diff --git a/include/libnetfilter_queue/libnetfilter_queue_icmp.h b/include/libnetfilter_queue/libnetfilter_queue_icmp.h
new file mode 100644
index 0000000..9a8bd52
--- /dev/null
+++ b/include/libnetfilter_queue/libnetfilter_queue_icmp.h
@@ -0,0 +1,8 @@ 
+#ifndef _LIBNFQUEUE_ICMP_H_
+#define _LIBNFQUEUE_ICMP_H_
+
+struct pkt_buff;
+
+struct icmphdr *nfq_icmp_get_hdr(struct pkt_buff *pktb);
+
+#endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 8cede12..471c02c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,6 +31,7 @@  libnetfilter_queue_la_LDFLAGS = -Wc,-nostartfiles \
 libnetfilter_queue_la_SOURCES = libnetfilter_queue.c	\
 				nlmsg.c			\
 				extra/checksum.c	\
+				extra/icmp.c	\
 				extra/ipv6.c		\
 				extra/tcp.c		\
 				extra/ipv4.c		\
diff --git a/src/extra/icmp.c b/src/extra/icmp.c
new file mode 100644
index 0000000..c0d42ac
--- /dev/null
+++ b/src/extra/icmp.c
@@ -0,0 +1,48 @@ 
+/*
+ * (C) 2012 by Pablo Neira Ayuso <pablo@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This code has been sponsored by Vyatta Inc. <http://www.vyatta.com>
+ */
+
+#include <stdio.h>
+#define _GNU_SOURCE
+#include <netinet/ip_icmp.h>
+
+#include <libnetfilter_queue/libnetfilter_queue_icmp.h>
+
+#include "internal.h"
+
+/**
+ * \defgroup icmp ICMP helper functions
+ * @{
+ */
+
+/**
+ * nfq_icmp_get_hdr - get the ICMP header.
+ * \param head: pointer to the beginning of the packet
+ * \param tail: pointer to the tail of the packet
+ *
+ * This function returns NULL if invalid ICMP header is found. On success,
+ * it returns the ICMP header.
+ */
+struct icmphdr *nfq_icmp_get_hdr(struct pkt_buff *pktb)
+{
+	if (pktb->transport_header == NULL)
+		return NULL;
+
+	/* No room for the ICMP header. */
+	if (pktb->tail - pktb->transport_header < sizeof(struct icmphdr))
+		return NULL;
+
+	return (struct icmphdr *)pktb->transport_header;
+}
+EXPORT_SYMBOL(nfq_icmp_get_hdr);
+
+/**
+ * @}
+ */