Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit a5faa56a62.

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
This commit is contained in:
ELIYAZ MOMIN
2024-11-19 11:05:30 +00:00
committed by Gerrit Code Review
parent a5faa56a62
commit 3f803e7b82
1 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
threadnetwork/aidl/default/main.cpp
View File

@@ -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 addThreadChip(int id, const char* url) {
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;