Add support for conntrack master setup

3 files changed, 84 insertions, 0 deletions

diff --git a/src/conntrack/build.c b/src/conntrack/build.c
index d66d038..4ebc207 100644
--- a/src/conntrack/build.c
+++ b/src/conntrack/build.c
@@ -251,6 +251,17 @@ int __build_conntrack(struct nfnl_subsys_handle *ssh,
 	__build_tuple(req, size, &ct->tuple[__DIR_ORIG], CTA_TUPLE_ORIG);
 	__build_tuple(req, size, &ct->tuple[__DIR_REPL], CTA_TUPLE_REPLY);
 
+	if (test_bit(ATTR_MASTER_IPV4_SRC, ct->set) ||
+	    test_bit(ATTR_MASTER_IPV4_DST, ct->set) ||
+	    test_bit(ATTR_MASTER_IPV6_SRC, ct->set) ||
+	    test_bit(ATTR_MASTER_IPV6_DST, ct->set) ||
+	    test_bit(ATTR_MASTER_PORT_SRC, ct->set) ||
+	    test_bit(ATTR_MASTER_PORT_DST, ct->set) ||
+	    test_bit(ATTR_MASTER_L3PROTO, ct->set) ||
+	    test_bit(ATTR_MASTER_L4PROTO, ct->set))
+	    	__build_tuple(req, size, 
+			      &ct->tuple[__DIR_MASTER], CTA_TUPLE_MASTER);
+
 	if (test_bit(ATTR_STATUS, ct->set))
 		__build_status(req, size, ct);
 	else {
diff --git a/src/conntrack/parse.c b/src/conntrack/parse.c
index 9fbada4..75c5072 100644
--- a/src/conntrack/parse.c
+++ b/src/conntrack/parse.c
@@ -25,6 +25,9 @@ static void __parse_ip(const struct nfattr *attr,
 		case __DIR_REPL:
 			set_bit(ATTR_REPL_IPV4_SRC, set);
 			break;
+		case __DIR_MASTER:
+			set_bit(ATTR_MASTER_IPV4_SRC, set);
+			break;
 		}
 	}
 
@@ -37,6 +40,9 @@ static void __parse_ip(const struct nfattr *attr,
 		case __DIR_REPL:
 			set_bit(ATTR_REPL_IPV4_DST, set);
 			break;
+		case __DIR_MASTER:
+			set_bit(ATTR_MASTER_IPV4_DST, set);
+			break;
 		}
 	}
 
@@ -50,6 +56,9 @@ static void __parse_ip(const struct nfattr *attr,
 		case __DIR_REPL:
 			set_bit(ATTR_REPL_IPV6_SRC, set);
 			break;
+		case __DIR_MASTER:
+			set_bit(ATTR_MASTER_IPV6_SRC, set);
+			break;
 		}
 	}
 
@@ -63,6 +72,9 @@ static void __parse_ip(const struct nfattr *attr,
 		case __DIR_REPL:
 			set_bit(ATTR_REPL_IPV6_DST, set);
 			break;
+		case __DIR_MASTER:
+			set_bit(ATTR_MASTER_IPV6_DST, set);
+			break;
 		}
 	}
 }
@@ -85,6 +97,9 @@ static void __parse_proto(const struct nfattr *attr,
 		case __DIR_REPL:
 			set_bit(ATTR_REPL_L4PROTO, set);
 			break;
+		case __DIR_MASTER:
+			set_bit(ATTR_MASTER_L4PROTO, set);
+			break;
 		}
 	}
 
@@ -98,6 +113,9 @@ static void __parse_proto(const struct nfattr *attr,
 		case __DIR_REPL:
 			set_bit(ATTR_REPL_PORT_SRC, set);
 			break;
+		case __DIR_MASTER:
+			set_bit(ATTR_MASTER_PORT_SRC, set);
+			break;
 		}
 	}
 	
@@ -111,6 +129,9 @@ static void __parse_proto(const struct nfattr *attr,
 		case __DIR_REPL:
 			set_bit(ATTR_REPL_PORT_DST, set);
 			break;
+		case __DIR_MASTER:
+			set_bit(ATTR_MASTER_PORT_DST, set);
+			break;
 		}
 	}
 	
