commit 3f803e7b8211a296887d566b3ee41dc972a06c95
author ELIYAZ MOMIN <mohammedeliyaz@google.com> Tue Nov 19 11:05:30 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 19 11:05:30 2024 +0000
tree 02202ea56522d7b71beadd8418fd89a31106a83f
parent a5faa56a62399725859681d14fcf98e4f95000ef

Revert "check whether the network interface exists before using it"

This reverts commit a5faa56a62399725859681d14fcf98e4f95000ef.

Reason for revert: <Potential culprit for b/379818258  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.>

Change-Id: Ib41a4bf760fd98e9fbc469a20af5bc3ed97e0cee

threadnetwork/aidl/default/main.cpp

diff --git a/threadnetwork/aidl/default/main.cpp b/threadnetwork/aidl/default/main.cpp
index 1df455e..6514184 100644
--- a/threadnetwork/aidl/default/main.cpp
+++ b/threadnetwork/aidl/default/main.cpp
@@ -18,11 +18,11 @@
 #include <android-base/logging.h>
 #include <android/binder_manager.h>
 #include <android/binder_process.h>
-#include <cutils/properties.h>
-#include <net/if.h>
 #include <netinet/in.h>
-#include <sys/stat.h>
+#include <net/if.h>
 #include <utils/Log.h>
+#include <cutils/properties.h>
+#include <sys/stat.h>
 
 #include "service.hpp"
 #include "thread_chip.hpp"
@@ -30,19 +30,13 @@
 using aidl::android::hardware::threadnetwork::IThreadChip;
 using aidl::android::hardware::threadnetwork::ThreadChip;
 
-#define THREADNETWORK_COPROCESSOR_SIMULATION_PATH \
-    "/apex/com.android.hardware.threadnetwork/bin/ot-rcp"
+#define THREADNETWORK_COPROCESSOR_SIMULATION_PATH "/apex/com.android.hardware.threadnetwork/bin/ot-rcp"
 
 namespace {
-
-bool isInterfaceExists(const char* interfaceName) {
-    return if_nametoindex(interfaceName) != 0;
-}
-
 void addThreadChip(int id, const char* url) {
     binder_status_t status;
     const std::string serviceName(std::string() + IThreadChip::descriptor + "/chip" +
-                                  std::to_string(id));
+            std::to_string(id));
 
     ALOGI("ServiceName: %s, Url: %s", serviceName.c_str(), url);
 
@@ -56,24 +50,19 @@
 
 void addSimulatedThreadChip() {
     char local_interface[PROP_VALUE_MAX];
+
+    CHECK_GT(property_get("persist.vendor.otsim.local_interface",
+                local_interface, "eth1"), 0);
+
     int node_id = property_get_int32("ro.boot.openthread_node_id", 0);
+    CHECK_GT(node_id,0);
 
-    CHECK_GT(node_id, 0);
-
-    std::string url = std::string("spinel+hdlc+forkpty://" THREADNETWORK_COPROCESSOR_SIMULATION_PATH
-                                  "?forkpty-arg=") +
-                      std::to_string(node_id);
-
-    CHECK_GT(property_get("persist.vendor.otsim.local_interface", local_interface, "eth1"), 0);
-    if (isInterfaceExists(local_interface)) {
-        url += std::string("&forkpty-arg=-L") + local_interface;
-    } else {
-        ALOGI("Interface %s doesn't exist!", local_interface);
-    }
-
+    std::string url = std::string("spinel+hdlc+forkpty://" \
+            THREADNETWORK_COPROCESSOR_SIMULATION_PATH "?forkpty-arg=-L") \
+                      + local_interface + "&forkpty-arg=" + std::to_string(node_id);
     addThreadChip(0, url.c_str());
 }
-}  // namespace
+}
 
 int main(int argc, char* argv[]) {
     aidl::android::hardware::threadnetwork::Service service;