[PATCH ulogd2 1/2] ulog: remove input plugin

[PATCH ulogd2 1/2] ulog: remove input plugin

[Corubba Smith]

The ULOG target was removed from the linux kernel with 7200135bc1e6
("netfilter: kill ulog targets") aka v3.17, so remove the input plugin
for it. It's successor NFLOG should be used instead, which has its own
input plugin.

Signed-off-by: Corubba Smith <corubba@gmx.de>
---
 README                           |   1 -
 TODO                             |   1 -
 configure.ac                     |   8 -
 doc/ulogd.sgml                   |  87 +-------
 filter/ulogd_filter_HWHDR.c      |   4 -
 include/ulogd/ulogd.h            |   3 +-
 input/packet/Makefile.am         |   8 -
 input/packet/ulogd_inppkt_ULOG.c | 332 -------------------------------
 ulogd.8                          |   2 +-
 ulogd.conf.in                    |   9 -
 10 files changed, 3 insertions(+), 452 deletions(-)
 delete mode 100644 input/packet/ulogd_inppkt_ULOG.c

diff --git a/README b/README
index 738a4c8..87c605f 100644
--- a/README
+++ b/README
@@ -10,7 +10,6 @@ in the doc/ subdirectory.

 This packages is intended for doing all netfilter related logging inside a
 userspace process.  This includes
-	- logging of ruleset violations via ipt_ULOG (kernel 2.4.18+)
 	- logging of ruleset violations via nfnetlink_log (kernel 2.6.14+)
 	- logging of connection startup/teardown (kernel 2.6.14+)
 	- connection-based accounting  (kernel 2.6.14+)
diff --git a/TODO b/TODO
index d9c0fb3..44a6d5d 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,3 @@
 - add support for capabilities to run as non-root
 - support for static linking
-- issues with ulogd_BASE and partially copied packets (--ulog-cprange)
 - problem wrt. ulogd_BASE and fragments
diff --git a/configure.ac b/configure.ac
index 3c9249e..dca8a2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,13 +37,6 @@ AC_CHECK_FUNCS([socket strerror])
 AC_SEARCH_LIBS([pthread_create], [pthread], [libpthread_LIBS="$LIBS"; LIBS=""])
 AC_SUBST([libpthread_LIBS])

-AC_ARG_ENABLE([ulog],
-              [AS_HELP_STRING([--enable-ulog], [Enable ulog module [default=yes]])],
-              [enable_ulog=$enableval],
-              [enable_ulog=yes])
-AS_IF([test "x$enable_ulog" != "xyes"], [enable_ulog=no])
-AM_CONDITIONAL([BUILD_ULOG], [test "x$enable_ulog" = "xyes"])
-
 dnl Check for the right nfnetlink version
 PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.1])

@@ -297,7 +290,6 @@ Ulogd configuration:
     NFLOG plugin:			${enable_nflog}
     NFCT plugin:			${enable_nfct}
     NFACCT plugin:			${enable_nfacct}
-    ULOG plugin:			${enable_ulog}
   Output plugins:
     PCAP plugin:			${enable_pcap}
     PGSQL plugin:			${enable_pgsql}
diff --git a/doc/ulogd.sgml b/doc/ulogd.sgml
index de799f4..076edda 100644
--- a/doc/ulogd.sgml
+++ b/doc/ulogd.sgml
@@ -9,8 +9,7 @@
 <abstract>
 This is the documentation for <tt>ulogd-2.x</tt>, the second generation
 Netfilter Userspace logging daemon.  ulogd makes use of the Linux &gt;= 2.6.14
-nfnetlink_log and nfnetlink_conntrack subsystems, but also provides backwards compatibility for Linux
-&gt;= 2.4.0 ipt_ULOG.
+nfnetlink_log and nfnetlink_conntrack subsystems.
 </abstract>

 <toc>
@@ -66,7 +65,6 @@ interconnected  by pointers.
 <sect1>Linux kernel
 <p>
 To use the NFCT or NFLOG input plugin, you will need a 2.6.14 or later kernel.
-For old-style ULOG logging, you need a kernel &gt;= 2.4.18.

 <sect1>Userspace libraries
 <p>
@@ -132,75 +130,6 @@ A string that is associated with every packet logged by this rule.  You can use
 this option to later tell from which rule the packet was logged.
 </descrip>

-<sect1>iptables ULOG target
-<sect2>Quick Setup
-<p>
-Just add rules using the ULOG target to your firewalling chain. A very basic
-example:
-<tscreen><verb>
-iptables -A FORWARD -j ULOG --ulog-nlgroup 32 --ulog-prefix foo
-</verb></tscreen>
-<p>
-To increase logging performance, try to use the
-<tscreen><verb>
---ulog-qthreshold N
-</verb></tscreen>
-option (where 1 &lt; N &lt;= 50). The number you specify is the amount of packets
-batched together in one multipart netlink message. If you set this to 20, the
-kernel schedules ulogd only once every 20 packets. All 20 packets are then
-processed by ulogd. This reduces the number of context switches between kernel
-and userspace.
-<p>
-Of course you can combine the ULOG target with the different netfilter match
-modules.  For a more detailed description, have a look at the netfilter
-HOWTO's, available on the netfilter homepage.
-<sect2>ULOG target reference
-<p>
-<descrip>
-<tag>--ulog-nlgroup N</tag>
-The number of the netlink multicast group to which ULOG'ed packets are sent.
-You will have to use the same group number in the ULOG target and ulogd in
-order to make logging work.
-<tag>--ulog-cprange N</tag>
-Copyrange.  This works like the 'snaplen' parameter of tcpdump.  You can specify
-a number of bytes up to which the packet is copied.  If you say '40', you will
-receive the first fourty bytes of every packet. Leave it to <tt>0</tt>
-<tag>--ulog-qthreshold N</tag>
-Queue threshold.  If a packet is matched by the iptables rule, and already N
-packets are in the queue, the queue is flushed to userspace.  You can use this
-to implement a policy like: Use a big queue in order to gain high performance,
-but still have certain packets logged immediately to userspace.
-<tag>--ulog-prefix STRING</tag>
-A string that is associated with every packet logged by this rule.  You can use
-this option to later tell from which rule the packet was logged.
-</descrip>
-
-<sect2>ipt_ULOG module parameters
-<p>
-The ipt_ULOG kernel module has a couple of module loadtime parameters which can
-(and should) be tuned to accomodate the needs of the application:
-<descrip>
-<tag>nlbufsiz N</tag>
-Netlink buffer size. A buffer of the specified size N is allocated for every
-netlink group that is used.  Please note that due to restrictions of the kernel
-memory allocator, we cannot have a buffer size &gt; 128kBytes.  Larger buffer
-sizes increase the performance, since less kernel/userspace context switches
-are needed for the same amount of packets.  The backside of this performance
-gain is a potentially larger delay. The default value is 4096 bytes, which is
-quite small.
-<tag>flushtimeout N</tag>
-The flushtimeout determines, after how many clock ticks (on alpha: 1ms, on
-x86 and most other platforms: 10ms time units) the buffer/queue is to be
-flushed, even if it is not full.  This can be used to have the advantage of a
-large buffer, but still a finite maximum delay introduced.  The default value
-is set to 10 seconds.
-</descrip>
-Example:
-<tscreen><verb>
-modprobe ipt_ULOG nlbufsiz=65535 flushtimeout=100
-</verb></tscreen>
-This would use a buffer size of 64k and a flushtimeout of 100 clockticks (1 second on x86).
-
 <sect1>ulogd
 <p>
 ulogd is what this is all about, so let's describe it's configuration...
