Skip to contentSkip to conversation

remove ip{,6}_queue

PATCH In review Adrian Bunk 3 participants 3 messages Dec 1, 2006 – Dec 2, 2006

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 remove ip{,6}_queue

This patch removes ip{,6}_queue that were scheduled for removal in mid-2005.

---

 Documentation/feature-removal-schedule.txt |   12 
 Documentation/networking/ip-sysctl.txt     |    1 
 include/linux/netfilter_ipv4/Kbuild        |    1 
 include/linux/netfilter_ipv4/ip_queue.h    |   72 --
 include/linux/netlink.h                    |    4 
 net/core/dev.c                             |    2 
 net/ipv4/netfilter/Kconfig                 |   12 
 net/ipv4/netfilter/Makefile                |    2 
 net/ipv4/netfilter/ip_queue.c              |  742 ---------------------
 net/ipv6/netfilter/Kconfig                 |   20 
 net/ipv6/netfilter/Makefile                |    1 
 net/ipv6/netfilter/ip6_queue.c             |  729 --------------------
 security/selinux/hooks.c                   |    4 
 security/selinux/nlmsgtab.c                |   13 
 14 files changed, 2 insertions(+), 1613 deletions(-)
Documentation/feature-removal-schedule.txt renamed from Documentation/feature-removal-schedule.txt.old +0 -12
@@ -97,18 +97,6 @@
 
 ---------------------------
 
-What:	ip_queue and ip6_queue (old ipv4-only and ipv6-only netfilter queue)
-When:	December 2005
-Why:	This interface has been obsoleted by the new layer3-independent
-	"nfnetlink_queue".  The Kernel interface is compatible, so the old
-	ip[6]tables "QUEUE" targets still work and will transparently handle
-	all packets into nfnetlink queue number 0.  Userspace users will have
-	to link against API-compatible library on top of libnfnetlink_queue 
-	instead of the current 'libipq'.
-Who:	Harald Welte <[email protected]>
-
----------------------------
-
 What:	remove EXPORT_SYMBOL(kernel_thread)
 When:	August 2006
 Files:	arch/*/kernel/*_ksyms.c
net/ipv4/netfilter/Kconfig renamed from net/ipv4/netfilter/Kconfig.old +0 -12
@@ -215,18 +215,6 @@
 
 	  To compile it as a module, choose M here.  If unsure, say Y.
 
-config IP_NF_QUEUE
-	tristate "IP Userspace queueing via NETLINK (OBSOLETE)"
-	help
-	  Netfilter has the ability to queue packets to user space: the
-	  netlink device can be used to access them using this driver.
-
-	  This option enables the old IPv4-only "ip_queue" implementation
-	  which has been obsoleted by the new "nfnetlink_queue" code (see
-	  CONFIG_NETFILTER_NETLINK_QUEUE).
-
-	  To compile it as a module, choose M here.  If unsure, say N.
-
 config IP_NF_IPTABLES
 	tristate "IP tables support (required for filtering/masq/NAT)"
 	depends on NETFILTER_XTABLES
net/ipv4/netfilter/Makefile renamed from net/ipv4/netfilter/Makefile.old +0 -2
@@ -85,8 +85,6 @@
 # just filtering instance of ARP tables for now
 obj-$(CONFIG_IP_NF_ARPFILTER) += arptable_filter.o
 
-obj-$(CONFIG_IP_NF_QUEUE) += ip_queue.o
-
 # objects for l3 independent conntrack
 nf_conntrack_ipv4-objs  :=  nf_conntrack_l3proto_ipv4.o nf_conntrack_proto_icmp.o
 
net/ipv6/netfilter/Kconfig renamed from net/ipv6/netfilter/Kconfig.old +0 -20
@@ -19,26 +19,6 @@
 
 	  To compile it as a module, choose M here.  If unsure, say N.
 
-config IP6_NF_QUEUE
-	tristate "IP6 Userspace queueing via NETLINK (OBSOLETE)"
-	---help---
-
-	  This option adds a queue handler to the kernel for IPv6
-	  packets which enables users to receive the filtered packets
-	  with QUEUE target using libipq.
-
-	  THis option enables the old IPv6-only "ip6_queue" implementation
-	  which has been obsoleted by the new "nfnetlink_queue" code (see
-	  CONFIG_NETFILTER_NETLINK_QUEUE).
-
-	  (C) Fernando Anton 2001
-	  IPv64 Project - Work based in IPv64 draft by Arturo Azcorra.
-	  Universidad Carlos III de Madrid
-	  Universidad Politecnica de Alcala de Henares
-	  email: <[email protected]>.
-
-	  To compile it as a module, choose M here.  If unsure, say N.
-
 config IP6_NF_IPTABLES
 	tristate "IP6 tables support (required for filtering)"
 	depends on NETFILTER_XTABLES
net/ipv6/netfilter/Makefile renamed from net/ipv6/netfilter/Makefile.old +0 -1
@@ -14,7 +14,6 @@
 obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o
 obj-$(CONFIG_IP6_NF_MANGLE) += ip6table_mangle.o
 obj-$(CONFIG_IP6_NF_TARGET_HL) += ip6t_HL.o
-obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
 obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o
 obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o
 obj-$(CONFIG_IP6_NF_MATCH_HL) += ip6t_hl.o
Documentation/networking/ip-sysctl.txt renamed from Documentation/networking/ip-sysctl.txt.old +0 -1
@@ -977,7 +977,6 @@
 discovery_slots FIXME
 discovery_timeout FIXME
 fast_poll_increase FIXME
-ip6_queue_maxlen FIXME
 lap_keepalive_time FIXME
 lo_cong FIXME
 max_baud_rate FIXME
include/linux/netlink.h renamed from include/linux/netlink.h.old +2 -2
@@ -7,7 +7,7 @@
 #define NETLINK_ROUTE		0	/* Routing/device hook				*/
 #define NETLINK_UNUSED		1	/* Unused number				*/
 #define NETLINK_USERSOCK	2	/* Reserved for user mode socket protocols 	*/
