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

Commit fb048833 authored by Eric Dumazet's avatar Eric Dumazet Committed by Pablo Neira Ayuso
Browse files

netfilter: add more values to enum ip_conntrack_info 



Following error is raised (and other similar ones) :

net/ipv4/netfilter/nf_nat_standalone.c: In function ‘nf_nat_fn’:
net/ipv4/netfilter/nf_nat_standalone.c:119:2: warning: case value ‘4’
not in enumerated type ‘enum ip_conntrack_info’

gcc barfs on adding two enum values and getting a not enumerated
result :

case IP_CT_RELATED+IP_CT_IS_REPLY:

Add missing enum values

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
CC: David Miller <davem@davemloft.net>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 374eeb5a

include/linux/netfilter/nf_conntrack_common.h

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ enum ip_conntrack_info { 
	/* >= this indicates reply direction */

	IP_CT_IS_REPLY,



	IP_CT_ESTABLISHED_REPLY = IP_CT_ESTABLISHED + IP_CT_IS_REPLY,

	IP_CT_RELATED_REPLY = IP_CT_RELATED + IP_CT_IS_REPLY,

	IP_CT_NEW_REPLY = IP_CT_NEW + IP_CT_IS_REPLY,	

	/* Number of distinct IP_CT types (no NEW in reply dirn). */

	IP_CT_NUMBER = IP_CT_IS_REPLY * 2 - 1

};

net/ipv4/netfilter/ipt_CLUSTERIP.c

+3 −3
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ clusterip_tg(struct sk_buff *skb, const struct xt_action_param *par) 
	 * error messages (RELATED) and information requests (see below) */

	if (ip_hdr(skb)->protocol == IPPROTO_ICMP &&

	    (ctinfo == IP_CT_RELATED ||

	     ctinfo == IP_CT_RELATED + IP_CT_IS_REPLY))

	     ctinfo == IP_CT_RELATED_REPLY))

		return XT_CONTINUE;



	/* ip_conntrack_icmp guarantees us that we only have ICMP_ECHO,
@@ -321,12 +321,12 @@ clusterip_tg(struct sk_buff *skb, const struct xt_action_param *par) 
			ct->mark = hash;

			break;

		case IP_CT_RELATED:

		case IP_CT_RELATED+IP_CT_IS_REPLY:

		case IP_CT_RELATED_REPLY:

			/* FIXME: we don't handle expectations at the

			 * moment.  they can arrive on a different node than

			 * the master connection (e.g. FTP passive mode) */

		case IP_CT_ESTABLISHED:

		case IP_CT_ESTABLISHED+IP_CT_IS_REPLY:

		case IP_CT_ESTABLISHED_REPLY:

			break;

		default:

			break;

net/ipv4/netfilter/ipt_MASQUERADE.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ masquerade_tg(struct sk_buff *skb, const struct xt_action_param *par) 
	nat = nfct_nat(ct);



	NF_CT_ASSERT(ct && (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED ||

			    ctinfo == IP_CT_RELATED + IP_CT_IS_REPLY));

			    ctinfo == IP_CT_RELATED_REPLY));



	/* Source address is 0.0.0.0 - locally generated packet that is

	 * probably not supposed to be masqueraded.

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static unsigned int ipv4_confirm(unsigned int hooknum, 


	/* This is where we call the helper: as the packet goes out. */

	ct = nf_ct_get(skb, &ctinfo);

	if (!ct || ctinfo == IP_CT_RELATED + IP_CT_IS_REPLY)

	if (!ct || ctinfo == IP_CT_RELATED_REPLY)

		goto out;



	help = nfct_help(ct);

net/ipv4/netfilter/nf_nat_core.c

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ int nf_nat_icmp_reply_translation(struct nf_conn *ct, 


	/* Must be RELATED */

	NF_CT_ASSERT(skb->nfctinfo == IP_CT_RELATED ||

		     skb->nfctinfo == IP_CT_RELATED+IP_CT_IS_REPLY);

		     skb->nfctinfo == IP_CT_RELATED_REPLY);



	/* Redirects on non-null nats must be dropped, else they'll

	   start talking to each other without our translation, and be