aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@computergmbh.de>2008-04-14 05:15:52 -0400
committerPatrick McHardy <kaber@trash.net>2008-04-14 05:15:52 -0400
commit8ce8439a31f723f3aa28adf27fe8797a5678dde1 (patch)
treef34b193c50f15878e8aa7f3bd5054f1f04958dbe /net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
parent9dbae7917899d78a094aceeb5062cd76efa89052 (diff)
[NETFILTER]: nf_conntrack: use bool type in struct nf_conntrack_l3proto
Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de> Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c')
-rw-r--r--net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
index 41e79613eb0..cacb9cb27da 100644
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
@@ -30,29 +30,29 @@ int (*nf_nat_seq_adjust_hook)(struct sk_buff *skb,
30 enum ip_conntrack_info ctinfo); 30 enum ip_conntrack_info ctinfo);
31EXPORT_SYMBOL_GPL(nf_nat_seq_adjust_hook); 31EXPORT_SYMBOL_GPL(nf_nat_seq_adjust_hook);
32 32
33static int ipv4_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff, 33static bool ipv4_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff,
34 struct nf_conntrack_tuple *tuple) 34 struct nf_conntrack_tuple *tuple)
35{ 35{
36 const __be32 *ap; 36 const __be32 *ap;
37 __be32 _addrs[2]; 37 __be32 _addrs[2];
38 ap = skb_header_pointer(skb, nhoff + offsetof(struct iphdr, saddr), 38 ap = skb_header_pointer(skb, nhoff + offsetof(struct iphdr, saddr),
39 sizeof(u_int32_t) * 2, _addrs); 39 sizeof(u_int32_t) * 2, _addrs);
40 if (ap == NULL) 40 if (ap == NULL)
41 return 0; 41 return false;
42 42
43 tuple->src.u3.ip = ap[0]; 43 tuple->src.u3.ip = ap[0];
44 tuple->dst.u3.ip = ap[1]; 44 tuple->dst.u3.ip = ap[1];
45 45
46 return 1; 46 return true;
47} 47}
48 48
49static int ipv4_invert_tuple(struct nf_conntrack_tuple *tuple, 49static bool ipv4_invert_tuple(struct nf_conntrack_tuple *tuple,
50 const struct nf_conntrack_tuple *orig) 50 const struct nf_conntrack_tuple *orig)
51{ 51{
52 tuple->src.u3.ip = orig->dst.u3.ip; 52 tuple->src.u3.ip = orig->dst.u3.ip;
53 tuple->dst.u3.ip = orig->src.u3.ip; 53 tuple->dst.u3.ip = orig->src.u3.ip;
54 54
55 return 1; 55 return true;
56} 56}
57 57
58static int ipv4_print_tuple(struct seq_file *s, 58static int ipv4_print_tuple(struct seq_file *s,