diff options
author | Eric Dumazet <edumazet@google.com> | 2015-03-25 00:45:56 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-25 00:57:48 -0400 |
commit | 0144a81cccf7532bead90f0542f517bd028d3b3c (patch) | |
tree | ee5dd135f364e5111388180183f9a4d4918b3ecb /net/ipv4/tcp_ipv4.c | |
parent | d631b94e7a15277858ec5f88d674d93080506999 (diff) |
tcp: fix ipv4 mapped request socks
ss should display ipv4 mapped request sockets like this :
tcp SYN-RECV 0 0 ::ffff:192.168.0.1:8080 ::ffff:192.0.2.1:35261
and not like this :
tcp SYN-RECV 0 0 192.168.0.1:8080 192.0.2.1:35261
We should init ireq->ireq_family based on listener sk_family,
not the actual protocol carried by SYN packet.
This means we can set ireq_family in inet_reqsk_alloc()
Fixes: 3f66b083a5b7 ("inet: introduce ireq_family")
Signed-off-by: Eric Dumazet <edumazet@google.com>
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 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index fc8995a702a6..e073517b2cc7 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -1206,7 +1206,6 @@ static void tcp_v4_init_req(struct request_sock *req, struct sock *sk_listener, | |||
1206 | sk_daddr_set(req_to_sk(req), ip_hdr(skb)->saddr); | 1206 | sk_daddr_set(req_to_sk(req), ip_hdr(skb)->saddr); |
1207 | ireq->no_srccheck = inet_sk(sk_listener)->transparent; | 1207 | ireq->no_srccheck = inet_sk(sk_listener)->transparent; |
1208 | ireq->opt = tcp_v4_save_options(skb); | 1208 | ireq->opt = tcp_v4_save_options(skb); |
1209 | ireq->ireq_family = AF_INET; | ||
1210 | } | 1209 | } |
1211 | 1210 | ||
1212 | static struct dst_entry *tcp_v4_route_req(struct sock *sk, struct flowi *fl, | 1211 | static struct dst_entry *tcp_v4_route_req(struct sock *sk, struct flowi *fl, |