Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 906535b0 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: conntrack: move helper struct to nf_conntrack_helper.h 



its definition is not needed in nf_conntrack.h.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 694a0055

include/net/netfilter/nf_conntrack.h

+0 −19
Original line number Diff line number Diff line
@@ -50,25 +50,6 @@ union nf_conntrack_expect_proto { 
#define NF_CT_ASSERT(x)

#endif



struct nf_conntrack_helper;



/* Must be kept in sync with the classes defined by helpers */

#define NF_CT_MAX_EXPECT_CLASSES	4



/* nf_conn feature for connections that have a helper */

struct nf_conn_help {

	/* Helper. if any */

	struct nf_conntrack_helper __rcu *helper;



	struct hlist_head expectations;



	/* Current number of expected connections */

	u8 expecting[NF_CT_MAX_EXPECT_CLASSES];



	/* private helper information. */

	char data[];

};



#include <net/netfilter/ipv4/nf_conntrack_ipv4.h>

#include <net/netfilter/ipv6/nf_conntrack_ipv6.h>

include/net/netfilter/nf_conntrack_helper.h

+17 −0
Original line number Diff line number Diff line
@@ -52,6 +52,23 @@ struct nf_conntrack_helper { 
	unsigned int queue_num;		/* For user-space helpers. */

};



/* Must be kept in sync with the classes defined by helpers */

#define NF_CT_MAX_EXPECT_CLASSES	4



/* nf_conn feature for connections that have a helper */

struct nf_conn_help {

	/* Helper. if any */

	struct nf_conntrack_helper __rcu *helper;



	struct hlist_head expectations;



	/* Current number of expected connections */

	u8 expecting[NF_CT_MAX_EXPECT_CLASSES];



	/* private helper information. */

	char data[];

};



struct nf_conntrack_helper *__nf_conntrack_helper_find(const char *name,

						       u16 l3num, u8 protonum);