netfilter: remove ip_queue support (d16cf20e) · Commits · 戴 / test

Documentation/ABI/removed/ip_queue

0 → 100644

+9 −0

Original line number	Diff line number	Diff line
		What: ip_queue
		Date: finally removed in kernel v3.5.0
		Contact: Pablo Neira Ayuso <pablo@netfilter.org>
		Description:
		ip_queue has been replaced by nfnetlink_queue which provides
		more advanced queueing mechanism to user-space. The ip_queue
		module was already announced to become obsolete years ago.

		Users:

include/linux/netfilter_ipv4/Kbuild

+0 −1

Original line number	Diff line number	Diff line
		header-y += ip_queue.h
		header-y += ip_tables.h
		header-y += ipt_CLUSTERIP.h
		header-y += ipt_ECN.h

include/linux/netfilter_ipv4/ip_queue.h

deleted100644 → 0

+0 −72

Original line number	Diff line number	Diff line
		/*
		* This is a module which is used for queueing IPv4 packets and
		* communicating with userspace via netlink.
		*
		* (C) 2000 James Morris, this code is GPL.
		*/
		#ifndef _IP_QUEUE_H
		#define _IP_QUEUE_H

		#ifdef __KERNEL__
		#ifdef DEBUG_IPQ
		#define QDEBUG(x...) printk(KERN_DEBUG ## x)
		#else
		#define QDEBUG(x...)
		#endif /* DEBUG_IPQ */
		#else
		#include <net/if.h>
		#endif /* ! __KERNEL__ */

		/* Messages sent from kernel */
		typedef struct ipq_packet_msg {
		unsigned long packet_id; /* ID of queued packet */
		unsigned long mark; /* Netfilter mark value */
		long timestamp_sec; /* Packet arrival time (seconds) */
		long timestamp_usec; /* Packet arrvial time (+useconds) */
		unsigned int hook; /* Netfilter hook we rode in on */
		char indev_name[IFNAMSIZ]; /* Name of incoming interface */
		char outdev_name[IFNAMSIZ]; /* Name of outgoing interface */
		__be16 hw_protocol; /* Hardware protocol (network order) */
		unsigned short hw_type; /* Hardware type */
		unsigned char hw_addrlen; /* Hardware address length */
		unsigned char hw_addr[8]; /* Hardware address */
		size_t data_len; /* Length of packet data */
		unsigned char payload[0]; /* Optional packet data */
		} ipq_packet_msg_t;

		/* Messages sent from userspace */
		typedef struct ipq_mode_msg {
		unsigned char value; /* Requested mode */
		size_t range; /* Optional range of packet requested */
		} ipq_mode_msg_t;

		typedef struct ipq_verdict_msg {
		unsigned int value; /* Verdict to hand to netfilter */
		unsigned long id; /* Packet ID for this verdict */
		size_t data_len; /* Length of replacement data */
		unsigned char payload[0]; /* Optional replacement packet */
		} ipq_verdict_msg_t;

		typedef struct ipq_peer_msg {
		union {
		ipq_verdict_msg_t verdict;
		ipq_mode_msg_t mode;
		} msg;
		} ipq_peer_msg_t;

		/* Packet delivery modes */
		enum {
		IPQ_COPY_NONE, /* Initial mode, packets are dropped */
		IPQ_COPY_META, /* Copy metadata */
		IPQ_COPY_PACKET /* Copy metadata + packet (range) */
		};
		#define IPQ_COPY_MAX IPQ_COPY_PACKET

		/* Types of messages */
		#define IPQM_BASE 0x10 /* standard netlink messages below this */
		#define IPQM_MODE (IPQM_BASE + 1) /* Mode request from peer */
		#define IPQM_VERDICT (IPQM_BASE + 2) /* Verdict from peer */
		#define IPQM_PACKET (IPQM_BASE + 3) /* Packet from kernel */
		#define IPQM_MAX (IPQM_BASE + 4)

		#endif /_IP_QUEUE_H/

include/linux/netlink.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 */
		#define NETLINK_FIREWALL 3 /* Unused number, formerly ip_queue */
		#define NETLINK_SOCK_DIAG 4 /* socket monitoring */
		#define NETLINK_NFLOG 5 /* netfilter/iptables ULOG */
		#define NETLINK_XFRM 6 /* ipsec */

net/ipv4/netfilter/Makefile

+0 −3

Original line number	Diff line number	Diff line
		@@ -66,6 +66,3 @@ obj-$(CONFIG_IP_NF_ARP_MANGLE) += arpt_mangle.o

		# just filtering instance of ARP tables for now
		obj-$(CONFIG_IP_NF_ARPFILTER) += arptable_filter.o

		obj-$(CONFIG_IP_NF_QUEUE) += ip_queue.o

Admin message