Commit f25a9b85 authored by Andrea Claudi's avatar Andrea Claudi Committed by Pablo Neira Ayuso
Browse files

ipvs: change some data types from int to bool 



Change the data type of the following variables from int to bool
across ipvs code:

  - found
  - loop
  - need_full_dest
  - need_full_svc
  - payload_csum

Also change the following functions to use bool full_entry param
instead of int:

  - ip_vs_genl_parse_dest()
  - ip_vs_genl_parse_service()

This patch does not change any functionality but makes the source
code slightly easier to read.

Signed-off-by: default avatarAndrea Claudi <aclaudi@redhat.com>
Acked-by: default avatarJulian Anastasov <ja@ssi.bg>
Acked-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 123f89c8

net/netfilter/ipvs/ip_vs_ctl.c

+6 −6
Original line number Diff line number Diff line
@@ -3086,7 +3086,7 @@ static bool ip_vs_is_af_valid(int af) 


static int ip_vs_genl_parse_service(struct netns_ipvs *ipvs,

				    struct ip_vs_service_user_kern *usvc,

				    struct nlattr *nla, int full_entry,

				    struct nlattr *nla, bool full_entry,

				    struct ip_vs_service **ret_svc)

{

	struct nlattr *attrs[IPVS_SVC_ATTR_MAX + 1];
@@ -3173,7 +3173,7 @@ static struct ip_vs_service *ip_vs_genl_find_service(struct netns_ipvs *ipvs, 
	struct ip_vs_service *svc;

	int ret;



	ret = ip_vs_genl_parse_service(ipvs, &usvc, nla, 0, &svc);

	ret = ip_vs_genl_parse_service(ipvs, &usvc, nla, false, &svc);

	return ret ? ERR_PTR(ret) : svc;

}
@@ -3283,7 +3283,7 @@ out_err: 
}



static int ip_vs_genl_parse_dest(struct ip_vs_dest_user_kern *udest,

				 struct nlattr *nla, int full_entry)

				 struct nlattr *nla, bool full_entry)

{

	struct nlattr *attrs[IPVS_DEST_ATTR_MAX + 1];