@@ -279,6 +300,10 @@ void __parse_conntrack(const struct nlmsghdr *nlh,
 		__parse_tuple(cda[CTA_TUPLE_REPLY-1], 
 			      &ct->tuple[__DIR_REPL], __DIR_REPL, ct->set);
 
+	if (cda[CTA_TUPLE_MASTER-1])
+		__parse_tuple(cda[CTA_TUPLE_MASTER-1], 
+			      &ct->tuple[__DIR_MASTER], __DIR_MASTER, ct->set);
+
 	if (cda[CTA_STATUS-1]) {
 		ct->status = ntohl(*(u_int32_t *)NFA_DATA(cda[CTA_STATUS-1]));
 		set_bit(ATTR_STATUS, ct->set);
diff --git a/src/conntrack/setter.c b/src/conntrack/setter.c
index afbf9be..19bec22 100644
--- a/src/conntrack/setter.c
+++ b/src/conntrack/setter.c
@@ -162,6 +162,46 @@ static void set_attr_status(struct nf_conntrack *ct, const void *value)
 	ct->status = *((u_int32_t *) value);
 }
 
+static void set_attr_master_ipv4_src(struct nf_conntrack *ct, const void *value)
+{
+	ct->tuple[__DIR_MASTER].src.v4 = *((u_int32_t *) value);
+}
+
+static void set_attr_master_ipv4_dst(struct nf_conntrack *ct, const void *value)
+{
+	ct->tuple[__DIR_MASTER].dst.v4 = *((u_int32_t *) value);
+}
+
+static void set_attr_master_ipv6_src(struct nf_conntrack *ct, const void *value)
+{
+	memcpy(&ct->tuple[__DIR_MASTER].dst.v6, value, sizeof(u_int32_t)*4);
+}
+
+static void set_attr_master_ipv6_dst(struct nf_conntrack *ct, const void *value)
+{
+	memcpy(&ct->tuple[__DIR_MASTER].src.v6, value, sizeof(u_int32_t)*4);
+}
+
+static void set_attr_master_port_src(struct nf_conntrack *ct, const void *value)
+{
+	ct->tuple[__DIR_MASTER].l4src.all = *((u_int16_t *) value);
+}
+
+static void set_attr_master_port_dst(struct nf_conntrack *ct, const void *value)
+{
+	ct->tuple[__DIR_MASTER].l4dst.all = *((u_int16_t *) value);
+}
+
+static void set_attr_master_l3proto(struct nf_conntrack *ct, const void *value)
+{
+	ct->tuple[__DIR_MASTER].l3protonum = *((u_int8_t *) value);
+}
+
+static void set_attr_master_l4proto(struct nf_conntrack *ct, const void *value)
+{
+	ct->tuple[__DIR_MASTER].protonum = *((u_int8_t *) value);
+}
+
 set_attr set_attr_array[] = {
 	[ATTR_ORIG_IPV4_SRC]	= set_attr_orig_ipv4_src,
 	[ATTR_ORIG_IPV4_DST] 	= set_attr_orig_ipv4_dst,
@@ -194,4 +234,12 @@ set_attr set_attr_array[] = {
 	[ATTR_TCP_FLAGS_REPL]	= set_attr_tcp_flags_repl,
 	[ATTR_TCP_MASK_ORIG]	= set_attr_tcp_mask_orig,
 	[ATTR_TCP_MASK_REPL]	= set_attr_tcp_mask_repl,
+	[ATTR_MASTER_IPV4_SRC]	= set_attr_master_ipv4_src,
+	[ATTR_MASTER_IPV4_DST]	= set_attr_master_ipv4_dst,
+	[ATTR_MASTER_IPV6_SRC]	= set_attr_master_ipv6_src,
+	[ATTR_MASTER_IPV6_DST]	= set_attr_master_ipv6_dst,
+	[ATTR_MASTER_PORT_SRC]	= set_attr_master_port_src,
+	[ATTR_MASTER_PORT_DST]	= set_attr_master_port_dst,
+	[ATTR_MASTER_L3PROTO]	= set_attr_master_l3proto,
+	[ATTR_MASTER_L4PROTO]	= set_attr_master_l4proto,
 };