summaryrefslogtreecommitdiffstats
path: root/src/conntrack/getter.c
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2012-01-04 11:50:28 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2012-01-04 12:08:22 +0100
commit00c2c9dca32eb8eb8687b42fc6d135f35eaa5ff8 (patch)
tree165dc4759be70221168fe401c8c7b8114ea3039e /src/conntrack/getter.c
parentac39464a7619955adf9b317c829a0de0379d7c04 (diff)
src: put nf_expect and nf_conntrack into diet
Now, struct nf_expect takes only 192 bytes, instead of 1KB. struct nf_conntrack takes 296 bytes instead of 328 bytes. The size of the nf_expect structure has been reduced by rearranging the layout of the nf_conntrack structure. For the nf_conntrack case, this removes the allocation of room for attributes that the master tuple does not use (more specifically, the NATseq bytes). This patch modifies the binary layout of struct nf_conntrack. This should not be a problem since the definition of this object is opaque (it can be only accessed via get/set API). Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/conntrack/getter.c')
-rw-r--r--src/conntrack/getter.c66
1 files changed, 33 insertions, 33 deletions
diff --git a/src/conntrack/getter.c b/src/conntrack/getter.c
index c94fe2e..5e0a450 100644
--- a/src/conntrack/getter.c
+++ b/src/conntrack/getter.c
@@ -11,137 +11,137 @@
static const void *get_attr_orig_ipv4_src(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_ORIG].src.v4;
+ return &ct->head.orig.src.v4;
}
static const void *get_attr_orig_ipv4_dst(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_ORIG].dst.v4;
+ return &ct->head.orig.dst.v4;
}
static const void *get_attr_repl_ipv4_src(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_REPL].src.v4;
+ return &ct->repl.src.v4;
}
static const void *get_attr_repl_ipv4_dst(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_REPL].dst.v4;
+ return &ct->repl.dst.v4;
}
static const void *get_attr_orig_ipv6_src(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_ORIG].src.v6;
+ return &ct->head.orig.src.v6;
}
static const void *get_attr_orig_ipv6_dst(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_ORIG].dst.v6;
+ return &ct->head.orig.dst.v6;
}
static const void *get_attr_repl_ipv6_src(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_REPL].src.v6;
+ return &ct->repl.src.v6;
}
static const void *get_attr_repl_ipv6_dst(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_REPL].dst.v6;
+ return &ct->repl.dst.v6;
}
static const void *get_attr_orig_port_src(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_ORIG].l4src.all;
+ return &ct->head.orig.l4src.all;
}
static const void *get_attr_orig_port_dst(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_ORIG].l4dst.all;
+ return &ct->head.orig.l4dst.all;
}
static const void *get_attr_repl_port_src(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_REPL].l4src.all;
+ return &ct->repl.l4src.all;
}
static const void *get_attr_repl_port_dst(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_REPL].l4dst.all;
+ return &ct->repl.l4dst.all;
}
static const void *get_attr_icmp_type(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_ORIG].l4dst.icmp.type;
+ return &ct->head.orig.l4dst.icmp.type;
}
static const void *get_attr_icmp_code(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_ORIG].l4dst.icmp.code;
+ return &ct->head.orig.l4dst.icmp.code;
}
static const void *get_attr_icmp_id(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_ORIG].l4src.icmp.id;
+ return &ct->head.orig.l4src.icmp.id;
}
static const void *get_attr_orig_l3proto(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_ORIG].l3protonum;
+ return &ct->head.orig.l3protonum;
}
static const void *get_attr_repl_l3proto(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_REPL].l3protonum;
+ return &ct->repl.l3protonum;
}
static const void *get_attr_orig_l4proto(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_ORIG].protonum;
+ return &ct->head.orig.protonum;
}
static const void *get_attr_repl_l4proto(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_REPL].protonum;
+ return &ct->repl.protonum;
}
static const void *get_attr_master_ipv4_src(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_MASTER].src.v4;
+ return &ct->master.src.v4;
}
static const void *get_attr_master_ipv4_dst(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_MASTER].dst.v4;
+ return &ct->master.dst.v4;
}
static const void *get_attr_master_ipv6_src(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_MASTER].src.v6;
+ return &ct->master.src.v6;
}
static const void *get_attr_master_ipv6_dst(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_MASTER].dst.v6;
+ return &ct->master.dst.v6;
}
static const void *get_attr_master_port_src(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_MASTER].l4src.all;
+ return &ct->master.l4src.all;
}
static const void *get_attr_master_port_dst(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_MASTER].l4dst.all;
+ return &ct->master.l4dst.all;
}
static const void *get_attr_master_l3proto(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_MASTER].l3protonum;
+ return &ct->master.l3protonum;
}
static const void *get_attr_master_l4proto(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_MASTER].protonum;
+ return &ct->master.protonum;
}
static const void *get_attr_tcp_state(const struct nf_conntrack *ct)
@@ -266,32 +266,32 @@ static const void *get_attr_id(const struct nf_conntrack *ct)
static const void *get_attr_orig_cor_pos(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_ORIG].natseq.correction_pos;
+ return &ct->natseq[__DIR_ORIG].correction_pos;
}
static const void *get_attr_orig_off_bfr(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_ORIG].natseq.offset_before;
+ return &ct->natseq[__DIR_ORIG].offset_before;
}
static const void *get_attr_orig_off_aft(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_ORIG].natseq.offset_after;
+ return &ct->natseq[__DIR_ORIG].offset_after;
}
static const void *get_attr_repl_cor_pos(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_REPL].natseq.correction_pos;
+ return &ct->natseq[__DIR_REPL].correction_pos;
}
static const void *get_attr_repl_off_bfr(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_REPL].natseq.offset_before;
+ return &ct->natseq[__DIR_REPL].offset_before;
}
static const void *get_attr_repl_off_aft(const struct nf_conntrack *ct)
{
- return &ct->tuple[__DIR_REPL].natseq.offset_after;
+ return &ct->natseq[__DIR_REPL].offset_after;
}
static const void *get_attr_helper_name(const struct nf_conntrack *ct)