Commit 35b8dcf8 authored by Jozsef Kadlecsik's avatar Jozsef Kadlecsik
Browse files

netfilter: ipset: Rename simple macro names to avoid namespace issues. 



Reported-by: default avatarDavid Laight <David.Laight@ACULAB.COM>
Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
parent a0f28dc7

include/linux/netfilter/ipset/ip_set.h

+3 −0
Original line number Diff line number Diff line
@@ -398,4 +398,7 @@ bitmap_bytes(u32 a, u32 b) 
	{ .bytes = ULLONG_MAX, .packets = ULLONG_MAX,	\

	  .timeout = (map)->timeout }



#define IPSET_CONCAT(a, b)		a##b

#define IPSET_TOKEN(a, b)		IPSET_CONCAT(a, b)



#endif /*_IP_SET_H */

net/netfilter/ipset/ip_set_bitmap_gen.h

+22 −25
Original line number Diff line number Diff line
@@ -8,31 +8,28 @@ 
#ifndef __IP_SET_BITMAP_IP_GEN_H

#define __IP_SET_BITMAP_IP_GEN_H



#define CONCAT(a, b)		a##b

#define TOKEN(a,b)		CONCAT(a, b)



#define mtype_do_test		TOKEN(MTYPE, _do_test)

#define mtype_gc_test		TOKEN(MTYPE, _gc_test)

#define mtype_is_filled		TOKEN(MTYPE, _is_filled)

#define mtype_do_add		TOKEN(MTYPE, _do_add)

#define mtype_do_del		TOKEN(MTYPE, _do_del)

#define mtype_do_list		TOKEN(MTYPE, _do_list)

#define mtype_do_head		TOKEN(MTYPE, _do_head)

#define mtype_adt_elem		TOKEN(MTYPE, _adt_elem)

#define mtype_add_timeout	TOKEN(MTYPE, _add_timeout)

#define mtype_gc_init		TOKEN(MTYPE, _gc_init)

#define mtype_kadt		TOKEN(MTYPE, _kadt)

#define mtype_uadt		TOKEN(MTYPE, _uadt)

#define mtype_destroy		TOKEN(MTYPE, _destroy)

#define mtype_flush		TOKEN(MTYPE, _flush)

#define mtype_head		TOKEN(MTYPE, _head)

#define mtype_same_set		TOKEN(MTYPE, _same_set)

#define mtype_elem		TOKEN(MTYPE, _elem)

#define mtype_test		TOKEN(MTYPE, _test)

#define mtype_add		TOKEN(MTYPE, _add)

#define mtype_del		TOKEN(MTYPE, _del)

#define mtype_list		TOKEN(MTYPE, _list)

#define mtype_gc		TOKEN(MTYPE, _gc)

#define mtype_do_test		IPSET_TOKEN(MTYPE, _do_test)

#define mtype_gc_test		IPSET_TOKEN(MTYPE, _gc_test)

#define mtype_is_filled		IPSET_TOKEN(MTYPE, _is_filled)

#define mtype_do_add		IPSET_TOKEN(MTYPE, _do_add)

#define mtype_do_del		IPSET_TOKEN(MTYPE, _do_del)

#define mtype_do_list		IPSET_TOKEN(MTYPE, _do_list)

#define mtype_do_head		IPSET_TOKEN(MTYPE, _do_head)

#define mtype_adt_elem		IPSET_TOKEN(MTYPE, _adt_elem)

#define mtype_add_timeout	IPSET_TOKEN(MTYPE, _add_timeout)

#define mtype_gc_init		IPSET_TOKEN(MTYPE, _gc_init)

#define mtype_kadt		IPSET_TOKEN(MTYPE, _kadt)

#define mtype_uadt		IPSET_TOKEN(MTYPE, _uadt)

#define mtype_destroy		IPSET_TOKEN(MTYPE, _destroy)

#define mtype_flush		IPSET_TOKEN(MTYPE, _flush)

#define mtype_head		IPSET_TOKEN(MTYPE, _head)

#define mtype_same_set		IPSET_TOKEN(MTYPE, _same_set)

#define mtype_elem		IPSET_TOKEN(MTYPE, _elem)

#define mtype_test		IPSET_TOKEN(MTYPE, _test)

#define mtype_add		IPSET_TOKEN(MTYPE, _add)

#define mtype_del		IPSET_TOKEN(MTYPE, _del)

#define mtype_list		IPSET_TOKEN(MTYPE, _list)

