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

Commit 506e65df authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: make comparision helpers stub functions in ZONES=n case 



Those comparisions are useless in case of ZONES=n; all conntracks
will reside in the same zone by definition.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 5a75cdeb

include/net/netfilter/nf_conntrack_zones.h

+12 −0
Original line number Diff line number Diff line
@@ -68,22 +68,34 @@ static inline bool nf_ct_zone_matches_dir(const struct nf_conntrack_zone *zone, 
static inline u16 nf_ct_zone_id(const struct nf_conntrack_zone *zone,

				enum ip_conntrack_dir dir)

{

#ifdef CONFIG_NF_CONNTRACK_ZONES

	return nf_ct_zone_matches_dir(zone, dir) ?

	       zone->id : NF_CT_DEFAULT_ZONE_ID;

#else

	return NF_CT_DEFAULT_ZONE_ID;

#endif

}



static inline bool nf_ct_zone_equal(const struct nf_conn *a,

				    const struct nf_conntrack_zone *b,

				    enum ip_conntrack_dir dir)

{

#ifdef CONFIG_NF_CONNTRACK_ZONES

	return nf_ct_zone_id(nf_ct_zone(a), dir) ==

	       nf_ct_zone_id(b, dir);

#else

	return true;

#endif

}



static inline bool nf_ct_zone_equal_any(const struct nf_conn *a,

					const struct nf_conntrack_zone *b)

{

#ifdef CONFIG_NF_CONNTRACK_ZONES

	return nf_ct_zone(a)->id == b->id;

#else

	return true;

#endif

}

#endif /* IS_ENABLED(CONFIG_NF_CONNTRACK) */

#endif /* _NF_CONNTRACK_ZONES_H */