From a806a7153ffa1df5deb3921f5da709b7b7f87e21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Tue, 31 Mar 2020 19:55:06 -0700 Subject: [PATCH] NetlinkEvent - ignore captive portal and pref64 nd user opts These are provided to userspace by newer kernels. Test: builds Bug: 150648313 Change-Id: I811c75e9a4739db149f502b9a43c99a8ed883341 --- libsysutils/src/NetlinkEvent.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libsysutils/src/NetlinkEvent.cpp b/libsysutils/src/NetlinkEvent.cpp index 2351afa8e..5efe03f13 100644 --- a/libsysutils/src/NetlinkEvent.cpp +++ b/libsysutils/src/NetlinkEvent.cpp @@ -529,6 +529,10 @@ bool NetlinkEvent::parseNdUserOptMessage(const struct nlmsghdr *nh) { free(buf); } else if (opthdr->nd_opt_type == ND_OPT_DNSSL) { // TODO: support DNSSL. + } else if (opthdr->nd_opt_type == ND_OPT_CAPTIVE_PORTAL) { + // TODO: support CAPTIVE PORTAL. + } else if (opthdr->nd_opt_type == ND_OPT_PREF64) { + // TODO: support PREF64. } else { SLOGD("Unknown ND option type %d\n", opthdr->nd_opt_type); return false;