From 9c4b9a1ca942ae933fe4693a25e2ddea873cc341 Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Thu, 13 Jan 2011 21:48:17 +0100 Subject: Separate prefixlens from ip_set core. Separate prefixlens from ip_set core for better readibility and honoring the independence. Also, comment that prefixlens were borrowed from Jan Engelhardt. --- kernel/include/linux/netfilter/ipset/ip_set.h | 9 --------- kernel/include/linux/netfilter/ipset/pfxlen.h | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 kernel/include/linux/netfilter/ipset/pfxlen.h (limited to 'kernel/include') diff --git a/kernel/include/linux/netfilter/ipset/ip_set.h b/kernel/include/linux/netfilter/ipset/ip_set.h index 72ff624..6644a4c 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set.h +++ b/kernel/include/linux/netfilter/ipset/ip_set.h @@ -491,15 +491,6 @@ bitmap_bytes(u32 a, u32 b) return 4 * ((((b - a + 8) / 8) + 3) / 4); } -/* Prefixlen maps */ -extern const union nf_inet_addr prefixlen_netmask_map[]; -extern const union nf_inet_addr prefixlen_hostmask_map[]; - -#define NETMASK(n) prefixlen_netmask_map[n].ip -#define NETMASK6(n) prefixlen_netmask_map[n].ip6 -#define HOSTMASK(n) prefixlen_hostmask_map[n].ip -#define HOSTMASK6(n) prefixlen_hostmask_map[n].ip6 - /* Interface to iptables/ip6tables */ #define SO_IP_SET 83 diff --git a/kernel/include/linux/netfilter/ipset/pfxlen.h b/kernel/include/linux/netfilter/ipset/pfxlen.h new file mode 100644 index 0000000..fe7153c --- /dev/null +++ b/kernel/include/linux/netfilter/ipset/pfxlen.h @@ -0,0 +1,16 @@ +#ifndef _PFXLEN_H +#define _PFXLEN_H + +#include +#include + +/* Prefixlen maps, by Jan Engelhardt */ +extern const union nf_inet_addr prefixlen_netmask_map[]; +extern const union nf_inet_addr prefixlen_hostmask_map[]; + +#define NETMASK(n) prefixlen_netmask_map[n].ip +#define NETMASK6(n) prefixlen_netmask_map[n].ip6 +#define HOSTMASK(n) prefixlen_hostmask_map[n].ip +#define HOSTMASK6(n) prefixlen_hostmask_map[n].ip6 + +#endif /*_PFXLEN_H */ -- cgit v1.2.3