OSDN Git Service

ipv4: Save nexthop address of LSRR/SSRR option to IPCB.
authorLi Wei <lw@cn.fujitsu.com>
Tue, 22 Nov 2011 23:33:10 +0000 (23:33 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 Mar 2012 00:34:02 +0000 (16:34 -0800)
commit5805d4729059f578c8283ccc44021342fbe8c93d
treed962beed4be7d5689185cc2d465a7906dd82176e
parentc4f2403478002bdb0a46a62f87909aeda8058d8b
ipv4: Save nexthop address of LSRR/SSRR option to IPCB.

[ Upstream commit ac8a48106be49c422575ddc7531b776f8eb49610 ]

We can not update iph->daddr in ip_options_rcv_srr(), It is too early.
When some exception ocurred later (eg. in ip_forward() when goto
sr_failed) we need the ip header be identical to the original one as
ICMP need it.

Add a field 'nexthop' in struct ip_options to save nexthop of LSRR
or SSRR option.

Signed-off-by: Li Wei <lw@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
include/net/inet_sock.h
net/ipv4/ip_forward.c
net/ipv4/ip_options.c