[IPV6] MIP6: Add socket option and ancillary data interface of routing header type 2. (280a9d34) · Commits · 戴 / test

Add socket option and ancillary data interface of routing header type 2. Mobile IPv6 application will use this to send binding acknowledgement with the header without relation of confirmed route optimization (binding). Based on MIPL2 kernel patch. Signed-off-by:

Masahide NAKAMURA <nakam@linux-ipv6.org> Signed-off-by:

YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/ipv6/datagram.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -648,10 +648,13 @@ int datagram_send_ctl(struct msghdr msg, struct flowi fl,

		rthdr = (struct ipv6_rt_hdr *)CMSG_DATA(cmsg);

		/*
		* TYPE 0
		*/
		if (rthdr->type) {
		switch (rthdr->type) {
		case IPV6_SRCRT_TYPE_0:
		#ifdef CONFIG_IPV6_MIP6
		case IPV6_SRCRT_TYPE_2:
		#endif
		break;
		default:
		err = -EINVAL;
		goto exit_f;
		}

net/ipv6/ipv6_sockglue.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -407,8 +407,16 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
		/* routing header option needs extra check */
		if (optname == IPV6_RTHDR && opt->srcrt) {
		struct ipv6_rt_hdr *rthdr = opt->srcrt;
		if (rthdr->type)
		switch (rthdr->type) {
		case IPV6_SRCRT_TYPE_0:
		#ifdef CONFIG_IPV6_MIP6
		case IPV6_SRCRT_TYPE_2:
		#endif
		break;
		default:
		goto sticky_done;
		}

		if ((rthdr->hdrlen & 1) \|\|
		(rthdr->hdrlen >> 1) != rthdr->segments_left)
		goto sticky_done;

Admin message