From ea427c2a9f3c218945cfbe56bb6cc1a7e319d1d9 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Mon, 10 Oct 2005 20:55:49 -0700
Subject: [PATCH] --- yaml --- r: 9831 b: refs/heads/master c:
 e1c73b78e3706bd3c336d4730a01dd4081dfb7ee h: refs/heads/master i:   9829:
 d25b08e355e10acd2e50c07aca3af0fa56ce59f2   9827:
 4b1907bdf991d8dc70035760d1a9ddddcac5bb4b   9823:
 0c96a73eda1c8d33aab7e4f1429344d575fb34b4 v: v3

---
 [refs]                                              | 2 +-
 trunk/include/linux/netfilter/nfnetlink_conntrack.h | 9 ++++++++-
 trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c   | 4 ++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index df00f55e4030..34a46cc5fad1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5bbc243aafff9ad653dc7a9fa7bcaf0b4631355a
+refs/heads/master: e1c73b78e3706bd3c336d4730a01dd4081dfb7ee
diff --git a/trunk/include/linux/netfilter/nfnetlink_conntrack.h b/trunk/include/linux/netfilter/nfnetlink_conntrack.h
index 5c55751c78e4..fb5511030185 100644
--- a/trunk/include/linux/netfilter/nfnetlink_conntrack.h
+++ b/trunk/include/linux/netfilter/nfnetlink_conntrack.h
@@ -70,11 +70,18 @@ enum ctattr_l4proto {
 
 enum ctattr_protoinfo {
 	CTA_PROTOINFO_UNSPEC,
-	CTA_PROTOINFO_TCP_STATE,
+	CTA_PROTOINFO_TCP,
 	__CTA_PROTOINFO_MAX
 };
 #define CTA_PROTOINFO_MAX (__CTA_PROTOINFO_MAX - 1)
 
+enum ctattr_protoinfo_tcp {
+	CTA_PROTOINFO_TCP_UNSPEC,
+	CTA_PROTOINFO_TCP_STATE,
+	__CTA_PROTOINFO_TCP_MAX
+};
+#define CTA_PROTOINFO_TCP_MAX (__CTA_PROTOINFO_TCP_MAX - 1)
+
 enum ctattr_counters {
 	CTA_COUNTERS_UNSPEC,
 	CTA_COUNTERS_PACKETS,
diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c b/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
index 121760d6cc50..75e27e65c28f 100644
--- a/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
+++ b/trunk/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
@@ -341,11 +341,15 @@ static int tcp_print_conntrack(struct seq_file *s,
 static int tcp_to_nfattr(struct sk_buff *skb, struct nfattr *nfa,
 			 const struct ip_conntrack *ct)
 {
+	struct nfattr *nest_parms = NFA_NEST(skb, CTA_PROTOINFO_TCP);
+	
 	read_lock_bh(&tcp_lock);
 	NFA_PUT(skb, CTA_PROTOINFO_TCP_STATE, sizeof(u_int8_t),
 		&ct->proto.tcp.state);
 	read_unlock_bh(&tcp_lock);
 
+	NFA_NEST_END(skb, nest_parms);
+
 	return 0;
 
 nfattr_failure: