Skip to content

Commit

Permalink
[NETFILTER]: x_tables: switch xt_target->checkentry to bool
Browse files Browse the repository at this point in the history 
Switch the return type of target checkentry functions to boolean.

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jan Engelhardt authored and David S. Miller committed Jul 11, 2007
1 parent ccb79bd commit e1931b7
Show file tree
Hide file tree
Showing 24 changed files with 174 additions and 174 deletions.
10 changes: 5 additions & 5 deletions include/linux/netfilter/x_tables.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,11 @@ struct xt_target
hook_mask is a bitmask of hooks from which it can be
called. */
/* Should return true or false. */
int (*checkentry)(const char *tablename,
const void *entry,
const struct xt_target *target,
void *targinfo,
unsigned int hook_mask);
bool (*checkentry)(const char *tablename,
const void *entry,
const struct xt_target *target,
void *targinfo,
unsigned int hook_mask);

/* Called when entry of this type deleted. */
void (*destroy)(const struct xt_target *target, void *targinfo);
Expand Down
8 changes: 4 additions & 4 deletions net/ipv4/netfilter/arpt_mangle.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,20 +65,20 @@ target(struct sk_buff **pskb,
return mangle->target;
}

static int
static bool
checkentry(const char *tablename, const void *e, const struct xt_target *target,
void *targinfo, unsigned int hook_mask)
{
const struct arpt_mangle *mangle = targinfo;

if (mangle->flags & ~ARPT_MANGLE_MASK ||
!(mangle->flags & ARPT_MANGLE_MASK))
return 0;
return false;

if (mangle->target != NF_DROP && mangle->target != NF_ACCEPT &&
mangle->target != ARPT_CONTINUE)
return 0;
return 1;
return false;
return true;
}

static struct arpt_target arpt_mangle_reg = {
Expand Down
28 changes: 14 additions & 14 deletions net/ipv4/netfilter/ipt_CLUSTERIP.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,17 +220,17 @@ clusterip_add_node(struct clusterip_config *c, u_int16_t nodenum)
return 0;
}

static int
static bool
clusterip_del_node(struct clusterip_config *c, u_int16_t nodenum)
{
if (nodenum == 0 ||
nodenum > c->num_total_nodes)
return 1;
return true;

if (test_and_clear_bit(nodenum - 1, &c->local_nodes))
return 0;
return false;

return 1;
return true;
}
#endif

Expand Down Expand Up @@ -370,7 +370,7 @@ target(struct sk_buff **pskb,
return XT_CONTINUE;
}

