1f1475f38b
nf_conntrack_zones.h was wrapped in a CONFIG_NF_CONNTRACK check in order
to fix compilation failures:
37ee3d5b3e ("netfilter: nf_defrag_ipv4: fix compilation error with NF_CONNTRACK=n")
Subsequent changes mean that these failures will no longer occur and the
check is unnecessary. Remove it.
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
90 lines
2 KiB
C
90 lines
2 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _NF_CONNTRACK_ZONES_H
|
|
#define _NF_CONNTRACK_ZONES_H
|
|
|
|
#include <linux/netfilter/nf_conntrack_zones_common.h>
|
|
#include <net/netfilter/nf_conntrack.h>
|
|
|
|
static inline const struct nf_conntrack_zone *
|
|
nf_ct_zone(const struct nf_conn *ct)
|
|
{
|
|
#ifdef CONFIG_NF_CONNTRACK_ZONES
|
|
return &ct->zone;
|
|
#else
|
|
return &nf_ct_zone_dflt;
|
|
#endif
|
|
}
|
|
|
|
static inline const struct nf_conntrack_zone *
|
|
nf_ct_zone_init(struct nf_conntrack_zone *zone, u16 id, u8 dir, u8 flags)
|
|
{
|
|
zone->id = id;
|
|
zone->flags = flags;
|
|
zone->dir = dir;
|
|
|
|
return zone;
|
|
}
|
|
|
|
static inline const struct nf_conntrack_zone *
|
|
nf_ct_zone_tmpl(const struct nf_conn *tmpl, const struct sk_buff *skb,
|
|
struct nf_conntrack_zone *tmp)
|
|
{
|
|
#ifdef CONFIG_NF_CONNTRACK_ZONES
|
|
if (!tmpl)
|
|
return &nf_ct_zone_dflt;
|
|
|
|
if (tmpl->zone.flags & NF_CT_FLAG_MARK)
|
|
return nf_ct_zone_init(tmp, skb->mark, tmpl->zone.dir, 0);
|
|
#endif
|
|
return nf_ct_zone(tmpl);
|
|
}
|
|
|
|
static inline void nf_ct_zone_add(struct nf_conn *ct,
|
|
const struct nf_conntrack_zone *zone)
|
|
{
|
|
#ifdef CONFIG_NF_CONNTRACK_ZONES
|
|
ct->zone = *zone;
|
|
#endif
|
|
}
|
|
|
|
static inline bool nf_ct_zone_matches_dir(const struct nf_conntrack_zone *zone,
|
|
enum ip_conntrack_dir dir)
|
|
{
|
|
return zone->dir & (1 << dir);
|
|
}
|
|
|
|
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 /* _NF_CONNTRACK_ZONES_H */
|