mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-22 23:04:43 +00:00
[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>
This commit is contained in:
parent
832b4c5e18
commit
8f491069b4
4 changed files with 43 additions and 26 deletions
|
@ -951,9 +951,9 @@ static struct sock *tcp_v4_hnd_req(struct sock *sk, struct sk_buff *skb)
|
|||
if (req)
|
||||
return tcp_check_req(sk, skb, req, prev);
|
||||
|
||||
nsk = __inet_lookup_established(&tcp_hashinfo, skb->nh.iph->saddr,
|
||||
th->source, skb->nh.iph->daddr,
|
||||
ntohs(th->dest), inet_iif(skb));
|
||||
nsk = inet_lookup_established(&tcp_hashinfo, skb->nh.iph->saddr,
|
||||
th->source, skb->nh.iph->daddr,
|
||||
th->dest, inet_iif(skb));
|
||||
|
||||
if (nsk) {
|
||||
if (nsk->sk_state != TCP_TIME_WAIT) {
|
||||
|
@ -1090,7 +1090,7 @@ int tcp_v4_rcv(struct sk_buff *skb)
|
|||
TCP_SKB_CB(skb)->sacked = 0;
|
||||
|
||||
sk = __inet_lookup(&tcp_hashinfo, skb->nh.iph->saddr, th->source,
|
||||
skb->nh.iph->daddr, ntohs(th->dest),
|
||||
skb->nh.iph->daddr, th->dest,
|
||||
inet_iif(skb));
|
||||
|
||||
if (!sk)
|
||||
|
@ -1168,7 +1168,7 @@ do_time_wait:
|
|||
case TCP_TW_SYN: {
|
||||
struct sock *sk2 = inet_lookup_listener(&tcp_hashinfo,
|
||||
skb->nh.iph->daddr,
|
||||
ntohs(th->dest),
|
||||
th->dest,
|
||||
inet_iif(skb));
|
||||
if (sk2) {
|
||||
inet_twsk_deschedule((struct inet_timewait_sock *)sk,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue