From 32233985f24df86c464426c7af5477b012935c46 Mon Sep 17 00:00:00 2001 From: Corubba Smith Date: Sat, 29 Mar 2025 12:08:55 +0100 Subject: ulogd: remove libipulog 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 Signed-off-by: Florian Westphal --- 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 --------------------------- 6 files changed, 2 insertions(+), 111 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 (limited to 'include') 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 -#include -#include -#include -#include -#include -#include -#include -#include - -/* 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 - * - * 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*/ -- cgit v1.2.3