@@ -322,20 +251,6 @@ Specify the base socket buffer maximum size.



-<sect2>ulogd_inppkt_ULOG.so
-<p>
-The good old ipt_ULOG input plugin.  This basically emulates ulogd-1.x which
-didn't have input plugins.
-<descrip>
-<tag>nlgroup</tag>
-The number of the netlink multicast group to which ULOG'ed packets are sent.
-You will have to use the same group number in the ULOG target and nin the input plugin.
-<tag>numeric_label</tag>
-You can use this label to store information relative to the logging. The administrator can define a convention which can be used later to differenciate packet. For example, it can store the severity of the logged event.
-</descrip>
-
-
-

 <sect1>Interpreter plugins
 <p>
diff --git a/filter/ulogd_filter_HWHDR.c b/filter/ulogd_filter_HWHDR.c
index a5ee60d..4bbf20d 100644
--- a/filter/ulogd_filter_HWHDR.c
+++ b/filter/ulogd_filter_HWHDR.c
@@ -198,11 +198,7 @@ static int interp_mac2str(struct ulogd_pluginstance *pi)
 		return ULOGD_IRET_ERR;

 	if (pp_is_valid(inp, KEY_RAW_TYPE))
-		/* NFLOG with Linux >= 2.6.27 case */
 		type = ikey_get_u16(&inp[KEY_RAW_TYPE]);
-	else if (ikey_get_u16(&inp[KEY_RAW_MACLEN]) == ETH_HLEN)
-		/* ULOG case, treat ethernet encapsulation */
-		type = ARPHRD_ETHER;
 	else
 		type = ARPHRD_VOID;