static int
static bool
checkentry(const char *tablename,
const void *e_void,
const struct xt_target *target,
Expand All @@ -387,13 +387,13 @@ checkentry(const char *tablename,
cipinfo->hash_mode != CLUSTERIP_HASHMODE_SIP_SPT_DPT) {
printk(KERN_WARNING "CLUSTERIP: unknown mode `%u'\n",
cipinfo->hash_mode);
return 0;
return false;

}
if (e->ip.dmsk.s_addr != htonl(0xffffffff)
|| e->ip.dst.s_addr == 0) {
printk(KERN_ERR "CLUSTERIP: Please specify destination IP\n");
return 0;
return false;
}

/* FIXME: further sanity checks */
Expand All @@ -407,7 +407,7 @@ checkentry(const char *tablename,
if (cipinfo->config != config) {
printk(KERN_ERR "CLUSTERIP: Reloaded entry "
"has invalid config pointer!\n");
return 0;
return false;
}
} else {
/* Case B: This is a new rule referring to an existing
Expand All @@ -418,27 +418,27 @@ checkentry(const char *tablename,
/* Case C: This is a completely new clusterip config */
if (!(cipinfo->flags & CLUSTERIP_FLAG_NEW)) {
printk(KERN_WARNING "CLUSTERIP: no config found for %u.%u.%u.%u, need 'new'\n", NIPQUAD(e->ip.dst.s_addr));
return 0;
return false;
} else {
struct net_device *dev;

if (e->ip.iniface[0] == '\0') {
printk(KERN_WARNING "CLUSTERIP: Please specify an interface name\n");
return 0;
return false;
}

dev = dev_get_by_name(e->ip.iniface);
if (!dev) {
printk(KERN_WARNING "CLUSTERIP: no such interface %s\n", e->ip.iniface);
return 0;
return false;
}

config = clusterip_config_init(cipinfo,
e->ip.dst.s_addr, dev);
if (!config) {
printk(KERN_WARNING "CLUSTERIP: cannot allocate config\n");
dev_put(dev);
return 0;
return false;
}
dev_mc_add(config->dev,config->clustermac, ETH_ALEN, 0);
}
Expand All @@ -448,10 +448,10 @@ checkentry(const char *tablename,
if (nf_ct_l3proto_try_module_get(target->family) < 0) {
printk(KERN_WARNING "can't load conntrack support for "
"proto=%d\n", target->family);
return 0;
return false;
}

return 1;
return true;
}

/* drop reference count of cluster config when rule is deleted */
Expand Down
30 changes: 15 additions & 15 deletions net/ipv4/netfilter/ipt_ECN.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,27 @@ MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
MODULE_DESCRIPTION("iptables ECN modification module");

/* set ECT codepoint from IP header.
* return 0 if there was an error. */
static inline int
* return false if there was an error. */
static inline bool
set_ect_ip(struct sk_buff **pskb, const struct ipt_ECN_info *einfo)
{
struct iphdr *iph = ip_hdr(*pskb);

if ((iph->tos & IPT_ECN_IP_MASK) != (einfo->ip_ect & IPT_ECN_IP_MASK)) {
__u8 oldtos;
if (!skb_make_writable(pskb, sizeof(struct iphdr)))
return 0;
return false;
iph = ip_hdr(*pskb);
oldtos = iph->tos;
iph->tos &= ~IPT_ECN_IP_MASK;
iph->tos |= (einfo->ip_ect & IPT_ECN_IP_MASK);
nf_csum_replace2(&iph->check, htons(oldtos), htons(iph->tos));
}
return 1;
return true;
}

/* Return 0 if there was an error. */
static inline int
/* Return false if there was an error. */
static inline bool
set_ect_tcp(struct sk_buff **pskb, const struct ipt_ECN_info *einfo)
{
struct tcphdr _tcph, *tcph;
Expand All @@ -54,16 +54,16 @@ set_ect_tcp(struct sk_buff **pskb, const struct ipt_ECN_info *einfo)
tcph = skb_header_pointer(*pskb, ip_hdrlen(*pskb),
sizeof(_tcph), &_tcph);
if (!tcph)
return 0;
return false;

if ((!(einfo->operation & IPT_ECN_OP_SET_ECE) ||
tcph->ece == einfo->proto.tcp.ece) &&
((!(einfo->operation & IPT_ECN_OP_SET_CWR) ||
tcph->cwr == einfo->proto.tcp.cwr)))
return 1;
return true;

if (!skb_make_writable(pskb, ip_hdrlen(*pskb) + sizeof(*tcph)))
return 0;
return false;
tcph = (void *)ip_hdr(*pskb) + ip_hdrlen(*pskb);

oldval = ((__be16 *)tcph)[6];
Expand All @@ -74,7 +74,7 @@ set_ect_tcp(struct sk_buff **pskb, const struct ipt_ECN_info *einfo)

nf_proto_csum_replace2(&tcph->check, *pskb,
oldval, ((__be16 *)tcph)[6], 0);
return 1;
return true;
}

static unsigned int
Expand All @@ -99,7 +99,7 @@ target(struct sk_buff **pskb,
return XT_CONTINUE;
}

static int
static bool
checkentry(const char *tablename,
const void *e_void,
const struct xt_target *target,
Expand All @@ -112,20 +112,20 @@ checkentry(const char *tablename,
if (einfo->operation & IPT_ECN_OP_MASK) {
printk(KERN_WARNING "ECN: unsupported ECN operation %x\n",
einfo->operation);
return 0;
return false;
}
if (einfo->ip_ect & ~IPT_ECN_IP_MASK) {
printk(KERN_WARNING "ECN: new ECT codepoint %x out of mask\n",
einfo->ip_ect);
return 0;
return false;
}
if ((einfo->operation & (IPT_ECN_OP_SET_ECE|IPT_ECN_OP_SET_CWR))
&& (e->ip.proto != IPPROTO_TCP || (e->ip.invflags & XT_INV_PROTO))) {
printk(KERN_WARNING "ECN: cannot use TCP operations on a "
"non-tcp rule\n");
return 0;
return false;
}
return 1;
return true;
}

static struct xt_target ipt_ecn_reg = {
Expand Down
16 changes: 8 additions & 8 deletions net/ipv4/netfilter/ipt_LOG.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -435,24 +435,24 @@ ipt_log_target(struct sk_buff **pskb,
return XT_CONTINUE;
}

static int ipt_log_checkentry(const char *tablename,
const void *e,
const struct xt_target *target,
void *targinfo,
unsigned int hook_mask)
static bool ipt_log_checkentry(const char *tablename,
const void *e,
const struct xt_target *target,
void *targinfo,
unsigned int hook_mask)
{
const struct ipt_log_info *loginfo = targinfo;

if (loginfo->level >= 8) {
DEBUGP("LOG: level %u >= 8\n", loginfo->level);
return 0;
return false;
}
if (loginfo->prefix[sizeof(loginfo->prefix)-1] != '\0') {
DEBUGP("LOG: prefix term %i\n",
loginfo->prefix[sizeof(loginfo->prefix)-1]);
return 0;
return false;
}
return 1;
return true;
}

static struct xt_target ipt_log_reg = {
Expand Down
8 changes: 4 additions & 4 deletions net/ipv4/netfilter/ipt_MASQUERADE.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ MODULE_DESCRIPTION("iptables MASQUERADE target module");
static DEFINE_RWLOCK(masq_lock);

/* FIXME: Multiple targets. --RR */
static int
static bool
masquerade_check(const char *tablename,
const void *e,
const struct xt_target *target,
Expand All @@ -48,13 +48,13 @@ masquerade_check(const char *tablename,

if (mr->range[0].flags & IP_NAT_RANGE_MAP_IPS) {
DEBUGP("masquerade_check: bad MAP_IPS.\n");
return 0;
return false;
}
if (mr->rangesize != 1) {
DEBUGP("masquerade_check: bad rangesize %u.\n", mr->rangesize);
return 0;
return false;
}
return 1;
return true;
}

static unsigned int
Expand Down
8 changes: 4 additions & 4 deletions net/ipv4/netfilter/ipt_NETMAP.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ MODULE_DESCRIPTION("iptables 1:1 NAT mapping of IP networks target");
#define DEBUGP(format, args...)
#endif

static int
static bool
check(const char *tablename,
const void *e,
const struct xt_target *target,
Expand All @@ -40,13 +40,13 @@ check(const char *tablename,

if (!(mr->range[0].flags & IP_NAT_RANGE_MAP_IPS)) {
DEBUGP(MODULENAME":check: bad MAP_IPS.\n");
return 0;
return false;
}
if (mr->rangesize != 1) {
DEBUGP(MODULENAME":check: bad rangesize %u.\n", mr->rangesize);
return 0;
return false;
}
return 1;
return true;
}

static unsigned int
Expand Down
8 changes: 4 additions & 4 deletions net/ipv4/netfilter/ipt_REDIRECT.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ MODULE_DESCRIPTION("iptables REDIRECT target module");
#endif

/* FIXME: Take multiple ranges --RR */
static int
static bool
redirect_check(const char *tablename,
const void *e,
const struct xt_target *target,
Expand All @@ -43,13 +43,13 @@ redirect_check(const char *tablename,

if (mr->range[0].flags & IP_NAT_RANGE_MAP_IPS) {
DEBUGP("redirect_check: bad MAP_IPS.\n");
return 0;
return false;
}
if (mr->rangesize != 1) {
DEBUGP("redirect_check: bad rangesize %u.\n", mr->rangesize);
return 0;
return false;
}
return 1;
return true;
}

static unsigned int
Expand Down
16 changes: 8 additions & 8 deletions net/ipv4/netfilter/ipt_REJECT.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,27 +217,27 @@ static unsigned int reject(struct sk_buff **pskb,
return NF_DROP;
}

static int check(const char *tablename,
const void *e_void,
const struct xt_target *target,
void *targinfo,
unsigned int hook_mask)
static bool check(const char *tablename,
const void *e_void,
const struct xt_target *target,
void *targinfo,
unsigned int hook_mask)
{
const struct ipt_reject_info *rejinfo = targinfo;
const struct ipt_entry *e = e_void;

if (rejinfo->with == IPT_ICMP_ECHOREPLY) {
printk("REJECT: ECHOREPLY no longer supported.\n");
return 0;
return false;
} else if (rejinfo->with == IPT_TCP_RESET) {
/* Must specify that it's a TCP packet */
if (e->ip.proto != IPPROTO_TCP
|| (e->ip.invflags & XT_INV_PROTO)) {
DEBUGP("REJECT: TCP_RESET invalid for non-tcp\n");
return 0;
return false;
}
}
return 1;
return true;
}

static struct xt_target ipt_reject_reg = {
Expand Down
Loading

0 comments on commit e1931b7

Please sign in to comment.