On Tue, Oct 20, 2015 at 03:20:26PM -0700, Jarno Rajahalme wrote: > Define a new inline function to map conntrack status to enum > ip_conntrack_info. This removes the need to otherwise duplicate this > code in a later patch. Where is that later patch that justifies this update? > Signed-off-by: Jarno Rajahalme <jrajahalme@xxxxxxxxxx> > --- > include/net/netfilter/nf_conntrack.h | 15 +++++++++++++++ > net/netfilter/nf_conntrack_core.c | 22 +++------------------- > 2 files changed, 18 insertions(+), 19 deletions(-) > > diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h > index fde4068..b3de10e 100644 > --- a/include/net/netfilter/nf_conntrack.h > +++ b/include/net/netfilter/nf_conntrack.h > @@ -125,6 +125,21 @@ nf_ct_tuplehash_to_ctrack(const struct nf_conntrack_tuple_hash *hash) > tuplehash[hash->tuple.dst.dir]); > } > > +static inline enum ip_conntrack_info > +nf_ct_get_info(const struct nf_conntrack_tuple_hash *h) > +{ > + const struct nf_conn *ct = nf_ct_tuplehash_to_ctrack(h); > + > + if (NF_CT_DIRECTION(h) == IP_CT_DIR_REPLY) > + return IP_CT_ESTABLISHED_REPLY; > + /* Once we've had two way comms, always ESTABLISHED. */ > + if (test_bit(IPS_SEEN_REPLY_BIT, &ct->status)) > + return IP_CT_ESTABLISHED; > + if (test_bit(IPS_EXPECTED_BIT, &ct->status)) > + return IP_CT_RELATED; > + return IP_CT_NEW; > +} I would really like to see how you want to use this. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html