diff --git a/include/ulogd/ulogd.h b/include/ulogd/ulogd.h
index 088d85d..5eafb21 100644
--- a/include/ulogd/ulogd.h
+++ b/include/ulogd/ulogd.h
@@ -2,8 +2,7 @@
 #define _ULOGD_H
 /* ulogd
  *
- * userspace logging daemon for netfilter ULOG target
- * of the linux 2.4/2.6 netfilter subsystem.
+ * Userspace logging daemon for netfilter/iptables
  *
  * (C) 2000-2005 by Harald Welte <laforge@gnumonks.org>
  *
diff --git a/input/packet/Makefile.am b/input/packet/Makefile.am
index 851c608..20c51ec 100644
--- a/input/packet/Makefile.am
+++ b/input/packet/Makefile.am
@@ -7,14 +7,6 @@ pkglib_LTLIBRARIES = ulogd_inppkt_UNIXSOCK.la
 ulogd_inppkt_UNIXSOCK_la_SOURCES = ulogd_inppkt_UNIXSOCK.c
 ulogd_inppkt_UNIXSOCK_la_LDFLAGS = -avoid-version -module

-if BUILD_ULOG
-pkglib_LTLIBRARIES += ulogd_inppkt_ULOG.la
-
-ulogd_inppkt_ULOG_la_SOURCES = ulogd_inppkt_ULOG.c
-ulogd_inppkt_ULOG_la_LDFLAGS = -avoid-version -module
-ulogd_inppkt_ULOG_la_LIBADD = ../../libipulog/libipulog.la
-endif
-
 if BUILD_NFLOG
 pkglib_LTLIBRARIES += ulogd_inppkt_NFLOG.la

diff --git a/input/packet/ulogd_inppkt_ULOG.c b/input/packet/ulogd_inppkt_ULOG.c
deleted file mode 100644
index 2eb994c..0000000
--- a/input/packet/ulogd_inppkt_ULOG.c
+++ /dev/null
@@ -1,332 +0,0 @@
-/* ulogd_inppkt_ULOG.c - stackable input plugin for ULOG packets -> ulogd2
- *
- * (C) 2004-2005 by Harald Welte <laforge@gnumonks.org>
- */
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <arpa/inet.h>
-#include <string.h>
-
-
-#include <ulogd/ulogd.h>
-#include <libipulog/libipulog.h>
-
-#ifndef ULOGD_NLGROUP_DEFAULT
-#define ULOGD_NLGROUP_DEFAULT	32
-#endif
-
-/* Size of the socket receive memory.  Should be at least the same size as the
- * 'nlbufsiz' module loadtime parameter of ipt_ULOG.o
- * If you have _big_ in-kernel queues, you may have to increase this number.  (
- * --qthreshold 100 * 1500 bytes/packet = 150kB  */
-#define ULOGD_RMEM_DEFAULT	131071
-
-/* Size of the receive buffer for the netlink socket.  Should be at least of
- * RMEM_DEFAULT size.  */
-#define ULOGD_BUFSIZE_DEFAULT	150000
-
-struct ulog_input {
-	struct ipulog_handle *libulog_h;
-	unsigned char *libulog_buf;
-	struct ulogd_fd ulog_fd;
-};
-
-/* configuration entries */
-
-static struct config_keyset libulog_kset = {
-	.num_ces = 4,
-	.ces = {
-	{
-		.key 	 = "bufsize",
-		.type 	 = CONFIG_TYPE_INT,
-		.options = CONFIG_OPT_NONE,
-		.u.value = ULOGD_BUFSIZE_DEFAULT,
-	},
-	{
-		.key	 = "nlgroup",
-		.type	 = CONFIG_TYPE_INT,
-		.options = CONFIG_OPT_NONE,
-		.u.value = ULOGD_NLGROUP_DEFAULT,
-	},
-	{
-		.key	 = "rmem",
-		.type	 = CONFIG_TYPE_INT,
-		.options = CONFIG_OPT_NONE,
-		.u.value = ULOGD_RMEM_DEFAULT,
-	},
-	{
-		.key	 = "numeric_label",
-		.type	 = CONFIG_TYPE_INT,
-		.options = CONFIG_OPT_NONE,
-		.u.value = 0,
-	},
-
-	}
-};
-enum ulog_keys {
-	ULOG_KEY_RAW_MAC = 0,
-	ULOG_KEY_RAW_PCKT,
-	ULOG_KEY_RAW_PCKTLEN,
-	ULOG_KEY_RAW_PCKTCOUNT,
-	ULOG_KEY_OOB_PREFIX,
-	ULOG_KEY_OOB_TIME_SEC,
-	ULOG_KEY_OOB_TIME_USEC,
-	ULOG_KEY_OOB_MARK,
-	ULOG_KEY_OOB_IN,
-	ULOG_KEY_OOB_OUT,
-	ULOG_KEY_OOB_HOOK,
-	ULOG_KEY_RAW_MAC_LEN,
-	ULOG_KEY_OOB_FAMILY,
-	ULOG_KEY_OOB_PROTOCOL,
-	ULOG_KEY_RAW_LABEL,
-};
-
-static struct ulogd_key output_keys[] = {
-	[ULOG_KEY_RAW_MAC] = {
-		.type = ULOGD_RET_RAW,
-		.flags = ULOGD_RETF_NONE,
-		.name = "raw.mac",
-		.ipfix = {
-			.vendor = IPFIX_VENDOR_IETF,
-			.field_id = IPFIX_sourceMacAddress,
-		},
-	},
-	[ULOG_KEY_RAW_PCKT] = {
-		.type = ULOGD_RET_RAW,
-		.flags = ULOGD_RETF_NONE,
-		.name = "raw.pkt",
-		.ipfix = {
-			.vendor = IPFIX_VENDOR_NETFILTER,
-			.field_id = 1,
-			},
-	},
-	[ULOG_KEY_RAW_PCKTLEN] = {
-		.type = ULOGD_RET_UINT32,
-		.flags = ULOGD_RETF_NONE,
-		.name = "raw.pktlen",
-		.ipfix = {
-			.vendor = IPFIX_VENDOR_IETF,
-			.field_id = 1
-		},
-	},
-	[ULOG_KEY_RAW_PCKTCOUNT] = {
-		.type = ULOGD_RET_UINT32,
-		.flags = ULOGD_RETF_NONE,
-		.name = "raw.pktcount",
-		.ipfix = {
-			.vendor = IPFIX_VENDOR_IETF,
-			.field_id = 2
-		},
-	},
-	[ULOG_KEY_OOB_PREFIX] = {
-		.type = ULOGD_RET_STRING,
-		.flags = ULOGD_RETF_NONE,
-		.name = "oob.prefix",
-	},
-	[ULOG_KEY_OOB_TIME_SEC] = {
-		.type = ULOGD_RET_UINT32,
-		.flags = ULOGD_RETF_NONE,
-		.name = "oob.time.sec",
-		.ipfix = {
-			.vendor = IPFIX_VENDOR_IETF,
-			.field_id = 22
-		},
-	},
-	[ULOG_KEY_OOB_TIME_USEC] = {
-		.type = ULOGD_RET_UINT32,
-		.flags = ULOGD_RETF_NONE,
-		.name = "oob.time.usec",
-	},
-	[ULOG_KEY_OOB_MARK] = {
-		.type = ULOGD_RET_UINT32,
-		.flags = ULOGD_RETF_NONE,
-		.name = "oob.mark",
-	},
-	[ULOG_KEY_OOB_IN] = {
-		.type = ULOGD_RET_STRING,
-		.flags = ULOGD_RETF_NONE,
-		.name = "oob.in",
-	},
-	[ULOG_KEY_OOB_OUT] = {
-		.type = ULOGD_RET_STRING,
-		.flags = ULOGD_RETF_NONE,
-		.name = "oob.out",
-	},
-	[ULOG_KEY_OOB_HOOK] = {
-		.type = ULOGD_RET_UINT8,
-		.flags = ULOGD_RETF_NONE,
-		.name = "oob.hook",
-		.ipfix = {
-			.vendor = IPFIX_VENDOR_NETFILTER,
-			.field_id = IPFIX_NF_hook,
-		},
-	},
-	[ULOG_KEY_RAW_MAC_LEN] = {
-		.type = ULOGD_RET_UINT16,
-		.flags = ULOGD_RETF_NONE,
-		.name = "raw.mac_len",
-	},
-	[ULOG_KEY_OOB_FAMILY] = {
-		.type = ULOGD_RET_UINT8,
-		.flags = ULOGD_RETF_NONE,
-		.name = "oob.family",
-	},
-	[ULOG_KEY_OOB_PROTOCOL] = {
-		.type = ULOGD_RET_UINT16,
-		.flags = ULOGD_RETF_NONE,
-		.name = "oob.protocol",
-	},
-	[ULOG_KEY_RAW_LABEL] = {
-		.type = ULOGD_RET_UINT8,
-		.flags = ULOGD_RETF_NONE,
-		.name = "raw.label",
-	},
-
-};
-
-static int interp_packet(struct ulogd_pluginstance *ip, ulog_packet_msg_t *pkt)
-{
-	struct ulogd_key *ret = ip->output.keys;
-
-	if (pkt->mac_len) {
-		okey_set_ptr(&ret[ULOG_KEY_RAW_MAC], pkt->mac);
-		okey_set_u16(&ret[ULOG_KEY_RAW_MAC_LEN], pkt->mac_len);
-	}
-
-	okey_set_u8(&ret[ULOG_KEY_RAW_LABEL], ip->config_kset->ces[3].u.value);
-
-	/* include pointer to raw ipv4 packet */
-	okey_set_ptr(&ret[ULOG_KEY_RAW_PCKT], pkt->payload);
-	okey_set_u32(&ret[ULOG_KEY_RAW_PCKTLEN], pkt->data_len);
-	okey_set_u32(&ret[ULOG_KEY_RAW_PCKTCOUNT], 1);
-
-	okey_set_ptr(&ret[ULOG_KEY_OOB_PREFIX], pkt->prefix);
-
-	/* god knows why timestamp_usec contains crap if timestamp_sec == 0
-	 * if (pkt->timestamp_sec || pkt->timestamp_usec) { */
-	if (pkt->timestamp_sec) {
-		okey_set_u32(&ret[ULOG_KEY_OOB_TIME_SEC], pkt->timestamp_sec);
-		okey_set_u32(&ret[ULOG_KEY_OOB_TIME_USEC], pkt->timestamp_usec);
-	} else {
-		ret[ULOG_KEY_OOB_TIME_SEC].flags &= ~ULOGD_RETF_VALID;
-		ret[ULOG_KEY_OOB_TIME_USEC].flags &= ~ULOGD_RETF_VALID;
-	}
-
-	okey_set_u32(&ret[ULOG_KEY_OOB_MARK], pkt->mark);
-	okey_set_ptr(&ret[ULOG_KEY_OOB_IN], pkt->indev_name);
-	okey_set_ptr(&ret[ULOG_KEY_OOB_OUT], pkt->outdev_name);
-
-	okey_set_u8(&ret[ULOG_KEY_OOB_HOOK], pkt->hook);
-
-	/* ULOG is IPv4 only */
-	okey_set_u8(&ret[ULOG_KEY_OOB_FAMILY], AF_INET);
-	/* Undef in ULOG but necessary */
-	okey_set_u16(&ret[ULOG_KEY_OOB_PROTOCOL], 0);
-
-	ulogd_propagate_results(ip);
-	return 0;
-}
-
-static int ulog_read_cb(int fd, unsigned int what, void *param)
-{
-	struct ulogd_pluginstance *upi = (struct ulogd_pluginstance *)param;
-	struct ulogd_pluginstance *npi = NULL;
-	struct ulog_input *u = (struct ulog_input *) &upi->private;
-	ulog_packet_msg_t *upkt;
-	int len;
-
-	if (!(what & ULOGD_FD_READ))
-		return 0;
-
-	while ((len = ipulog_read(u->libulog_h, u->libulog_buf,
-				 upi->config_kset->ces[0].u.value))) {
-		if (len <= 0) {
-			if (errno == EAGAIN)
-				break;
-			/* this is not supposed to happen */
-			ulogd_log(ULOGD_ERROR, "ipulog_read = %d! "
-				  "ipulog_errno = %d (%s), "
-				  "errno = %d (%s)\n",
-				  len, ipulog_errno,
-				  ipulog_strerror(ipulog_errno),
-				  errno, strerror(errno));
-			break;
-		}
-		while ((upkt = ipulog_get_packet(u->libulog_h,
-						 u->libulog_buf, len))) {
-			/* since we support the re-use of one instance in
-			 * several different stacks, we duplicate the message
-			 * to let them know */
-			llist_for_each_entry(npi, &upi->plist, plist)
-				interp_packet(npi, upkt);
-			interp_packet(upi, upkt);
-		}
-	}
-	return 0;
-}
-
-static int init(struct ulogd_pluginstance *upi)
-{
-	struct ulog_input *ui = (struct ulog_input *) &upi->private;
-
-	ui->libulog_buf = malloc(upi->config_kset->ces[0].u.value);
-	if (!ui->libulog_buf) {
-		ulogd_log(ULOGD_ERROR, "Out of memory\n");
-		goto out_buf;
-	}
-
-	ui->libulog_h = ipulog_create_handle(
-				ipulog_group2gmask(upi->config_kset->ces[1].u.value),
-				upi->config_kset->ces[2].u.value);
-	if (!ui->libulog_h) {
-		ulogd_log(ULOGD_ERROR, "Can't create ULOG handle\n");
-		goto out_handle;
-	}
-
-	ui->ulog_fd.fd = ipulog_get_fd(ui->libulog_h);
-	ui->ulog_fd.cb = &ulog_read_cb;
-	ui->ulog_fd.data = upi;
-	ui->ulog_fd.when = ULOGD_FD_READ;
-
-	ulogd_register_fd(&ui->ulog_fd);
-
-	return 0;
-
-out_handle:
-	free(ui->libulog_buf);
-out_buf:
-	return -1;
-}
-
-static int fini(struct ulogd_pluginstance *pi)
-{
-	struct ulog_input *ui = (struct ulog_input *)pi->private;
-
-	ulogd_unregister_fd(&ui->ulog_fd);
-
-	return 0;
-}
-
-struct ulogd_plugin libulog_plugin = {
-	.name = "ULOG",
-	.input = {
-		.type = ULOGD_DTYPE_SOURCE,
-		.keys = NULL,
-		.num_keys = 0,
-	},
-	.output = {
-		.type = ULOGD_DTYPE_RAW,
-		.keys = output_keys,
-		.num_keys = ARRAY_SIZE(output_keys),
-	},
-	.start = &init,
-	.stop = &fini,
-	.config_kset = &libulog_kset,
-	.version = VERSION,
-};
-
-void __attribute__ ((constructor)) initializer(void)
-{
-	ulogd_register_plugin(&libulog_plugin);
-}
diff --git a/ulogd.8 b/ulogd.8
index 9d16aeb..03f0da6 100644
--- a/ulogd.8
+++ b/ulogd.8
@@ -26,7 +26,7 @@ connection tracking, the Netfilter packet logging subsystem and from
 the Netfilter accounting subsystem. You have to enable support for
 connection tracking event delivery; ctnetlink and the NFLOG target in
 your Linux kernel 2.6.x or load their respective modules. The deprecated