-#define NETLINK_FIREWALL	3	/* Firewalling hook				*/
+/*  NETLINK_FIREWALL was	3	 Firewalling hook  */
 #define NETLINK_INET_DIAG	4	/* INET socket monitoring			*/
 #define NETLINK_NFLOG		5	/* netfilter/iptables ULOG */
 #define NETLINK_XFRM		6	/* ipsec */
@@ -17,7 +17,7 @@
 #define NETLINK_FIB_LOOKUP	10	
 #define NETLINK_CONNECTOR	11
 #define NETLINK_NETFILTER	12	/* netfilter subsystem */
-#define NETLINK_IP6_FW		13
+/*  NETLINK_IP6_FW was		13  */
 #define NETLINK_DNRTMSG		14	/* DECnet routing messages */
 #define NETLINK_KOBJECT_UEVENT	15	/* Kernel messages to userspace */
 #define NETLINK_GENERIC		16
security/selinux/hooks.c renamed from security/selinux/hooks.c.old +0 -4
@@ -762,8 +762,6 @@
 		switch (protocol) {
 		case NETLINK_ROUTE:
 			return SECCLASS_NETLINK_ROUTE_SOCKET;
-		case NETLINK_FIREWALL:
-			return SECCLASS_NETLINK_FIREWALL_SOCKET;
 		case NETLINK_INET_DIAG:
 			return SECCLASS_NETLINK_TCPDIAG_SOCKET;
 		case NETLINK_NFLOG:
@@ -774,8 +772,6 @@
 			return SECCLASS_NETLINK_SELINUX_SOCKET;
 		case NETLINK_AUDIT:
 			return SECCLASS_NETLINK_AUDIT_SOCKET;
-		case NETLINK_IP6_FW:
-			return SECCLASS_NETLINK_IP6FW_SOCKET;
 		case NETLINK_DNRTMSG:
 			return SECCLASS_NETLINK_DNRT_SOCKET;
 		case NETLINK_KOBJECT_UEVENT:
security/selinux/nlmsgtab.c renamed from security/selinux/nlmsgtab.c.old +0 -13
@@ -15,7 +15,6 @@
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 #include <linux/if.h>
-#include <linux/netfilter_ipv4/ip_queue.h>
 #include <linux/inet_diag.h>
 #include <linux/xfrm.h>
 #include <linux/audit.h>
@@ -66,12 +65,6 @@
 	{ RTM_SETNEIGHTBL,	NETLINK_ROUTE_SOCKET__NLMSG_WRITE },
 };
 
