[NETFILTER]: x_tables: switch xt_target->checkentry to bool

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>

13 files changed, 97 insertions, 97 deletions

diff --git a/net/ipv4/netfilter/arpt_mangle.c b/net/ipv4/netfilter/arpt_mangle.c
index 6298d404e7c..497a16e0b06 100644
--- a/net/ipv4/netfilter/arpt_mangle.c
+++ b/net/ipv4/netfilter/arpt_mangle.c
@@ -65,7 +65,7 @@ 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)
 {
@@ -73,12 +73,12 @@ checkentry(const char *tablename, const void *e, const struct xt_target *target,
 
         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 = {
diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index 40e27342139..e82339a78c0 100644
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -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
 
@@ -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,
@@ -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 */
@@ -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
@@ -418,19 +418,19 @@ 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,
@@ -438,7 +438,7 @@ checkentry(const char *tablename,
                         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);
                 }
@@ -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 */
diff --git a/net/ipv4/netfilter/ipt_ECN.c b/net/ipv4/netfilter/ipt_ECN.c
index 918ca92e534..02367012fc7 100644
--- a/net/ipv4/netfilter/ipt_ECN.c
+++ b/net/ipv4/netfilter/ipt_ECN.c
@@ -24,8 +24,8 @@ 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);
@@ -33,18 +33,18 @@ set_ect_ip(struct sk_buff **pskb, const struct ipt_ECN_info *einfo)
         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;
@@ -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];
@@ -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
@@ -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,
@@ -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 = {
diff --git a/net/ipv4/netfilter/ipt_LOG.c b/net/ipv4/netfilter/ipt_LOG.c
index a42c5cd968b..bbff6c352ef 100644
--- a/net/ipv4/netfilter/ipt_LOG.c
+++ b/net/ipv4/netfilter/ipt_LOG.c
@@ -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 = {
diff --git a/net/ipv4/netfilter/ipt_MASQUERADE.c b/net/ipv4/netfilter/ipt_MASQUERADE.c
index d4f2d777533..b5b216408ee 100644
--- a/net/ipv4/netfilter/ipt_MASQUERADE.c
+++ b/net/ipv4/netfilter/ipt_MASQUERADE.c
@@ -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,
@@ -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
diff --git a/net/ipv4/netfilter/ipt_NETMAP.c b/net/ipv4/netfilter/ipt_NETMAP.c
index 068c69bce30..a902c71218b 100644
--- a/net/ipv4/netfilter/ipt_NETMAP.c
+++ b/net/ipv4/netfilter/ipt_NETMAP.c
@@ -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,
@@ -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
diff --git a/net/ipv4/netfilter/ipt_REDIRECT.c b/net/ipv4/netfilter/ipt_REDIRECT.c
index 68cc76a198e..2a04103b50d 100644
--- a/net/ipv4/netfilter/ipt_REDIRECT.c
+++ b/net/ipv4/netfilter/ipt_REDIRECT.c
@@ -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,
@@ -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
diff --git a/net/ipv4/netfilter/ipt_REJECT.c b/net/ipv4/netfilter/ipt_REJECT.c
index 9041e0741f6..5c3270d325f 100644
--- a/net/ipv4/netfilter/ipt_REJECT.c
+++ b/net/ipv4/netfilter/ipt_REJECT.c
@@ -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 = {
diff --git a/net/ipv4/netfilter/ipt_SAME.c b/net/ipv4/netfilter/ipt_SAME.c
index 511e5ff8493..3649fabc04e 100644
--- a/net/ipv4/netfilter/ipt_SAME.c
+++ b/net/ipv4/netfilter/ipt_SAME.c
@@ -33,7 +33,7 @@ MODULE_DESCRIPTION("iptables special SNAT module for consistent sourceip");
 #define DEBUGP(format, args...)
 #endif
 
-static int
+static bool
 same_check(const char *tablename,
               const void *e,
               const struct xt_target *target,
@@ -47,13 +47,13 @@ same_check(const char *tablename,
 
         if (mr->rangesize < 1) {
                 DEBUGP("same_check: need at least one dest range.\n");
-                return 0;
+                return false;
         }
         if (mr->rangesize > IPT_SAME_MAX_RANGE) {
                 DEBUGP("same_check: too many ranges specified, maximum "
                                 "is %u ranges\n",
                                 IPT_SAME_MAX_RANGE);
-                return 0;
+                return false;
         }
         for (count = 0; count < mr->rangesize; count++) {
                 if (ntohl(mr->range[count].min_ip) >
@@ -62,11 +62,11 @@ same_check(const char *tablename,
                                 "range `%u.%u.%u.%u-%u.%u.%u.%u'.\n",
                                 NIPQUAD(mr->range[count].min_ip),
                                 NIPQUAD(mr->range[count].max_ip));
-                        return 0;
+                        return false;
                 }
                 if (!(mr->range[count].flags & IP_NAT_RANGE_MAP_IPS)) {
                         DEBUGP("same_check: bad MAP_IPS.\n");
-                        return 0;
+                        return false;
                 }
                 rangeip = (ntohl(mr->range[count].max_ip) -
                                         ntohl(mr->range[count].min_ip) + 1);
@@ -81,7 +81,7 @@ same_check(const char *tablename,
                 DEBUGP("same_check: Couldn't allocate %u bytes "
                         "for %u ipaddresses!\n",
                         (sizeof(u_int32_t) * mr->ipnum), mr->ipnum);
-                return 0;
+                return false;
         }
         DEBUGP("same_check: Allocated %u bytes for %u ipaddresses.\n",
                         (sizeof(u_int32_t) * mr->ipnum), mr->ipnum);
@@ -97,7 +97,7 @@ same_check(const char *tablename,
                         index++;
                 }
         }
-        return 1;
+        return true;
 }
 
 static void
diff --git a/net/ipv4/netfilter/ipt_TOS.c b/net/ipv4/netfilter/ipt_TOS.c
index 0ad02f24983..ac43e86afbc 100644
--- a/net/ipv4/netfilter/ipt_TOS.c
+++ b/net/ipv4/netfilter/ipt_TOS.c
@@ -43,7 +43,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,
@@ -58,9 +58,9 @@ checkentry(const char *tablename,
             && tos != IPTOS_MINCOST
             && tos != IPTOS_NORMALSVC) {
                 printk(KERN_WARNING "TOS: bad tos value %#x\n", tos);
-                return 0;
+                return false;
         }
-        return 1;
+        return true;
 }
 
 static struct xt_target ipt_tos_reg = {
diff --git a/net/ipv4/netfilter/ipt_TTL.c b/net/ipv4/netfilter/ipt_TTL.c
index a991ec7bd4e..96b6e3514c2 100644
--- a/net/ipv4/netfilter/ipt_TTL.c
+++ b/net/ipv4/netfilter/ipt_TTL.c
@@ -62,7 +62,7 @@ ipt_ttl_target(struct sk_buff **pskb,
         return XT_CONTINUE;
 }
 
-static int ipt_ttl_checkentry(const char *tablename,
+static bool ipt_ttl_checkentry(const char *tablename,
                 const void *e,
                 const struct xt_target *target,
                 void *targinfo,
@@ -73,11 +73,11 @@ static int ipt_ttl_checkentry(const char *tablename,
         if (info->mode > IPT_TTL_MAXMODE) {
                 printk(KERN_WARNING "ipt_TTL: invalid or unknown Mode %u\n",
                         info->mode);
-                return 0;
+                return false;
         }
         if ((info->mode != IPT_TTL_SET) && (info->ttl == 0))
-                return 0;
-        return 1;
+                return false;
+        return true;
 }
 
 static struct xt_target ipt_TTL = {
diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c
index 23b607b33b3..dfa7afd8476 100644
--- a/net/ipv4/netfilter/ipt_ULOG.c
+++ b/net/ipv4/netfilter/ipt_ULOG.c
@@ -328,25 +328,25 @@ static void ipt_logfn(unsigned int pf,
         ipt_ulog_packet(hooknum, skb, in, out, &loginfo, prefix);
 }
 
-static int ipt_ulog_checkentry(const char *tablename,
-                               const void *e,
-                               const struct xt_target *target,
-                               void *targinfo,
-                               unsigned int hookmask)
+static bool ipt_ulog_checkentry(const char *tablename,
+                                const void *e,
+                                const struct xt_target *target,
+                                void *targinfo,
+                                unsigned int hookmask)
 {
         struct ipt_ulog_info *loginfo = (struct ipt_ulog_info *) targinfo;
 
         if (loginfo->prefix[sizeof(loginfo->prefix) - 1] != '\0') {
                 DEBUGP("ipt_ULOG: prefix term %i\n",
                        loginfo->prefix[sizeof(loginfo->prefix) - 1]);
-                return 0;
+                return false;
         }
         if (loginfo->qthreshold > ULOG_MAX_QLEN) {
                 DEBUGP("ipt_ULOG: queue threshold %i > MAX_QLEN\n",
                         loginfo->qthreshold);
-                return 0;
+                return false;
         }
-        return 1;
+        return true;
 }
 
 #ifdef CONFIG_COMPAT
diff --git a/net/ipv4/netfilter/nf_nat_rule.c b/net/ipv4/netfilter/nf_nat_rule.c
index 6740736c5e7..fc3d9437beb 100644
--- a/net/ipv4/netfilter/nf_nat_rule.c
+++ b/net/ipv4/netfilter/nf_nat_rule.c
@@ -140,36 +140,36 @@ static unsigned int ipt_dnat_target(struct sk_buff **pskb,
         return nf_nat_setup_info(ct, &mr->range[0], hooknum);
 }
 
-static int ipt_snat_checkentry(const char *tablename,
-                               const void *entry,
-                               const struct xt_target *target,
-                               void *targinfo,
-                               unsigned int hook_mask)
+static bool ipt_snat_checkentry(const char *tablename,
+                                const void *entry,
+                                const struct xt_target *target,
+                                void *targinfo,
+                                unsigned int hook_mask)
 {
         struct nf_nat_multi_range_compat *mr = targinfo;
 
         /* Must be a valid range */
         if (mr->rangesize != 1) {
                 printk("SNAT: multiple ranges no longer supported\n");
-                return 0;
+                return false;
         }
-        return 1;
+        return true;
 }
 
-static int ipt_dnat_checkentry(const char *tablename,
-                               const void *entry,
-                               const struct xt_target *target,
-                               void *targinfo,
-                               unsigned int hook_mask)
+static bool ipt_dnat_checkentry(const char *tablename,
+                                const void *entry,
+                                const struct xt_target *target,
+                                void *targinfo,
+                                unsigned int hook_mask)
 {
         struct nf_nat_multi_range_compat *mr = targinfo;
 
         /* Must be a valid range */
         if (mr->rangesize != 1) {
                 printk("DNAT: multiple ranges no longer supported\n");
-                return 0;
+                return false;
         }
-        return 1;
+        return true;
 }
 
 inline unsigned int