-ULOG target (which has been superseded by NFLOG) is also
+ULOG target (which has been superseded by NFLOG) is no longer
 supported.
 .PP
 The received messages can be logged into files or into a mySQL, sqlite3
diff --git a/ulogd.conf.in b/ulogd.conf.in
index 9a04bf7..6e0b7c7 100644
--- a/ulogd.conf.in
+++ b/ulogd.conf.in
@@ -26,7 +26,6 @@ logfile="/var/log/ulogd.log"
 # 2. options for each plugin in seperate section below

 #plugin="@pkglibdir@/ulogd_inppkt_NFLOG.so"
-#plugin="@pkglibdir@/ulogd_inppkt_ULOG.so"
 #plugin="@pkglibdir@/ulogd_inppkt_UNIXSOCK.so"
 #plugin="@pkglibdir@/ulogd_inpflow_NFCT.so"
 #plugin="@pkglibdir@/ulogd_filter_IFINDEX.so"
@@ -58,9 +57,6 @@ logfile="/var/log/ulogd.log"
 # this is a stack for packet-based logging via LOGEMU
 #stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU

-# this is a stack for ULOG packet-based logging via LOGEMU
-#stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
-
 # this is a stack for packet-based logging via LOGEMU with filtering on MARK
 #stack=log2:NFLOG,base1:BASE,mark1:MARK,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU

