commit 53165692caa29ee7c37b098cc2df26d8aa0298bb
author Patrick Rohr <prohr@google.com> Tue Jul 19 19:30:50 2022 -0700
committer Patrick Rohr <prohr@google.com> Thu Jul 21 12:21:46 2022 -0700
tree 2d0f057129343611ad21589c43d6ce0f6d48ee26
parent 406063f0e2753138dd2b91b4237817b8e0dc9ce1

RaResponder: add slla option to RA

Test: test only change
Change-Id: I75beb79cd95489c8a93bd930eb54fc0cb8168cdf

staticlibs/testutils/devicetests/com/android/testutils/RouterAdvertisementResponder.java

diff --git a/staticlibs/testutils/devicetests/com/android/testutils/RouterAdvertisementResponder.java b/staticlibs/testutils/devicetests/com/android/testutils/RouterAdvertisementResponder.java
index 91c3f76..21cb149 100644
--- a/staticlibs/testutils/devicetests/com/android/testutils/RouterAdvertisementResponder.java
+++ b/staticlibs/testutils/devicetests/com/android/testutils/RouterAdvertisementResponder.java
@@ -19,6 +19,7 @@
 import static android.system.OsConstants.IPPROTO_ICMPV6;
 
 import static com.android.net.module.util.NetworkStackConstants.ETHER_TYPE_IPV6;
+import static com.android.net.module.util.NetworkStackConstants.ICMPV6_ND_OPTION_SLLA;
 import static com.android.net.module.util.NetworkStackConstants.ICMPV6_ND_OPTION_TLLA;
 import static com.android.net.module.util.NetworkStackConstants.ICMPV6_NEIGHBOR_SOLICITATION;
 import static com.android.net.module.util.NetworkStackConstants.ICMPV6_ROUTER_SOLICITATION;
@@ -114,10 +115,15 @@
         return RdnssOption.build(3600/*lifetime, must be at least 120*/, DNS_SERVER);
     }
 
+    private ByteBuffer buildSllaOption(MacAddress srcMac) {
+        return LlaOption.build((byte) ICMPV6_ND_OPTION_SLLA, srcMac);
+    }
+
     private ByteBuffer buildRaPacket(MacAddress srcMac, MacAddress dstMac, Inet6Address srcIp) {
         return Ipv6Utils.buildRaPacket(srcMac, dstMac, srcIp, IPV6_ADDR_ALL_NODES_MULTICAST,
                 (byte) 0 /*M=0, O=0*/, 3600 /*lifetime*/, 0 /*reachableTime, unspecified*/,
-                0/*retransTimer, unspecified*/, buildPrefixOption(), buildRdnssOption());
+                0/*retransTimer, unspecified*/, buildPrefixOption(), buildRdnssOption(),
+                buildSllaOption(srcMac));
     }
 
     private static void sendResponse(TapPacketReader reader, ByteBuffer buffer) {