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

Commit 8fea97ec authored Feb 15, 2010 by Patrick McHardy

netfilter: nf_conntrack: pass template to l4proto ->error() handler



The error handlers might need the template to get the conntrack zone
introduced in the next patches to perform a conntrack lookup.

Signed-off-by: Patrick McHardy <kaber@trash.net>

parent d5d1baa1

include/net/netfilter/nf_conntrack_l4proto.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -49,8 +49,8 @@ struct nf_conntrack_l4proto {
		/* Called when a conntrack entry is destroyed */
		void (destroy)(struct nf_conn ct);

		int (error)(struct net net, struct sk_buff *skb, unsigned int dataoff,
		enum ip_conntrack_info *ctinfo,
		int (error)(struct net net, struct nf_conn tmpl, struct sk_buff skb,
		unsigned int dataoff, enum ip_conntrack_info *ctinfo,
		u_int8_t pf, unsigned int hooknum);

		/* Print out the per-protocol part of the tuple. Return like seq_* */

net/ipv4/netfilter/nf_conntrack_proto_icmp.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -163,7 +163,8 @@ icmp_error_message(struct net net, struct sk_buff skb,

		/* Small and modified version of icmp_rcv */
		static int
		icmp_error(struct net net, struct sk_buff skb, unsigned int dataoff,
		icmp_error(struct net net, struct nf_conn tmpl,
		struct sk_buff *skb, unsigned int dataoff,
		enum ip_conntrack_info *ctinfo, u_int8_t pf, unsigned int hooknum)
		{
		const struct icmphdr *icmph;

net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -179,7 +179,8 @@ icmpv6_error_message(struct net *net,
		}

		static int
		icmpv6_error(struct net net, struct sk_buff skb, unsigned int dataoff,
		icmpv6_error(struct net net, struct nf_conn tmpl,
		struct sk_buff *skb, unsigned int dataoff,
		enum ip_conntrack_info *ctinfo, u_int8_t pf, unsigned int hooknum)
		{
		const struct icmp6hdr *icmp6h;

net/netfilter/nf_conntrack_core.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -799,7 +799,8 @@ nf_conntrack_in(struct net *net, u_int8_t pf, unsigned int hooknum,
		* inverse of the return code tells to the netfilter
		* core what to do with the packet. */
		if (l4proto->error != NULL) {
		ret = l4proto->error(net, skb, dataoff, &ctinfo, pf, hooknum);
		ret = l4proto->error(net, tmpl, skb, dataoff, &ctinfo,
		pf, hooknum);
		if (ret <= 0) {
		NF_CT_STAT_INC_ATOMIC(net, error);
		NF_CT_STAT_INC_ATOMIC(net, invalid);

net/netfilter/nf_conntrack_proto_dccp.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -561,8 +561,9 @@ static int dccp_packet(struct nf_conn ct, const struct sk_buff skb,
		return NF_ACCEPT;
		}

		static int dccp_error(struct net net, struct sk_buff skb,
		unsigned int dataoff, enum ip_conntrack_info *ctinfo,
		static int dccp_error(struct net net, struct nf_conn tmpl,
		struct sk_buff *skb, unsigned int dataoff,
		enum ip_conntrack_info *ctinfo,
		u_int8_t pf, unsigned int hooknum)
		{
		struct dccp_hdr _dh, *dh;