-static struct nlmsg_perm nlmsg_firewall_perms[] =
-{
-	{ IPQM_MODE,		NETLINK_FIREWALL_SOCKET__NLMSG_WRITE },
-	{ IPQM_VERDICT,		NETLINK_FIREWALL_SOCKET__NLMSG_WRITE },
-};
-
 static struct nlmsg_perm nlmsg_tcpdiag_perms[] =
 {
 	{ TCPDIAG_GETSOCK,	NETLINK_TCPDIAG_SOCKET__NLMSG_READ },
@@ -137,12 +130,6 @@
 				 sizeof(nlmsg_route_perms));
 		break;
 
-	case SECCLASS_NETLINK_FIREWALL_SOCKET:
-	case SECCLASS_NETLINK_IP6FW_SOCKET:
-		err = nlmsg_perm(nlmsg_type, perm, nlmsg_firewall_perms,
-				 sizeof(nlmsg_firewall_perms));
-		break;
-
 	case SECCLASS_NETLINK_TCPDIAG_SOCKET:
 		err = nlmsg_perm(nlmsg_type, perm, nlmsg_tcpdiag_perms,
 				 sizeof(nlmsg_tcpdiag_perms));
include/linux/netfilter_ipv4/Kbuild renamed from include/linux/netfilter_ipv4/Kbuild.old +0 -1
@@ -59,5 +59,4 @@
 unifdef-y += ip_conntrack_tuple.h
 unifdef-y += ip_nat.h
 unifdef-y += ip_nat_rule.h
-unifdef-y += ip_queue.h
 unifdef-y += ip_tables.h
net/core/dev.c renamed from net/core/dev.c.old +0 -2
@@ -3560,8 +3560,6 @@
 EXPORT_SYMBOL(synchronize_net);
 EXPORT_SYMBOL(unregister_netdevice);
 EXPORT_SYMBOL(unregister_netdevice_notifier);
-EXPORT_SYMBOL(net_enable_timestamp);
-EXPORT_SYMBOL(net_disable_timestamp);
 EXPORT_SYMBOL(dev_get_flags);
 
 #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
include/linux/netfilter_ipv4/ip_queue.h deleted +0 -72

72 lines not on this page · raw message

net/ipv4/netfilter/ip_queue.c deleted +0 -742

742 lines not on this page · raw message

net/ipv6/netfilter/ip6_queue.c deleted +0 -729

729 lines not on this page · raw message

#1 lore raw
Quoted 2 lines · Adrian Bunk

This patch removes ip{,6}_queue that were scheduled for removal in mid-2005.

Thanks for the reminder, I forgot to remove the feature-removal-schedule entry last time you asked.

We really can't remove ip_queue. Many users use this, there is no binary compatible interface and even the compat replacement for the originally statically linked library doesn't work. There is also no real necessity to remove the code, so the feature-removal-schedule entry should be removed instead.

Dave, please apply this patch. Thanks.

Documentation/feature-removal-schedule.txt +0 -12
index b3949cd..8244716 100644
@@ -70,18 +70,6 @@ Who:	Dominik Brodowski <[email protected]>
 
 ---------------------------
 
-What:	ip_queue and ip6_queue (old ipv4-only and ipv6-only netfilter queue)
-When:	December 2005
-Why:	This interface has been obsoleted by the new layer3-independent
-	"nfnetlink_queue".  The Kernel interface is compatible, so the old
-	ip[6]tables "QUEUE" targets still work and will transparently handle
-	all packets into nfnetlink queue number 0.  Userspace users will have
-	to link against API-compatible library on top of libnfnetlink_queue 
-	instead of the current 'libipq'.
-Who:	Harald Welte <[email protected]>
-
----------------------------
-
 What:	remove EXPORT_SYMBOL(kernel_thread)
 When:	August 2006
 Files:	arch/*/kernel/*_ksyms.c
maintainer
#2 lore raw

From: Patrick McHardy <[email protected]>
Date: Sat, 02 Dec 2006 00:21:54 +0100

Quoted 7 lines

We really can't remove ip_queue. Many users use this, there is no binary compatible interface and even the compat replacement for the originally statically linked library doesn't work. There is also no real necessity to remove the code, so the feature-removal-schedule entry should be removed instead.

Dave, please apply this patch. Thanks.

Done, thanks.