	struct nlattr *nla_addr, *nla_port;
@@ -3545,11 +3545,11 @@ out: 


static int ip_vs_genl_set_cmd(struct sk_buff *skb, struct genl_info *info)

{

	bool need_full_svc = false, need_full_dest = false;

	struct ip_vs_service *svc = NULL;

	struct ip_vs_service_user_kern usvc;

	struct ip_vs_dest_user_kern udest;

	int ret = 0, cmd;

	int need_full_svc = 0, need_full_dest = 0;

	struct net *net = sock_net(skb->sk);

	struct netns_ipvs *ipvs = net_ipvs(net);
@@ -3573,7 +3573,7 @@ static int ip_vs_genl_set_cmd(struct sk_buff *skb, struct genl_info *info) 
	 * received a valid one. We need a full service specification when

	 * adding / editing a service. Only identifying members otherwise. */

	if (cmd == IPVS_CMD_NEW_SERVICE || cmd == IPVS_CMD_SET_SERVICE)

		need_full_svc = 1;

		need_full_svc = true;



	ret = ip_vs_genl_parse_service(ipvs, &usvc,

				       info->attrs[IPVS_CMD_ATTR_SERVICE],
@@ -3593,7 +3593,7 @@ static int ip_vs_genl_set_cmd(struct sk_buff *skb, struct genl_info *info) 
	if (cmd == IPVS_CMD_NEW_DEST || cmd == IPVS_CMD_SET_DEST ||

	    cmd == IPVS_CMD_DEL_DEST) {

		if (cmd != IPVS_CMD_DEL_DEST)

			need_full_dest = 1;

			need_full_dest = true;



		ret = ip_vs_genl_parse_dest(&udest,

					    info->attrs[IPVS_CMD_ATTR_DEST],

net/netfilter/ipvs/ip_vs_ftp.c

+2 −2
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static int ip_vs_ftp_get_addrport(char *data, char *data_limit, 
	}

	s = data + plen;

	if (skip) {

		int found = 0;

		bool found = false;



		for (;; s++) {

			if (s == data_limit)
@@ -136,7 +136,7 @@ static int ip_vs_ftp_get_addrport(char *data, char *data_limit, 
				if (!ext && isdigit(*s))

					break;

				if (*s == skip)

					found = 1;

					found = true;

			} else if (*s != skip) {

				break;

			}

net/netfilter/ipvs/ip_vs_proto_tcp.c

+4 −4
Original line number Diff line number Diff line
@@ -153,8 +153,8 @@ tcp_snat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp, 
{

	struct tcphdr *tcph;

	unsigned int tcphoff = iph->len;

	bool payload_csum = false;

	int oldlen;

	int payload_csum = 0;



#ifdef CONFIG_IP_VS_IPV6

	if (cp->af == AF_INET6 && iph->fragoffs)
@@ -180,7 +180,7 @@ tcp_snat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp, 
		if (ret == 1)

			oldlen = skb->len - tcphoff;

		else

			payload_csum = 1;

			payload_csum = true;

	}



	tcph = (void *)skb_network_header(skb) + tcphoff;
@@ -231,8 +231,8 @@ tcp_dnat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp, 
{

	struct tcphdr *tcph;

	unsigned int tcphoff = iph->len;

	bool payload_csum = false;

	int oldlen;

	int payload_csum = 0;



#ifdef CONFIG_IP_VS_IPV6

	if (cp->af == AF_INET6 && iph->fragoffs)
@@ -261,7 +261,7 @@ tcp_dnat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp, 
		if (ret == 1)

			oldlen = skb->len - tcphoff;

		else

			payload_csum = 1;

			payload_csum = true;

	}



	tcph = (void *)skb_network_header(skb) + tcphoff;

net/netfilter/ipvs/ip_vs_proto_udp.c

+4 −4
Original line number Diff line number Diff line
@@ -143,8 +143,8 @@ udp_snat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp, 
{

	struct udphdr *udph;

	unsigned int udphoff = iph->len;

	bool payload_csum = false;

	int oldlen;

	int payload_csum = 0;



#ifdef CONFIG_IP_VS_IPV6

	if (cp->af == AF_INET6 && iph->fragoffs)
@@ -172,7 +172,7 @@ udp_snat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp, 
		if (ret == 1)

			oldlen = skb->len - udphoff;

		else

			payload_csum = 1;

			payload_csum = true;

	}



	udph = (void *)skb_network_header(skb) + udphoff;
@@ -226,8 +226,8 @@ udp_dnat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp, 
{

	struct udphdr *udph;

	unsigned int udphoff = iph->len;

	bool payload_csum = false;

	int oldlen;

	int payload_csum = 0;



#ifdef CONFIG_IP_VS_IPV6

	if (cp->af == AF_INET6 && iph->fragoffs)
@@ -256,7 +256,7 @@ udp_dnat_handler(struct sk_buff *skb, struct ip_vs_protocol *pp, 
		if (ret == 1)

			oldlen = skb->len - udphoff;

		else

			payload_csum = 1;

			payload_csum = true;

	}



	udph = (void *)skb_network_header(skb) + udphoff;

net/netfilter/ipvs/ip_vs_xmit.c

+2 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static struct rtable *do_output_route4(struct net *net, __be32 daddr, 
{

	struct flowi4 fl4;

	struct rtable *rt;

	int loop = 0;

	bool loop = false;



	memset(&fl4, 0, sizeof(fl4));

	fl4.daddr = daddr;
@@ -149,7 +149,7 @@ retry: 
		ip_rt_put(rt);

		*saddr = fl4.saddr;

		flowi4_update_output(&fl4, 0, 0, daddr, fl4.saddr);

		loop++;

		loop = true;

		goto retry;

	}

	*saddr = fl4.saddr;

CRA Git | Maintained and supported by SUSTech CRA and CCSE