commit 38ec04fe6d851c138c2625ea33315bd88f4024ab
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Dec 09 04:09:20 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Dec 09 04:09:20 2023 +0000
tree 0cf0ddf97594674e8c53051e1293c723bb00950c
parent 24057ae74a6a1a974112a0f77d003d204e671f1f
parent 9597e5f733f7d6aa3f9e1a0b17e14f2b3a1958db

Snap for 11200327 from 9597e5f733f7d6aa3f9e1a0b17e14f2b3a1958db to 24Q1-release

Change-Id: I173caaf0c947a323b657c5e69946a96bef660fc2

src/android/otdaemon_server.cpp

diff --git a/src/android/otdaemon_server.cpp b/src/android/otdaemon_server.cpp
index f3e0cab..cf67016 100644
--- a/src/android/otdaemon_server.cpp
+++ b/src/android/otdaemon_server.cpp
@@ -249,7 +249,7 @@
     }
 }
 
-void OtDaemonServer::HandleBackboneMulticastListenerEvent(void                   *aBinderServer,
+void OtDaemonServer::HandleBackboneMulticastListenerEvent(void                                  *aBinderServer,
                                                           otBackboneRouterMulticastListenerEvent aEvent,
                                                           const otIp6Address                    *aAddress)
 {
@@ -590,13 +590,12 @@
     {
         if (aBorderRouterConfiguration.isBorderRoutingEnabled)
         {
+            int infraIfIndex = if_nametoindex(aBorderRouterConfiguration.infraInterfaceName.c_str());
             SuccessOrExit(error   = otBorderRoutingSetEnabled(GetOtInstance(), false /* aEnabled */),
                           message = "failed to disable border routing");
             otSysSetInfraNetif(aBorderRouterConfiguration.infraInterfaceName.c_str(), icmp6SocketFd);
             icmp6SocketFd = -1;
-            SuccessOrExit(error = otBorderRoutingInit(
-                              GetOtInstance(), if_nametoindex(aBorderRouterConfiguration.infraInterfaceName.c_str()),
-                              false /* aInfraIfIsRunning */),
+            SuccessOrExit(error   = otBorderRoutingInit(GetOtInstance(), infraIfIndex, otSysInfraIfIsRunning()),
                           message = "failed to initialize border routing");
             SuccessOrExit(error   = otBorderRoutingSetEnabled(GetOtInstance(), true /* aEnabled */),
                           message = "failed to enable border routing");

src/android/otdaemon_server.hpp

diff --git a/src/android/otdaemon_server.hpp b/src/android/otdaemon_server.hpp
index 595e0b4..387a37b 100644
--- a/src/android/otdaemon_server.hpp
+++ b/src/android/otdaemon_server.hpp
@@ -106,7 +106,7 @@
     static void ReceiveCallback(otMessage *aMessage, void *aBinderServer);
     void        ReceiveCallback(otMessage *aMessage);
     void        TransmitCallback(void);
-    static void HandleBackboneMulticastListenerEvent(void *aBinderServer,
+    static void HandleBackboneMulticastListenerEvent(void                                  *aBinderServer,
                                                      otBackboneRouterMulticastListenerEvent aEvent,
                                                      const otIp6Address                    *aAddress);
 
@@ -125,4 +125,4 @@
 } // namespace Android
 } // namespace otbr
 
-#endif // OTBR_ANDROID_BINDER_SERVER_HPP_
\ No newline at end of file
+#endif // OTBR_ANDROID_BINDER_SERVER_HPP_