Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1823fb79 authored by Sergey Popovich's avatar Sergey Popovich Committed by Pablo Neira Ayuso
Browse files

netfilter: ipset: Improve preprocessor macros checks 



Check if mandatory MTYPE, HTYPE and HOST_MASK macros
defined.

Signed-off-by: default avatarSergey Popovich <popovich_sergei@mail.ua>
Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 58cc06da

net/netfilter/ipset/ip_set_hash_gen.h

+12 −1
Original line number Diff line number Diff line
@@ -253,6 +253,14 @@ hbucket_elem_add(struct hbucket *n, u8 ahash_max, size_t dsize) 
#define mtype_variant		IPSET_TOKEN(MTYPE, _variant)

#define mtype_data_match	IPSET_TOKEN(MTYPE, _data_match)



#ifndef MTYPE

#error "MTYPE is not defined!"

#endif



#ifndef HOST_MASK

#error "HOST_MASK is not defined!"

#endif



#ifndef HKEY_DATALEN

#define HKEY_DATALEN		sizeof(struct mtype_elem)

#endif
@@ -262,6 +270,9 @@ hbucket_elem_add(struct hbucket *n, u8 ahash_max, size_t dsize) 
	& jhash_mask(htable_bits))



#ifndef htype

#ifndef HTYPE

#error "HTYPE is not defined!"

#endif /* HTYPE */

#define htype			HTYPE



/* The generic hash structure */
@@ -288,7 +299,7 @@ struct htype { 
	struct net_prefixes nets[0]; /* book-keeping of prefixes */

#endif

};

#endif

#endif /* htype */



#ifdef IP_SET_HASH_WITH_NETS

/* Network cidr size book keeping when the hash stores different

net/netfilter/ipset/ip_set_hash_ipmark.c

+3 −3

File changed.

Contains only whitespace changes.

net/netfilter/ipset/ip_set_hash_ipport.c

+3 −3

File changed.

Contains only whitespace changes.