@@ -175,11 +171,6 @@ numeric_label=1 # you can label the log info based on the packet verdict
 #netlink_socket_buffer_maxsize=1085440
 #bind=1

-[ulog1]
-# netlink multicast group (the same as the iptables --ulog-nlgroup param)
-nlgroup=1
-#numeric_label=0 # optional argument
-
 [nuauth1]
 socket_path="/tmp/nuauth_ulogd2.sock"

--
2.49.0

[PATCH ulogd2 2/2] ulogd: remove libipulog

[Corubba Smith]

The ULOG target was removed from linux kernel with 7200135bc1e6
("netfilter: kill ulog targets") aka v3.17, so remove the userspace
library for it. libnetfilter_log provides the same functionality for
NFLOG, and also a compatibility layer to use NFLOG through the libipulog
api.

Signed-off-by: Corubba Smith <corubba@gmx.de>
---
 Makefile.am                              |   2 +-
 configure.ac                             |   3 -
 include/Makefile.am                      |   2 +-
 include/libipulog/Makefile.am            |   1 -
 include/libipulog/libipulog.h            |  57 -----
 include/linux/Makefile.am                |   3 +-
 include/linux/netfilter_ipv4/Makefile.am |   1 -
 include/linux/netfilter_ipv4/ipt_ULOG.h  |  49 -----
 libipulog/Makefile.am                    |   5 -
 libipulog/libipulog.c                    | 260 -----------------------
 libipulog/ulog_test.c                    |  83 --------
 11 files changed, 3 insertions(+), 463 deletions(-)
 delete mode 100644 include/libipulog/Makefile.am
 delete mode 100644 include/libipulog/libipulog.h
 delete mode 100644 include/linux/netfilter_ipv4/Makefile.am
 delete mode 100644 include/linux/netfilter_ipv4/ipt_ULOG.h
 delete mode 100644 libipulog/Makefile.am
 delete mode 100644 libipulog/libipulog.c
 delete mode 100644 libipulog/ulog_test.c

diff --git a/Makefile.am b/Makefile.am
index bf390a4..b8d8db3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = include libipulog src input filter output
+SUBDIRS = include src input filter output

 ACLOCAL_AMFLAGS = -I m4

