Commit 66b5f1c4 authored Jul 18, 2019 by Maciej Żenczykowski Committed by David S. Miller Jul 22, 2019

net-ipv6-ndisc: add support for RFC7710 RA Captive Portal Identifier

This is trivial since we already have support for the entirely
identical (from the kernel's point of view) RDNSS and DNSSL that
also contain opaque data that needs to be passed down to userspace.

As specified in RFC7710, Captive Portal option contains a URL.
8-bit identifier of the option type as assigned by the IANA is 37.
This option should also be treated as userland.

Hence, treat ND option 37 as userland (Captive Portal support)

See:
  https://tools.ietf.org/html/rfc7710
  https://www.iana.org/assignments/icmpv6-parameters/icmpv6-parameters.xhtml



Fixes: e35f30c1
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Cc: Lorenzo Colitti <lorenzo@google.com>
Cc: Remin Nguyen Van <reminv@google.com>
Cc: Alexey I. Froloff <raorn@raorn.name>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 7b5cf701

include/net/ndisc.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ enum {
		ND_OPT_RDNSS = 25, /* RFC5006 */
		ND_OPT_DNSSL = 31, /* RFC6106 */
		ND_OPT_6CO = 34, /* RFC6775 */
		ND_OPT_CAPTIVE_PORTAL = 37, /* RFC7710 */
		__ND_OPT_MAX
		};

net/ipv6/ndisc.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -196,6 +196,7 @@ static inline int ndisc_is_useropt(const struct net_device *dev,
		{
		return opt->nd_opt_type == ND_OPT_RDNSS \|\|
		opt->nd_opt_type == ND_OPT_DNSSL \|\|
		opt->nd_opt_type == ND_OPT_CAPTIVE_PORTAL \|\|
		ndisc_ops_is_useropt(dev, opt->nd_opt_type);
		}

Admin message