diff options
author | David S. Miller <davem@davemloft.net> | 2012-06-15 17:54:11 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-06-15 17:54:11 -0400 |
commit | 81aded24675ebda5de8a68843250ad15584ac38a (patch) | |
tree | 84f7bd5cf86cf010394de92efd5e4c5b636b3d20 /net/dccp | |
parent | 36393395536064e483b73d173f6afc103eadfbc4 (diff) |
ipv6: Handle PMTU in ICMP error handlers.
One tricky issue on the ipv6 side vs. ipv4 is that the ICMP callouts
to handle the error pass the 32-bit info cookie in network byte order
whereas ipv4 passes it around in host byte order.
Like the ipv4 side, we have two helper functions. One for when we
have a socket context and one for when we do not.
ip6ip6 tunnels are not handled here, because they handle PMTU events
by essentially relaying another ICMP packet-too-big message back to
the original sender.
This patch allows us to get rid of rt6_do_pmtu_disc(). It handles all
kinds of situations that simply cannot happen when we do the PMTU
update directly using a fully resolved route.
In fact, the "plen == 128" check in ip6_rt_update_pmtu() can very
likely be removed or changed into a BUG_ON() check. We should never
have a prefixed ipv6 route when we get there.
Another piece of strange history here is that TCP and DCCP, unlike in
ipv4, never invoke the update_pmtu() method from their ICMP error
handlers. This is incredibly astonishing since this is the context
where we have the most accurate context in which to make a PMTU
update, namely we have a fully connected socket and associated cached
socket route.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp')
-rw-r--r-- | net/dccp/ipv6.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index fa9512d86f3b..9991be083ad0 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c | |||
@@ -165,6 +165,8 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | |||
165 | } else | 165 | } else |
166 | dst_hold(dst); | 166 | dst_hold(dst); |
167 | 167 | ||
168 | dst->ops->update_pmtu(dst, ntohl(info)); | ||
169 | |||
168 | if (inet_csk(sk)->icsk_pmtu_cookie > dst_mtu(dst)) { | 170 | if (inet_csk(sk)->icsk_pmtu_cookie > dst_mtu(dst)) { |
169 | dccp_sync_mss(sk, dst_mtu(dst)); | 171 | dccp_sync_mss(sk, dst_mtu(dst)); |
170 | } /* else let the usual retransmit timer handle it */ | 172 | } /* else let the usual retransmit timer handle it */ |