#define mtype_gc		IPSET_TOKEN(MTYPE, _gc)

#define mtype			MTYPE



#define ext_timeout(e, m)	\

net/netfilter/ipset/ip_set_bitmap_ip.c

+5 −5
Original line number Diff line number Diff line
@@ -25,12 +25,12 @@ 
#include <linux/netfilter/ipset/ip_set.h>

#include <linux/netfilter/ipset/ip_set_bitmap.h>



#define REVISION_MIN	0

#define REVISION_MAX	1	/* Counter support added */

#define IPSET_TYPE_REV_MIN	0

#define IPSET_TYPE_REV_MAX	1	/* Counter support added */



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>");

IP_SET_MODULE_DESC("bitmap:ip", REVISION_MIN, REVISION_MAX);

IP_SET_MODULE_DESC("bitmap:ip", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX);

MODULE_ALIAS("ip_set_bitmap:ip");



#define MTYPE		bitmap_ip
@@ -401,8 +401,8 @@ static struct ip_set_type bitmap_ip_type __read_mostly = { 
	.features	= IPSET_TYPE_IP,

	.dimension	= IPSET_DIM_ONE,

	.family		= NFPROTO_IPV4,

	.revision_min	= REVISION_MIN,

	.revision_max	= REVISION_MAX,

	.revision_min	= IPSET_TYPE_REV_MIN,

	.revision_max	= IPSET_TYPE_REV_MAX,

	.create		= bitmap_ip_create,

	.create_policy	= {

		[IPSET_ATTR_IP]		= { .type = NLA_NESTED },

net/netfilter/ipset/ip_set_bitmap_ipmac.c

+5 −5
Original line number Diff line number Diff line
@@ -25,12 +25,12 @@ 
#include <linux/netfilter/ipset/ip_set.h>

#include <linux/netfilter/ipset/ip_set_bitmap.h>



#define REVISION_MIN	0

#define REVISION_MAX	1	/* Counter support added */

#define IPSET_TYPE_REV_MIN	0

#define IPSET_TYPE_REV_MAX	1	/* Counter support added */



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>");

IP_SET_MODULE_DESC("bitmap:ip,mac", REVISION_MIN, REVISION_MAX);

IP_SET_MODULE_DESC("bitmap:ip,mac", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX);

MODULE_ALIAS("ip_set_bitmap:ip,mac");



#define MTYPE		bitmap_ipmac
@@ -460,8 +460,8 @@ static struct ip_set_type bitmap_ipmac_type = { 
	.features	= IPSET_TYPE_IP | IPSET_TYPE_MAC,

	.dimension	= IPSET_DIM_TWO,

	.family		= NFPROTO_IPV4,

	.revision_min	= REVISION_MIN,

	.revision_max	= REVISION_MAX,

	.revision_min	= IPSET_TYPE_REV_MIN,

	.revision_max	= IPSET_TYPE_REV_MAX,

	.create		= bitmap_ipmac_create,

	.create_policy	= {

		[IPSET_ATTR_IP]		= { .type = NLA_NESTED },

net/netfilter/ipset/ip_set_bitmap_port.c

+5 −5
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ 
#include <linux/netfilter/ipset/ip_set_bitmap.h>

#include <linux/netfilter/ipset/ip_set_getport.h>



#define REVISION_MIN	0

#define REVISION_MAX	1	/* Counter support added */

#define IPSET_TYPE_REV_MIN	0

#define IPSET_TYPE_REV_MAX	1	/* Counter support added */



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>");

IP_SET_MODULE_DESC("bitmap:port", REVISION_MIN, REVISION_MAX);

IP_SET_MODULE_DESC("bitmap:port", IPSET_TYPE_REV_MIN, IPSET_TYPE_REV_MAX);

MODULE_ALIAS("ip_set_bitmap:port");



#define MTYPE		bitmap_port
@@ -333,8 +333,8 @@ static struct ip_set_type bitmap_port_type = { 
	.features	= IPSET_TYPE_PORT,

	.dimension	= IPSET_DIM_ONE,

	.family		= NFPROTO_UNSPEC,

	.revision_min	= REVISION_MIN,

	.revision_max	= REVISION_MAX,

	.revision_min	= IPSET_TYPE_REV_MIN,

	.revision_max	= IPSET_TYPE_REV_MAX,

	.create		= bitmap_port_create,

	.create_policy	= {

		[IPSET_ATTR_PORT]	= { .type = NLA_U16 },

CRA Git | Maintained and supported by SUSTech CRA and CCSE