From: Rich Fought <rmf.aero@gmail.com>
Date: Tue, 29 Jan 2013 23:10:01 +0000 (-0800)
Subject: netfilter: correct error in construction of NAT tuple
X-Git-Tag: libnl3_2_22rc1~54^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f088d38aecd86f5377287f8a0ad8534fe441ad9;p=thirdparty%2Flibnl.git

netfilter: correct error in construction of NAT tuple
---

diff --git a/lib/netfilter/exp.c b/lib/netfilter/exp.c
index a348f99..86ed8d1 100644
--- a/lib/netfilter/exp.c
+++ b/lib/netfilter/exp.c
@@ -351,7 +351,11 @@ static int nfnl_exp_build_tuple(struct nl_msg *msg, const struct nfnl_exp *exp,
 
 	int type = exp_get_tuple_attr(cta);
 
-	tuple = nla_nest_start(msg, cta);
+    if (cta == CTA_EXPECT_NAT)
+        tuple = nla_nest_start(msg, CTA_EXPECT_NAT_TUPLE);
+    else
+        tuple = nla_nest_start(msg, cta);
+
 	if (!tuple)
 		goto nla_put_failure;
 
@@ -420,7 +424,7 @@ static int nfnl_exp_build_nat(struct nl_msg *msg, const struct nfnl_exp *exp)
 				nfnl_exp_get_nat_dir(exp));
 	}
 
-	if ((err = nfnl_exp_build_tuple(msg, exp, CTA_EXPECT_NAT_TUPLE)) < 0)
+	if ((err = nfnl_exp_build_tuple(msg, exp, CTA_EXPECT_NAT)) < 0)
 		goto nla_put_failure;
 
 	nla_nest_end(msg, nat);