Commit 8ce8439a authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Patrick McHardy

[NETFILTER]: nf_conntrack: use bool type in struct nf_conntrack_l3proto

Signed-off-by: default avatarJan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 9dbae791
...@@ -28,14 +28,14 @@ struct nf_conntrack_l3proto ...@@ -28,14 +28,14 @@ struct nf_conntrack_l3proto
* Try to fill in the third arg: nhoff is offset of l3 proto * Try to fill in the third arg: nhoff is offset of l3 proto
* hdr. Return true if possible. * hdr. Return true if possible.
*/ */
int (*pkt_to_tuple)(const struct sk_buff *skb, unsigned int nhoff, bool (*pkt_to_tuple)(const struct sk_buff *skb, unsigned int nhoff,
struct nf_conntrack_tuple *tuple); struct nf_conntrack_tuple *tuple);
/* /*
* Invert the per-proto part of the tuple: ie. turn xmit into reply. * Invert the per-proto part of the tuple: ie. turn xmit into reply.
* Some packets can't be inverted: return 0 in that case. * Some packets can't be inverted: return 0 in that case.
*/ */
int (*invert_tuple)(struct nf_conntrack_tuple *inverse, bool (*invert_tuple)(struct nf_conntrack_tuple *inverse,
const struct nf_conntrack_tuple *orig); const struct nf_conntrack_tuple *orig);
/* Print out the per-protocol part of the tuple. */ /* Print out the per-protocol part of the tuple. */
......
...@@ -30,7 +30,7 @@ int (*nf_nat_seq_adjust_hook)(struct sk_buff *skb, ...@@ -30,7 +30,7 @@ int (*nf_nat_seq_adjust_hook)(struct sk_buff *skb,
enum ip_conntrack_info ctinfo); enum ip_conntrack_info ctinfo);
EXPORT_SYMBOL_GPL(nf_nat_seq_adjust_hook); EXPORT_SYMBOL_GPL(nf_nat_seq_adjust_hook);
static int ipv4_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff, static bool ipv4_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff,
struct nf_conntrack_tuple *tuple) struct nf_conntrack_tuple *tuple)
{ {
const __be32 *ap; const __be32 *ap;
...@@ -38,21 +38,21 @@ static int ipv4_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff, ...@@ -38,21 +38,21 @@ static int ipv4_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff,
ap = skb_header_pointer(skb, nhoff + offsetof(struct iphdr, saddr), ap = skb_header_pointer(skb, nhoff + offsetof(struct iphdr, saddr),
sizeof(u_int32_t) * 2, _addrs); sizeof(u_int32_t) * 2, _addrs);
if (ap == NULL) if (ap == NULL)
return 0; return false;
tuple->src.u3.ip = ap[0]; tuple->src.u3.ip = ap[0];
tuple->dst.u3.ip = ap[1]; tuple->dst.u3.ip = ap[1];
return 1; return true;
} }
static int ipv4_invert_tuple(struct nf_conntrack_tuple *tuple, static bool ipv4_invert_tuple(struct nf_conntrack_tuple *tuple,
const struct nf_conntrack_tuple *orig) const struct nf_conntrack_tuple *orig)
{ {
tuple->src.u3.ip = orig->dst.u3.ip; tuple->src.u3.ip = orig->dst.u3.ip;
tuple->dst.u3.ip = orig->src.u3.ip; tuple->dst.u3.ip = orig->src.u3.ip;
return 1; return true;
} }
static int ipv4_print_tuple(struct seq_file *s, static int ipv4_print_tuple(struct seq_file *s,
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <net/netfilter/nf_conntrack_l3proto.h> #include <net/netfilter/nf_conntrack_l3proto.h>
#include <net/netfilter/nf_conntrack_core.h> #include <net/netfilter/nf_conntrack_core.h>
static int ipv6_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff, static bool ipv6_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff,
struct nf_conntrack_tuple *tuple) struct nf_conntrack_tuple *tuple)
{ {
const u_int32_t *ap; const u_int32_t *ap;
...@@ -36,21 +36,21 @@ static int ipv6_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff, ...@@ -36,21 +36,21 @@ static int ipv6_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff,
ap = skb_header_pointer(skb, nhoff + offsetof(struct ipv6hdr, saddr), ap = skb_header_pointer(skb, nhoff + offsetof(struct ipv6hdr, saddr),
sizeof(_addrs), _addrs); sizeof(_addrs), _addrs);
if (ap == NULL) if (ap == NULL)
return 0; return false;
memcpy(tuple->src.u3.ip6, ap, sizeof(tuple->src.u3.ip6)); memcpy(tuple->src.u3.ip6, ap, sizeof(tuple->src.u3.ip6));
memcpy(tuple->dst.u3.ip6, ap + 4, sizeof(tuple->dst.u3.ip6)); memcpy(tuple->dst.u3.ip6, ap + 4, sizeof(tuple->dst.u3.ip6));
return 1; return true;
} }
static int ipv6_invert_tuple(struct nf_conntrack_tuple *tuple, static bool ipv6_invert_tuple(struct nf_conntrack_tuple *tuple,
const struct nf_conntrack_tuple *orig) const struct nf_conntrack_tuple *orig)
{ {
memcpy(tuple->src.u3.ip6, orig->dst.u3.ip6, sizeof(tuple->src.u3.ip6)); memcpy(tuple->src.u3.ip6, orig->dst.u3.ip6, sizeof(tuple->src.u3.ip6));
memcpy(tuple->dst.u3.ip6, orig->src.u3.ip6, sizeof(tuple->dst.u3.ip6)); memcpy(tuple->dst.u3.ip6, orig->src.u3.ip6, sizeof(tuple->dst.u3.ip6));
return 1; return true;
} }
static int ipv6_print_tuple(struct seq_file *s, static int ipv6_print_tuple(struct seq_file *s,
......
...@@ -31,22 +31,22 @@ ...@@ -31,22 +31,22 @@
#include <net/netfilter/nf_conntrack_core.h> #include <net/netfilter/nf_conntrack_core.h>
#include <net/netfilter/ipv4/nf_conntrack_ipv4.h> #include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
static int generic_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff, static bool generic_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff,
struct nf_conntrack_tuple *tuple) struct nf_conntrack_tuple *tuple)
{ {
memset(&tuple->src.u3, 0, sizeof(tuple->src.u3)); memset(&tuple->src.u3, 0, sizeof(tuple->src.u3));
memset(&tuple->dst.u3, 0, sizeof(tuple->dst.u3)); memset(&tuple->dst.u3, 0, sizeof(tuple->dst.u3));
return 1; return true;
} }
static int generic_invert_tuple(struct nf_conntrack_tuple *tuple, static bool generic_invert_tuple(struct nf_conntrack_tuple *tuple,
const struct nf_conntrack_tuple *orig) const struct nf_conntrack_tuple *orig)
{ {
memset(&tuple->src.u3, 0, sizeof(tuple->src.u3)); memset(&tuple->src.u3, 0, sizeof(tuple->src.u3));
memset(&tuple->dst.u3, 0, sizeof(tuple->dst.u3)); memset(&tuple->dst.u3, 0, sizeof(tuple->dst.u3));
return 1; return true;
} }
static int generic_print_tuple(struct seq_file *s, static int generic_print_tuple(struct seq_file *s,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment