netfilter: ipset: whitespace and coding fixes detected by checkpatch.pl
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> Signed-off-by: Patrick McHardy <kaber@trash.net>
This commit is contained in:
parent
e385357a2f
commit
15b4d93f03
11 changed files with 28 additions and 27 deletions
|
@ -331,7 +331,7 @@ struct ip_set {
|
||||||
/* register and unregister set references */
|
/* register and unregister set references */
|
||||||
extern ip_set_id_t ip_set_get_byname(const char *name, struct ip_set **set);
|
extern ip_set_id_t ip_set_get_byname(const char *name, struct ip_set **set);
|
||||||
extern void ip_set_put_byindex(ip_set_id_t index);
|
extern void ip_set_put_byindex(ip_set_id_t index);
|
||||||
extern const char * ip_set_name_byindex(ip_set_id_t index);
|
extern const char *ip_set_name_byindex(ip_set_id_t index);
|
||||||
extern ip_set_id_t ip_set_nfnl_get(const char *name);
|
extern ip_set_id_t ip_set_nfnl_get(const char *name);
|
||||||
extern ip_set_id_t ip_set_nfnl_get_byindex(ip_set_id_t index);
|
extern ip_set_id_t ip_set_nfnl_get_byindex(ip_set_id_t index);
|
||||||
extern void ip_set_nfnl_put(ip_set_id_t index);
|
extern void ip_set_nfnl_put(ip_set_id_t index);
|
||||||
|
@ -349,7 +349,7 @@ extern int ip_set_test(ip_set_id_t id, const struct sk_buff *skb,
|
||||||
const struct ip_set_adt_opt *opt);
|
const struct ip_set_adt_opt *opt);
|
||||||
|
|
||||||
/* Utility functions */
|
/* Utility functions */
|
||||||
extern void * ip_set_alloc(size_t size);
|
extern void *ip_set_alloc(size_t size);
|
||||||
extern void ip_set_free(void *members);
|
extern void ip_set_free(void *members);
|
||||||
extern int ip_set_get_ipaddr4(struct nlattr *nla, __be32 *ipaddr);
|
extern int ip_set_get_ipaddr4(struct nlattr *nla, __be32 *ipaddr);
|
||||||
extern int ip_set_get_ipaddr6(struct nlattr *nla, union nf_inet_addr *ipaddr);
|
extern int ip_set_get_ipaddr6(struct nlattr *nla, union nf_inet_addr *ipaddr);
|
||||||
|
@ -359,7 +359,7 @@ ip_set_get_hostipaddr4(struct nlattr *nla, u32 *ipaddr)
|
||||||
{
|
{
|
||||||
__be32 ip;
|
__be32 ip;
|
||||||
int ret = ip_set_get_ipaddr4(nla, &ip);
|
int ret = ip_set_get_ipaddr4(nla, &ip);
|
||||||
|
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
*ipaddr = ntohl(ip);
|
*ipaddr = ntohl(ip);
|
||||||
|
|
|
@ -43,7 +43,7 @@ struct htable {
|
||||||
struct hbucket bucket[0]; /* hashtable buckets */
|
struct hbucket bucket[0]; /* hashtable buckets */
|
||||||
};
|
};
|
||||||
|
|
||||||
#define hbucket(h, i) &((h)->bucket[i])
|
#define hbucket(h, i) (&((h)->bucket[i]))
|
||||||
|
|
||||||
/* Book-keeping of the prefixes added to the set */
|
/* Book-keeping of the prefixes added to the set */
|
||||||
struct ip_set_hash_nets {
|
struct ip_set_hash_nets {
|
||||||
|
|
|
@ -78,7 +78,7 @@ ip_set_timeout_set(u32 timeout)
|
||||||
static inline u32
|
static inline u32
|
||||||
ip_set_timeout_get(unsigned long timeout)
|
ip_set_timeout_get(unsigned long timeout)
|
||||||
{
|
{
|
||||||
return timeout == IPSET_ELEM_PERMANENT ? 0 :
|
return timeout == IPSET_ELEM_PERMANENT ? 0 :
|
||||||
jiffies_to_msecs(timeout - jiffies)/1000;
|
jiffies_to_msecs(timeout - jiffies)/1000;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#define _PFXLEN_H
|
#define _PFXLEN_H
|
||||||
|
|
||||||
#include <asm/byteorder.h>
|
#include <asm/byteorder.h>
|
||||||
#include <linux/netfilter.h>
|
#include <linux/netfilter.h>
|
||||||
#include <net/tcp.h>
|
#include <net/tcp.h>
|
||||||
|
|
||||||
/* Prefixlen maps, by Jan Engelhardt */
|
/* Prefixlen maps, by Jan Engelhardt */
|
||||||
|
|
|
@ -635,7 +635,8 @@ static struct ip_set_type bitmap_ipmac_type = {
|
||||||
},
|
},
|
||||||
.adt_policy = {
|
.adt_policy = {
|
||||||
[IPSET_ATTR_IP] = { .type = NLA_NESTED },
|
[IPSET_ATTR_IP] = { .type = NLA_NESTED },
|
||||||
[IPSET_ATTR_ETHER] = { .type = NLA_BINARY, .len = ETH_ALEN },
|
[IPSET_ATTR_ETHER] = { .type = NLA_BINARY,
|
||||||
|
.len = ETH_ALEN },
|
||||||
[IPSET_ATTR_TIMEOUT] = { .type = NLA_U32 },
|
[IPSET_ATTR_TIMEOUT] = { .type = NLA_U32 },
|
||||||
[IPSET_ATTR_LINENO] = { .type = NLA_U32 },
|
[IPSET_ATTR_LINENO] = { .type = NLA_U32 },
|
||||||
},
|
},
|
||||||
|
|
|
@ -683,8 +683,8 @@ ip_set_create(struct sock *ctnl, struct sk_buff *skb,
|
||||||
if (attr[IPSET_ATTR_DATA] &&
|
if (attr[IPSET_ATTR_DATA] &&
|
||||||
nla_parse_nested(tb, IPSET_ATTR_CREATE_MAX, attr[IPSET_ATTR_DATA],
|
nla_parse_nested(tb, IPSET_ATTR_CREATE_MAX, attr[IPSET_ATTR_DATA],
|
||||||
set->type->create_policy)) {
|
set->type->create_policy)) {
|
||||||
ret = -IPSET_ERR_PROTOCOL;
|
ret = -IPSET_ERR_PROTOCOL;
|
||||||
goto put_out;
|
goto put_out;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = set->type->create(set, tb, flags);
|
ret = set->type->create(set, tb, flags);
|
||||||
|
|
|
@ -187,7 +187,7 @@ hash_net4_uadt(struct ip_set *set, struct nlattr *tb[],
|
||||||
return -IPSET_ERR_TIMEOUT;
|
return -IPSET_ERR_TIMEOUT;
|
||||||
timeout = ip_set_timeout_uget(tb[IPSET_ATTR_TIMEOUT]);
|
timeout = ip_set_timeout_uget(tb[IPSET_ATTR_TIMEOUT]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (adt == IPSET_TEST || !tb[IPSET_ATTR_IP_TO]) {
|
if (adt == IPSET_TEST || !tb[IPSET_ATTR_IP_TO]) {
|
||||||
data.ip = htonl(ip & ip_set_hostmask(data.cidr));
|
data.ip = htonl(ip & ip_set_hostmask(data.cidr));
|
||||||
ret = adtfn(set, &data, timeout, flags);
|
ret = adtfn(set, &data, timeout, flags);
|
||||||
|
@ -205,7 +205,7 @@ hash_net4_uadt(struct ip_set *set, struct nlattr *tb[],
|
||||||
return -IPSET_ERR_HASH_RANGE;
|
return -IPSET_ERR_HASH_RANGE;
|
||||||
}
|
}
|
||||||
if (retried)
|
if (retried)
|
||||||
ip = h->next.ip;
|
ip = h->next.ip;
|
||||||
while (!after(ip, ip_to)) {
|
while (!after(ip, ip_to)) {
|
||||||
data.ip = htonl(ip);
|
data.ip = htonl(ip);
|
||||||
last = ip_set_range_to_cidr(ip, ip_to, &data.cidr);
|
last = ip_set_range_to_cidr(ip, ip_to, &data.cidr);
|
||||||
|
|
|
@ -100,7 +100,7 @@ iface_test(struct rb_root *root, const char **iface)
|
||||||
while (n) {
|
while (n) {
|
||||||
const char *d = iface_data(n);
|
const char *d = iface_data(n);
|
||||||
int res = ifname_compare(*iface, d);
|
int res = ifname_compare(*iface, d);
|
||||||
|
|
||||||
if (res < 0)
|
if (res < 0)
|
||||||
n = n->rb_left;
|
n = n->rb_left;
|
||||||
else if (res > 0)
|
else if (res > 0)
|
||||||
|
@ -118,7 +118,7 @@ iface_add(struct rb_root *root, const char **iface)
|
||||||
{
|
{
|
||||||
struct rb_node **n = &(root->rb_node), *p = NULL;
|
struct rb_node **n = &(root->rb_node), *p = NULL;
|
||||||
struct iface_node *d;
|
struct iface_node *d;
|
||||||
|
|
||||||
while (*n) {
|
while (*n) {
|
||||||
char *ifname = iface_data(*n);
|
char *ifname = iface_data(*n);
|
||||||
int res = ifname_compare(*iface, ifname);
|
int res = ifname_compare(*iface, ifname);
|
||||||
|
@ -296,10 +296,10 @@ hash_netiface4_kadt(struct ip_set *set, const struct sk_buff *skb,
|
||||||
if (opt->cmdflags & IPSET_FLAG_PHYSDEV) {
|
if (opt->cmdflags & IPSET_FLAG_PHYSDEV) {
|
||||||
#ifdef CONFIG_BRIDGE_NETFILTER
|
#ifdef CONFIG_BRIDGE_NETFILTER
|
||||||
const struct nf_bridge_info *nf_bridge = skb->nf_bridge;
|
const struct nf_bridge_info *nf_bridge = skb->nf_bridge;
|
||||||
|
|
||||||
if (!nf_bridge)
|
if (!nf_bridge)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
data.iface = SRCDIR ? PHYSDEV(physindev): PHYSDEV(physoutdev);
|
data.iface = SRCDIR ? PHYSDEV(physindev) : PHYSDEV(physoutdev);
|
||||||
data.physdev = 1;
|
data.physdev = 1;
|
||||||
#else
|
#else
|
||||||
data.iface = NULL;
|
data.iface = NULL;
|
||||||
|
@ -350,7 +350,7 @@ hash_netiface4_uadt(struct ip_set *set, struct nlattr *tb[],
|
||||||
if (tb[IPSET_ATTR_CIDR]) {
|
if (tb[IPSET_ATTR_CIDR]) {
|
||||||
data.cidr = nla_get_u8(tb[IPSET_ATTR_CIDR]);
|
data.cidr = nla_get_u8(tb[IPSET_ATTR_CIDR]);
|
||||||
if (!data.cidr)
|
if (!data.cidr)
|
||||||
return -IPSET_ERR_INVALID_CIDR;
|
return -IPSET_ERR_INVALID_CIDR;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (tb[IPSET_ATTR_TIMEOUT]) {
|
if (tb[IPSET_ATTR_TIMEOUT]) {
|
||||||
|
@ -359,7 +359,7 @@ hash_netiface4_uadt(struct ip_set *set, struct nlattr *tb[],
|
||||||
timeout = ip_set_timeout_uget(tb[IPSET_ATTR_TIMEOUT]);
|
timeout = ip_set_timeout_uget(tb[IPSET_ATTR_TIMEOUT]);
|
||||||
}
|
}
|
||||||
|
|
||||||
strcpy(iface, nla_data(tb[IPSET_ATTR_IFACE]));
|
strcpy(iface, nla_data(tb[IPSET_ATTR_IFACE]));
|
||||||
data.iface = iface;
|
data.iface = iface;
|
||||||
ret = iface_test(&h->rbtree, &data.iface);
|
ret = iface_test(&h->rbtree, &data.iface);
|
||||||
if (adt == IPSET_ADD) {
|
if (adt == IPSET_ADD) {
|
||||||
|
@ -372,8 +372,8 @@ hash_netiface4_uadt(struct ip_set *set, struct nlattr *tb[],
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
if (tb[IPSET_ATTR_CADT_FLAGS]) {
|
if (tb[IPSET_ATTR_CADT_FLAGS]) {
|
||||||
u32 flags = ip_set_get_h32(tb[IPSET_ATTR_CADT_FLAGS]);
|
u32 cadt_flags = ip_set_get_h32(tb[IPSET_ATTR_CADT_FLAGS]);
|
||||||
if (flags & IPSET_FLAG_PHYSDEV)
|
if (cadt_flags & IPSET_FLAG_PHYSDEV)
|
||||||
data.physdev = 1;
|
data.physdev = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -559,10 +559,10 @@ hash_netiface6_kadt(struct ip_set *set, const struct sk_buff *skb,
|
||||||
if (opt->cmdflags & IPSET_FLAG_PHYSDEV) {
|
if (opt->cmdflags & IPSET_FLAG_PHYSDEV) {
|
||||||
#ifdef CONFIG_BRIDGE_NETFILTER
|
#ifdef CONFIG_BRIDGE_NETFILTER
|
||||||
const struct nf_bridge_info *nf_bridge = skb->nf_bridge;
|
const struct nf_bridge_info *nf_bridge = skb->nf_bridge;
|
||||||
|
|
||||||
if (!nf_bridge)
|
if (!nf_bridge)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
data.iface = SRCDIR ? PHYSDEV(physindev): PHYSDEV(physoutdev);
|
data.iface = SRCDIR ? PHYSDEV(physindev) : PHYSDEV(physoutdev);
|
||||||
data.physdev = 1;
|
data.physdev = 1;
|
||||||
#else
|
#else
|
||||||
data.iface = NULL;
|
data.iface = NULL;
|
||||||
|
@ -623,7 +623,7 @@ hash_netiface6_uadt(struct ip_set *set, struct nlattr *tb[],
|
||||||
timeout = ip_set_timeout_uget(tb[IPSET_ATTR_TIMEOUT]);
|
timeout = ip_set_timeout_uget(tb[IPSET_ATTR_TIMEOUT]);
|
||||||
}
|
}
|
||||||
|
|
||||||
strcpy(iface, nla_data(tb[IPSET_ATTR_IFACE]));
|
strcpy(iface, nla_data(tb[IPSET_ATTR_IFACE]));
|
||||||
data.iface = iface;
|
data.iface = iface;
|
||||||
ret = iface_test(&h->rbtree, &data.iface);
|
ret = iface_test(&h->rbtree, &data.iface);
|
||||||
if (adt == IPSET_ADD) {
|
if (adt == IPSET_ADD) {
|
||||||
|
@ -636,8 +636,8 @@ hash_netiface6_uadt(struct ip_set *set, struct nlattr *tb[],
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
if (tb[IPSET_ATTR_CADT_FLAGS]) {
|
if (tb[IPSET_ATTR_CADT_FLAGS]) {
|
||||||
u32 flags = ip_set_get_h32(tb[IPSET_ATTR_CADT_FLAGS]);
|
u32 cadt_flags = ip_set_get_h32(tb[IPSET_ATTR_CADT_FLAGS]);
|
||||||
if (flags & IPSET_FLAG_PHYSDEV)
|
if (cadt_flags & IPSET_FLAG_PHYSDEV)
|
||||||
data.physdev = 1;
|
data.physdev = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -199,7 +199,7 @@ hash_netport4_uadt(struct ip_set *set, struct nlattr *tb[],
|
||||||
if (tb[IPSET_ATTR_CIDR]) {
|
if (tb[IPSET_ATTR_CIDR]) {
|
||||||
data.cidr = nla_get_u8(tb[IPSET_ATTR_CIDR]);
|
data.cidr = nla_get_u8(tb[IPSET_ATTR_CIDR]);
|
||||||
if (!data.cidr)
|
if (!data.cidr)
|
||||||
return -IPSET_ERR_INVALID_CIDR;
|
return -IPSET_ERR_INVALID_CIDR;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (tb[IPSET_ATTR_PORT])
|
if (tb[IPSET_ATTR_PORT])
|
||||||
|
|
|
@ -148,7 +148,7 @@ const union nf_inet_addr ip_set_netmask_map[] = {
|
||||||
EXPORT_SYMBOL_GPL(ip_set_netmask_map);
|
EXPORT_SYMBOL_GPL(ip_set_netmask_map);
|
||||||
|
|
||||||
#undef E
|
#undef E
|
||||||
#define E(a, b, c, d) \
|
#define E(a, b, c, d) \
|
||||||
{.ip6 = { (__force __be32) a, (__force __be32) b, \
|
{.ip6 = { (__force __be32) a, (__force __be32) b, \
|
||||||
(__force __be32) c, (__force __be32) d, \
|
(__force __be32) c, (__force __be32) d, \
|
||||||
} }
|
} }
|
||||||
|
|
|
@ -37,7 +37,7 @@ match_set(ip_set_id_t index, const struct sk_buff *skb,
|
||||||
return inv;
|
return inv;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define ADT_OPT(n, f, d, fs, cfs, t) \
|
#define ADT_OPT(n, f, d, fs, cfs, t) \
|
||||||
const struct ip_set_adt_opt n = { \
|
const struct ip_set_adt_opt n = { \
|
||||||
.family = f, \
|
.family = f, \
|
||||||
.dim = d, \
|
.dim = d, \
|
||||||
|
|
Loading…
Add table
Reference in a new issue