diff --git a/configure.ac b/configure.ac
index dca8a2a..c4a84f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -246,16 +246,13 @@ AC_CONFIG_FILES([Makefile
 		 filter/Makefile
 		 filter/raw2packet/Makefile
 		 include/Makefile
-		 include/libipulog/Makefile
 		 include/linux/Makefile
 		 include/linux/netfilter/Makefile
-		 include/linux/netfilter_ipv4/Makefile
 		 include/ulogd/Makefile
 		 input/Makefile
 		 input/flow/Makefile
 		 input/packet/Makefile
 		 input/sum/Makefile
-		 libipulog/Makefile
 		 output/Makefile
 		 output/dbi/Makefile
 		 output/ipfix/Makefile
diff --git a/include/Makefile.am b/include/Makefile.am
index c62b497..49b5697 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1 +1 @@
-SUBDIRS = ulogd libipulog linux
+SUBDIRS = ulogd linux
diff --git a/include/libipulog/Makefile.am b/include/libipulog/Makefile.am
deleted file mode 100644
index 80d16b1..0000000
--- a/include/libipulog/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-noinst_HEADERS = libipulog.h
diff --git a/include/libipulog/libipulog.h b/include/libipulog/libipulog.h
deleted file mode 100644
index 21b4315..0000000
--- a/include/libipulog/libipulog.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef _LIBIPULOG_H
-#define _LIBIPULOG_H
-
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-#include <stdint.h>
-#include <linux/netlink.h>
-#include <net/if.h>
-#include <linux/netfilter_ipv4/ipt_ULOG.h>
-
-/* FIXME: glibc sucks */
-#ifndef MSG_TRUNC
-#define MSG_TRUNC	0x20
-#endif
-
-struct ipulog_handle;
-extern int ipulog_errno;
-
-uint32_t ipulog_group2gmask(uint32_t group);
-
-struct ipulog_handle *ipulog_create_handle(uint32_t gmask, uint32_t rmem);
-
-void ipulog_destroy_handle(struct ipulog_handle *h);
-
-ssize_t ipulog_read(struct ipulog_handle *h,
-		    unsigned char *buf, size_t len);
-
-ulog_packet_msg_t *ipulog_get_packet(struct ipulog_handle *h,
-				     const unsigned char *buf,
-				     size_t len);
-
-char *ipulog_strerror(int errcode);
-
-int ipulog_get_fd(struct ipulog_handle *h);
-
-void ipulog_perror(const char *s);
-
-enum
-{
-	IPULOG_ERR_NONE = 0,
-	IPULOG_ERR_IMPL,
-	IPULOG_ERR_HANDLE,
-	IPULOG_ERR_SOCKET,
-	IPULOG_ERR_BIND,
-	IPULOG_ERR_RECVBUF,
-	IPULOG_ERR_RECV,
-	IPULOG_ERR_NLEOF,
-	IPULOG_ERR_TRUNC,
-	IPULOG_ERR_INVGR,
-	IPULOG_ERR_INVNL,
-};
-#define IPULOG_MAXERR IPULOG_ERR_INVNL
-
-#endif /* _LIBULOG_H */
diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
index 18af1c2..38eb109 100644
--- a/include/linux/Makefile.am
+++ b/include/linux/Makefile.am
@@ -1,2 +1 @@
-SUBDIRS = netfilter		\
-	  netfilter_ipv4
+SUBDIRS = netfilter
diff --git a/include/linux/netfilter_ipv4/Makefile.am b/include/linux/netfilter_ipv4/Makefile.am
deleted file mode 100644
index 41819a3..0000000
--- a/include/linux/netfilter_ipv4/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-noinst_HEADERS = ipt_ULOG.h
diff --git a/include/linux/netfilter_ipv4/ipt_ULOG.h b/include/linux/netfilter_ipv4/ipt_ULOG.h
deleted file mode 100644
index 417aad2..0000000
--- a/include/linux/netfilter_ipv4/ipt_ULOG.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Header file for IP tables userspace logging, Version 1.8
- *
- * (C) 2000-2002 by Harald Welte <laforge@gnumonks.org>
- *
- * Distributed under the terms of GNU GPL */
-
-#ifndef _IPT_ULOG_H
-#define _IPT_ULOG_H
-
-#ifndef NETLINK_NFLOG
-#define NETLINK_NFLOG 	5
-#endif
-
-#define ULOG_DEFAULT_NLGROUP	1
-#define ULOG_DEFAULT_QTHRESHOLD	1
-
-#define ULOG_MAC_LEN	80
-#define ULOG_PREFIX_LEN	32
-
-#define ULOG_MAX_QLEN	50
-/* Why 50? Well... there is a limit imposed by the slab cache 131000
- * bytes. So the multipart netlink-message has to be < 131000 bytes.
- * Assuming a standard ethernet-mtu of 1500, we could define this up
- * to 80... but even 50 seems to be big enough. */
-
-/* private data structure for each rule with a ULOG target */
-struct ipt_ulog_info {
-	unsigned int nl_group;
-	size_t copy_range;
-	size_t qthreshold;
-	char prefix[ULOG_PREFIX_LEN];
-};
-
-/* Format of the ULOG packets passed through netlink */
-typedef struct ulog_packet_msg {
-	unsigned long mark;
-	long timestamp_sec;
-	long timestamp_usec;
-	unsigned int hook;
-	char indev_name[IFNAMSIZ];
-	char outdev_name[IFNAMSIZ];
-	size_t data_len;
-	char prefix[ULOG_PREFIX_LEN];
-	unsigned char mac_len;
-	unsigned char mac[ULOG_MAC_LEN];
-	unsigned char payload[0];
-} ulog_packet_msg_t;
-
-#endif /*_IPT_ULOG_H*/
diff --git a/libipulog/Makefile.am b/libipulog/Makefile.am
deleted file mode 100644
index 708975a..0000000
--- a/libipulog/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-include $(top_srcdir)/Make_global.am
-
-noinst_LTLIBRARIES = libipulog.la
-
-libipulog_la_SOURCES = libipulog.c
diff --git a/libipulog/libipulog.c b/libipulog/libipulog.c
deleted file mode 100644
index b49f7f2..0000000
--- a/libipulog/libipulog.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * libipulog.c
- *
- * netfilter ULOG userspace library.
- *
- * (C) 2000-2001 by Harald Welte <laforge@gnumonks.org>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2
- *  as published by the Free Software Foundation
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * This library is still under development, so be aware of sudden interface
- * changes
- *
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <net/if.h>
-#include <libipulog/libipulog.h>
-
-struct ipulog_handle
-{
-	int fd;
-	uint8_t blocking;
-	struct sockaddr_nl local;
-	struct sockaddr_nl peer;
-	struct nlmsghdr* last_nlhdr;
-};
-
-/* internal */
-
-
-int ipulog_errno = IPULOG_ERR_NONE;
-
-struct ipulog_errmap_t
-{
-	int errcode;
-	char *message;
-} ipulog_errmap[] =
-{
-	{ IPULOG_ERR_NONE, "No error" },
-	{ IPULOG_ERR_IMPL, "Not implemented yet" },
-	{ IPULOG_ERR_HANDLE, "Unable to create netlink handle" },
-	{ IPULOG_ERR_SOCKET, "Unable to create netlink socket" },
-	{ IPULOG_ERR_BIND, "Unable to bind netlink socket" },
-	{ IPULOG_ERR_RECVBUF, "Receive buffer size invalid" },
-	{ IPULOG_ERR_RECV, "Error during netlink receive" },
-	{ IPULOG_ERR_NLEOF, "Received EOF on netlink socket" },
-	{ IPULOG_ERR_TRUNC, "Receive message truncated" },
-	{ IPULOG_ERR_INVGR, "Invalid group specified" },
-	{ IPULOG_ERR_INVNL, "Invalid netlink message" },
-};
-
-static ssize_t
-ipulog_netlink_recvfrom(const struct ipulog_handle *h,
-			unsigned char *buf, size_t len)
-{
-	socklen_t addrlen;
-	int status;
-	struct nlmsghdr *nlh;
-
-	if (len < sizeof(struct nlmsgerr)) {
-		ipulog_errno = IPULOG_ERR_RECVBUF;
-		return -1;
-	}
-	addrlen = sizeof(h->peer);
-	status = recvfrom(h->fd, buf, len, 0, (struct sockaddr *)&h->peer,
-			&addrlen);
-	if (status < 0) {
-		ipulog_errno = IPULOG_ERR_RECV;
-		return status;
-	}
-	if (addrlen != sizeof (h->peer)) {
-		ipulog_errno = IPULOG_ERR_RECV;
-		return -1;
-	}
-	if (h->peer.nl_pid != 0) {
-		ipulog_errno = IPULOG_ERR_RECV;
-		return -1;
-	}
-	if (status == 0) {
-		ipulog_errno = IPULOG_ERR_NLEOF;
-		return -1;
-	}
-	nlh = (struct nlmsghdr *)buf;
-	if (nlh->nlmsg_flags & MSG_TRUNC || (size_t) status > len) {
-		ipulog_errno = IPULOG_ERR_TRUNC;
-		return -1;
-	}
-	return status;
-}
-
-/* public */
-
-char *ipulog_strerror(int errcode)
-{
-	if (errcode < 0 || errcode > IPULOG_MAXERR)
-		errcode = IPULOG_ERR_IMPL;
-	return ipulog_errmap[errcode].message;
-}
-
-/* convert a netlink group (1-32) to a group_mask suitable for create_handle */
-uint32_t ipulog_group2gmask(uint32_t group)
-{
-	if (group < 1 || group > 32)
-	{
-		ipulog_errno = IPULOG_ERR_INVGR;
-		return 0;
-	}
-	return (1 << (group - 1));
-}
-
-/* create a ipulog handle for the reception of packets sent to gmask */
-struct ipulog_handle *ipulog_create_handle(uint32_t gmask,
-					   uint32_t rcvbufsize)
-{
-	struct ipulog_handle *h;
-	int status;
-
-	h = (struct ipulog_handle *) malloc(sizeof(struct ipulog_handle));
-	if (h == NULL)
-	{
-		ipulog_errno = IPULOG_ERR_HANDLE;
-		return NULL;
-	}
-	memset(h, 0, sizeof(struct ipulog_handle));
-	h->fd = socket(PF_NETLINK, SOCK_RAW, NETLINK_NFLOG);
-	if (h->fd == -1)
-	{
-		ipulog_errno = IPULOG_ERR_SOCKET;
-		close(h->fd);
-		free(h);
-		return NULL;
-	}
-	memset(&h->local, 0, sizeof(struct sockaddr_nl));
-	h->local.nl_family = AF_NETLINK;
-	h->local.nl_pid = getpid();
-	h->local.nl_groups = gmask;
-	status = bind(h->fd, (struct sockaddr *)&h->local, sizeof(h->local));
-	if (status == -1)
-	{
-		ipulog_errno = IPULOG_ERR_BIND;
-		close(h->fd);
-		free(h);
-		return NULL;
-	}
-	memset(&h->peer, 0, sizeof(struct sockaddr_nl));
-	h->peer.nl_family = AF_NETLINK;
-	h->peer.nl_pid = 0;
-	h->peer.nl_groups = gmask;
-
-	status = setsockopt(h->fd, SOL_SOCKET, SO_RCVBUF, &rcvbufsize,
-			    sizeof(rcvbufsize));
-	if (status == -1)
-	{
-		ipulog_errno = IPULOG_ERR_RECVBUF;
-		close(h->fd);
-		free(h);
-		return NULL;
-	}
-
-	return h;
-}
-
-/* destroy a ipulog handle */
-void ipulog_destroy_handle(struct ipulog_handle *h)
-{
-	close(h->fd);
-	free(h);
-}
-
-#if 0
-int ipulog_set_mode()
-{
-}
-#endif
-
-/* do a BLOCKING read on an ipulog handle */
-ssize_t ipulog_read(struct ipulog_handle *h, unsigned char *buf,
-		    size_t len)
-{
-	return ipulog_netlink_recvfrom(h, buf, len);
-}
-
-/* get a pointer to the actual start of the ipulog packet,
-   use this to strip netlink header */
-ulog_packet_msg_t *ipulog_get_packet(struct ipulog_handle *h,
-				     const unsigned char *buf,
-				     size_t len)
-{
-	struct nlmsghdr *nlh;
-	size_t remain_len;
-
-	/* if last header in handle not inside this buffer,
-	 * drop reference to last header */
-	if ((unsigned char *)h->last_nlhdr > (buf + len) ||
-	    (unsigned char *)h->last_nlhdr < buf) {
-		h->last_nlhdr = NULL;
-	}
-
-	if (!h->last_nlhdr) {
-		/* fist message in buffer */
-		nlh = (struct nlmsghdr *) buf;
-		if (!NLMSG_OK(nlh, len)) {
-			/* ERROR */
-			ipulog_errno = IPULOG_ERR_INVNL;
-			return NULL;
-		}
-	} else {
-		/* we are in n-th part of multilink message */
-		if (h->last_nlhdr->nlmsg_type == NLMSG_DONE ||
-		    !(h->last_nlhdr->nlmsg_flags & NLM_F_MULTI)) {
-			/* if last part in multilink message,
-			 * or no multipart message at all: return */
-			h->last_nlhdr = NULL;
-			return NULL;
-		}
-
-		/* calculate remaining lenght from lasthdr to end of buffer */
-		remain_len = (len -
-				((unsigned char *)h->last_nlhdr - buf));
-		nlh = NLMSG_NEXT(h->last_nlhdr, remain_len);
-	}
-
-	h->last_nlhdr = nlh;
-
-	return NLMSG_DATA(nlh);
-}
-
-/* print a human readable description of the last error to stderr */
-void ipulog_perror(const char *s)
-{
-	if (s)
-		fputs(s, stderr);
-	else
-		fputs("ERROR", stderr);
-	if (ipulog_errno)
-		fprintf(stderr, ": %s", ipulog_strerror(ipulog_errno));
-	if (errno)
-		fprintf(stderr, ": %s", strerror(errno));
-	fputc('\n', stderr);
-}
-
-int ipulog_get_fd(struct ipulog_handle *h)
-{
-	return h->fd;
-}
-
diff --git a/libipulog/ulog_test.c b/libipulog/ulog_test.c
deleted file mode 100644
index 0665717..0000000
--- a/libipulog/ulog_test.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ulog_test
- *
- * small testing program for libipulog, part of the netfilter ULOG target
- * for the linux 2.4 netfilter subsystem.
- *
- * (C) 2000 by Harald Welte <laforge@gnumonks.org>
- *
- * this code is released under the terms of GNU GPL
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <libipulog/libipulog.h>
-
-#define MYBUFSIZ 2048
-
-/* prints some logging about a single packet */
-void handle_packet(ulog_packet_msg_t *pkt)
-{
-	unsigned char *p;
-	int i;
-
-	printf("Hook=%u Mark=%lu len=%d ",
-	       pkt->hook, pkt->mark, pkt->data_len);
-	if (strlen(pkt->prefix))
-		printf("Prefix=%s ", pkt->prefix);
-
-	if (pkt->mac_len)
-	{
-		printf("mac=");
-		p = pkt->mac;
-		for (i = 0; i < pkt->mac_len; i++, p++)
-			printf("%02x%c", *p, i==pkt->mac_len-1 ? ' ':':');
-	}
-	printf("\n");
-
-}
-
-int main(int argc, char *argv[])
-{
-	struct ipulog_handle *h;
-	unsigned char* buf;
-	int len;
-	ulog_packet_msg_t *upkt;
-	int i;
-
-	if (argc != 4) {
-		fprintf(stderr, "Usage: %s count group timeout\n", argv[0]);
-		exit(1);
-	}
-
-	/* allocate a receive buffer */
-	buf = (unsigned char *) malloc(MYBUFSIZ);
-
-	/* create ipulog handle */
-	h = ipulog_create_handle(ipulog_group2gmask(atoi(argv[2])));
-	if (!h)
-	{
-		/* if some error occurrs, print it to stderr */
-		ipulog_perror(NULL);
-		exit(1);
-	}
-
-	alarm(atoi(argv[3]));
-
-	/* loop receiving packets and handling them over to handle_packet */
-	for (i = 0; i < atoi(argv[1]); i++) {
-		len = ipulog_read(h, buf, MYBUFSIZ);
-		if (len <= 0) {
-			ipulog_perror("ulog_test: short read");
-			exit(1);
-		}
-		printf("%d bytes received\n", len);
-		while (upkt = ipulog_get_packet(h, buf, len)) {
-			handle_packet(upkt);
-		}
-	}
-
-	/* just to give it a cleaner look */
-	ipulog_destroy_handle(h);
-	return 0;
-}
--
2.49.0

Re: [PATCH ulogd2 1/2] ulog: remove input plugin

[Florian Westphal]

Corubba Smith <corubba@gmx.de> wrote:
> The ULOG target was removed from the linux kernel with 7200135bc1e6
> ("netfilter: kill ulog targets") aka v3.17, so remove the input plugin
> for it. It's successor NFLOG should be used instead, which has its own
> input plugin.

Your email client is reformattig parts of the diff:
% git am ~/Downloads/ulogd2-1-2-ulog-remove-input-plugin.patch
Applying: ulog: remove input plugin
error: patch failed: doc/ulogd.sgml:132
error: doc/ulogd.sgml: patch does not apply
Patch failed at 0001 ulog: remove input plugin
hint: Use 'git am --show-current-patch=diff' to see the failed patch

https://patchwork.ozlabs.org/project/netfilter-devel/patch/23db0352-9525-427b-a936-c8ef87e4d5b7@gmx.de/

Can you send the pach to yourself and make sure "git am" can apply it
again?

Thanks.

Re: [PATCH ulogd2 1/2] ulog: remove input plugin

[Florian Westphal]

Florian Westphal <fw@strlen.de> wrote:
> Corubba Smith <corubba@gmx.de> wrote:
> > The ULOG target was removed from the linux kernel with 7200135bc1e6
> > ("netfilter: kill ulog targets") aka v3.17, so remove the input plugin
> > for it. It's successor NFLOG should be used instead, which has its own
> > input plugin.
> 
> Your email client is reformattig parts of the diff:
> % git am ~/Downloads/ulogd2-1-2-ulog-remove-input-plugin.patch
> Applying: ulog: remove input plugin
> error: patch failed: doc/ulogd.sgml:132
> error: doc/ulogd.sgml: patch does not apply
> Patch failed at 0001 ulog: remove input plugin
> hint: Use 'git am --show-current-patch=diff' to see the failed patch

I resolved the conflicts locally and applied the patches, please
double check that I did not miss anything.

> https://patchwork.ozlabs.org/project/netfilter-devel/patch/23db0352-9525-427b-a936-c8ef87e4d5b7@gmx.de/
> 
> Can you send the pach to yourself and make sure "git am" can apply it
> again?

FWIW, it looks like something in the delivery path removes trailing
spaces, turning "some line \n" into "some line\n" which will make git-am
fail as intree and diff don't match.

Re: [PATCH ulogd2 1/2] ulog: remove input plugin

[Corubba Smith]

On 3/29/25 15:00, Florian Westphal wrote:
> Florian Westphal <fw@strlen.de> wrote:
>> Corubba Smith <corubba@gmx.de> wrote:
>>> The ULOG target was removed from the linux kernel with 7200135bc1e6
>>> ("netfilter: kill ulog targets") aka v3.17, so remove the input plugin
>>> for it. It's successor NFLOG should be used instead, which has its own
>>> input plugin.
>>
>> Your email client is reformattig parts of the diff:
>> % git am ~/Downloads/ulogd2-1-2-ulog-remove-input-plugin.patch
>> Applying: ulog: remove input plugin
>> error: patch failed: doc/ulogd.sgml:132
>> error: doc/ulogd.sgml: patch does not apply
>> Patch failed at 0001 ulog: remove input plugin
>> hint: Use 'git am --show-current-patch=diff' to see the failed patch
>
> I resolved the conflicts locally and applied the patches, please
> double check that I did not miss anything.
>
>> https://patchwork.ozlabs.org/project/netfilter-devel/patch/23db0352-9525-427b-a936-c8ef87e4d5b7@gmx.de/
>>
>> Can you send the pach to yourself and make sure "git am" can apply it
>> again?
>
> FWIW, it looks like something in the delivery path removes trailing
> spaces, turning "some line \n" into "some line\n" which will make git-am
> fail as intree and diff don't match.
>

It appears that my mail provider *sometimes* converts to a different
Content-Transfer-Encoding, and in the process removes trailing
whitespace. Apologies for that, and thank you for the feedback as well
as resolving it on your end. I will look into preventing that from
happening again.

`git diff HEAD..origin/master` shows no difference between my original
local branch and the updated remote branch, so from my point of view
the patchset was applied as intended and there's nothing missing or
extra.