Commit 728a7e69 authored by Sergey Popovich's avatar Sergey Popovich Committed by Pablo Neira Ayuso
Browse files

netfilter: ipset: Return bool values instead of int 



Signed-off-by: default avatarSergey Popovich <popovich_sergei@mail.ua>
Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent cabfd139

net/netfilter/ipset/ip_set_hash_ip.c

+5 −5
Original line number Diff line number Diff line
@@ -56,15 +56,15 @@ hash_ip4_data_equal(const struct hash_ip4_elem *e1, 
	return e1->ip == e2->ip;

}



static inline bool

static bool

hash_ip4_data_list(struct sk_buff *skb, const struct hash_ip4_elem *e)

{

	if (nla_put_ipaddr4(skb, IPSET_ATTR_IP, e->ip))

		goto nla_put_failure;

	return 0;

	return false;



nla_put_failure:

	return 1;

	return true;

}



static inline void
@@ -198,10 +198,10 @@ hash_ip6_data_list(struct sk_buff *skb, const struct hash_ip6_elem *e) 
{

	if (nla_put_ipaddr6(skb, IPSET_ATTR_IP, &e->ip.in6))

		goto nla_put_failure;

	return 0;

	return false;



nla_put_failure:

	return 1;

	return true;

}



static inline void

net/netfilter/ipset/ip_set_hash_ipmark.c

+4 −4
Original line number Diff line number Diff line
@@ -63,10 +63,10 @@ hash_ipmark4_data_list(struct sk_buff *skb, 
	if (nla_put_ipaddr4(skb, IPSET_ATTR_IP, data->ip) ||

	    nla_put_net32(skb, IPSET_ATTR_MARK, htonl(data->mark)))

		goto nla_put_failure;

	return 0;

	return false;



nla_put_failure:

	return 1;

	return true;

}



static inline void
@@ -193,10 +193,10 @@ hash_ipmark6_data_list(struct sk_buff *skb, 
	if (nla_put_ipaddr6(skb, IPSET_ATTR_IP, &data->ip.in6) ||

	    nla_put_net32(skb, IPSET_ATTR_MARK, htonl(data->mark)))

		goto nla_put_failure;

	return 0;

	return false;



nla_put_failure:

	return 1;

	return true;

}



static inline void

net/netfilter/ipset/ip_set_hash_ipport.c

+4 −4
Original line number Diff line number Diff line
@@ -69,10 +69,10 @@ hash_ipport4_data_list(struct sk_buff *skb, 
	    nla_put_net16(skb, IPSET_ATTR_PORT, data->port) ||

	    nla_put_u8(skb, IPSET_ATTR_PROTO, data->proto))

		goto nla_put_failure;

	return 0;

	return false;



nla_put_failure:

	return 1;

	return true;

}



static inline void
@@ -230,10 +230,10 @@ hash_ipport6_data_list(struct sk_buff *skb, 
	    nla_put_net16(skb, IPSET_ATTR_PORT, data->port) ||

	    nla_put_u8(skb, IPSET_ATTR_PROTO, data->proto))

		goto nla_put_failure;

	return 0;

	return false;



nla_put_failure:

	return 1;

	return true;

}



static inline void

net/netfilter/ipset/ip_set_hash_ipportip.c

+4 −4
Original line number Diff line number Diff line
@@ -70,10 +70,10 @@ hash_ipportip4_data_list(struct sk_buff *skb, 
	    nla_put_net16(skb, IPSET_ATTR_PORT, data->port) ||

	    nla_put_u8(skb, IPSET_ATTR_PROTO, data->proto))

		goto nla_put_failure;

	return 0;

	return false;



nla_put_failure:

	return 1;

	return true;

}



static inline void
@@ -239,10 +239,10 @@ hash_ipportip6_data_list(struct sk_buff *skb, 
	    nla_put_net16(skb, IPSET_ATTR_PORT, data->port) ||

	    nla_put_u8(skb, IPSET_ATTR_PROTO, data->proto))

		goto nla_put_failure;

	return 0;

	return false;



nla_put_failure:

	return 1;

	return true;

}



static inline void

net/netfilter/ipset/ip_set_hash_ipportnet.c

+4 −4
Original line number Diff line number Diff line
@@ -114,10 +114,10 @@ hash_ipportnet4_data_list(struct sk_buff *skb, 
	    (flags &&

	     nla_put_net32(skb, IPSET_ATTR_CADT_FLAGS, htonl(flags))))

		goto nla_put_failure;

	return 0;

	return false;



nla_put_failure:

	return 1;

	return true;

}



static inline void
@@ -366,10 +366,10 @@ hash_ipportnet6_data_list(struct sk_buff *skb, 
	    (flags &&

	     nla_put_net32(skb, IPSET_ATTR_CADT_FLAGS, htonl(flags))))

		goto nla_put_failure;

	return 0;

	return false;



nla_put_failure:

	return 1;

	return true;

}



static inline void

CRA Git | Maintained and supported by SUSTech CRA and CCSE