diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2006-08-09 18:47:12 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-22 17:54:14 -0400 |
commit | 8f491069b40be5d627007a343f99759e9da6a178 (patch) | |
tree | ba2be735de32fa30015fe22febf4329c8e79ca25 /net/ipv4/tcp_ipv4.c | |
parent | 832b4c5e184391773e462653aa862a8cab71f38d (diff) |
[IPV4]: Use network-order dport for all visible inet_lookup_*
Right now most inet_lookup_* functions take a host-order hnum instead
of a network-order dport because that's how it is represented
internally.
This means that users of these functions have to be careful about
using the right byte-order. To add more confusion, inet_lookup takes
a network-order dport unlike all other functions.
So this patch changes all visible inet_lookup functions to take a
dport and move all dport->hnum conversion inside them.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index b2aa512a30e..2973dee0a48 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -951,9 +951,9 @@ static struct sock *tcp_v4_hnd_req(struct sock *sk, struct sk_buff *skb) | |||
951 | if (req) | 951 | if (req) |
952 | return tcp_check_req(sk, skb, req, prev); | 952 | return tcp_check_req(sk, skb, req, prev); |
953 | 953 | ||
954 | nsk = __inet_lookup_established(&tcp_hashinfo, skb->nh.iph->saddr, | 954 | nsk = inet_lookup_established(&tcp_hashinfo, skb->nh.iph->saddr, |
955 | th->source, skb->nh.iph->daddr, | 955 | th->source, skb->nh.iph->daddr, |
956 | ntohs(th->dest), inet_iif(skb)); | 956 | th->dest, inet_iif(skb)); |
957 | 957 | ||
958 | if (nsk) { | 958 | if (nsk) { |
959 | if (nsk->sk_state != TCP_TIME_WAIT) { | 959 | if (nsk->sk_state != TCP_TIME_WAIT) { |
@@ -1090,7 +1090,7 @@ int tcp_v4_rcv(struct sk_buff *skb) | |||
1090 | TCP_SKB_CB(skb)->sacked = 0; | 1090 | TCP_SKB_CB(skb)->sacked = 0; |
1091 | 1091 | ||
1092 | sk = __inet_lookup(&tcp_hashinfo, skb->nh.iph->saddr, th->source, | 1092 | sk = __inet_lookup(&tcp_hashinfo, skb->nh.iph->saddr, th->source, |
1093 | skb->nh.iph->daddr, ntohs(th->dest), | 1093 | skb->nh.iph->daddr, th->dest, |
1094 | inet_iif(skb)); | 1094 | inet_iif(skb)); |
1095 | 1095 | ||
1096 | if (!sk) | 1096 | if (!sk) |
@@ -1168,7 +1168,7 @@ do_time_wait: | |||
1168 | case TCP_TW_SYN: { | 1168 | case TCP_TW_SYN: { |
1169 | struct sock *sk2 = inet_lookup_listener(&tcp_hashinfo, | 1169 | struct sock *sk2 = inet_lookup_listener(&tcp_hashinfo, |
1170 | skb->nh.iph->daddr, | 1170 | skb->nh.iph->daddr, |
1171 | ntohs(th->dest), | 1171 | th->dest, |
1172 | inet_iif(skb)); | 1172 | inet_iif(skb)); |
1173 | if (sk2) { | 1173 | if (sk2) { |
1174 | inet_twsk_deschedule((struct inet_timewait_sock *)sk, | 1174 | inet_twsk_deschedule((struct inet_timewait_sock *)sk, |