conntrack: add new ATTR_GRP_[ORIG|REPL]_ADDR_[SRC|DST] attribute

This allows you to set and to get the address for both IPv4 and IPV6
using the same interface. This can simplify much redundant code that
needs to support both protocols.

This relies on some fixed layout union:

union nfct_attr_grp_addr {
        u_int32_t ip;
        u_int32_t ip6[4];
        u_int32_t addr[4];
};

But I don't see this library will support anything different from
IPv4 and IPv6 as layer 3 protocol. If that happens and some point,
we can add some new attribute group and deprecate this one.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

1 files changed, 33 insertions, 1 deletions

diff --git a/src/conntrack/grp_getter.c b/src/conntrack/grp_getter.c
index a8d43cf..9770340 100644
--- a/src/conntrack/grp_getter.c
+++ b/src/conntrack/grp_getter.c
@@ -94,6 +94,34 @@ static void get_attr_grp_repl_ctrs(const struct nf_conntrack *ct, void *data)
 	this->bytes = ct->counters[__DIR_REPL].bytes;
 }
 
+static void
+get_attr_grp_orig_addr_src(const struct nf_conntrack *ct, void *data)
+{
+	union nfct_attr_grp_addr *this = data;
+	memcpy(&this->addr, &ct->head.orig.src, sizeof(ct->head.orig.src));
+}
+
+static void
+get_attr_grp_orig_addr_dst(const struct nf_conntrack *ct, void *data)
+{
+	union nfct_attr_grp_addr *this = data;
+	memcpy(&this->addr, &ct->head.orig.dst, sizeof(ct->head.orig.dst));
+}
+
+static void
+get_attr_grp_repl_addr_src(const struct nf_conntrack *ct, void *data)
+{
+	union nfct_attr_grp_addr *this = data;
+	memcpy(&this->addr, &ct->repl.src, sizeof(ct->repl.src));
+}
+
+static void
+get_attr_grp_repl_addr_dst(const struct nf_conntrack *ct, void *data)
+{
+	union nfct_attr_grp_addr *this = data;
+	memcpy(&this->addr, &ct->repl.dst, sizeof(ct->repl.dst));
+}
+
 const get_attr_grp get_attr_grp_array[ATTR_GRP_MAX] = {
 	[ATTR_GRP_ORIG_IPV4]		= get_attr_grp_orig_ipv4,
 	[ATTR_GRP_REPL_IPV4]		= get_attr_grp_repl_ipv4,
@@ -106,5 +134,9 @@ const get_attr_grp get_attr_grp_array[ATTR_GRP_MAX] = {
 	[ATTR_GRP_MASTER_IPV6]		= get_attr_grp_master_ipv6,
 	[ATTR_GRP_MASTER_PORT]		= get_attr_grp_master_port,
 	[ATTR_GRP_ORIG_COUNTERS]	= get_attr_grp_orig_ctrs,
-	[ATTR_GRP_REPL_COUNTERS]	= get_attr_grp_repl_ctrs
+	[ATTR_GRP_REPL_COUNTERS]	= get_attr_grp_repl_ctrs,
+	[ATTR_GRP_ORIG_ADDR_SRC]	= get_attr_grp_orig_addr_src,
+	[ATTR_GRP_ORIG_ADDR_DST]	= get_attr_grp_orig_addr_dst,
+	[ATTR_GRP_REPL_ADDR_SRC]	= get_attr_grp_repl_addr_src,
+	[ATTR_GRP_REPL_ADDR_DST]	= get_attr_grp_repl_addr_dst,
 };