Skip to content

cuttlefish: Wire up Netsim UDS socket (--grpc_uds_path) #2851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AlpineOolong wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −4
Open

cuttlefish: Wire up Netsim UDS socket (--grpc_uds_path) #2851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions base/cvd/cuttlefish/host/commands/run_cvd/launch/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ cf_cc_library(
deps = [
"//cuttlefish/common/libs/fs",
"//cuttlefish/common/libs/utils:files",
"//cuttlefish/host/commands/run_cvd/launch:grpc_socket_creator",
"//cuttlefish/host/libs/config:config_utils",
"//cuttlefish/host/libs/config:cuttlefish_config",
"//cuttlefish/host/libs/config:known_paths",
Expand Down
15 changes: 12 additions & 3 deletions base/cvd/cuttlefish/host/commands/run_cvd/launch/netsim_server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

#include "cuttlefish/common/libs/fs/shared_fd.h"
#include "cuttlefish/common/libs/utils/files.h"
#include "cuttlefish/host/commands/run_cvd/launch/grpc_socket_creator.h"
#include "cuttlefish/host/libs/config/config_utils.h"
#include "cuttlefish/host/libs/config/cuttlefish_config.h"
#include "cuttlefish/host/libs/config/known_paths.h"
Expand Down Expand Up @@ -94,8 +95,9 @@ class Device {
class NetsimServer : public CommandSource {
public:
INJECT(NetsimServer(const CuttlefishConfig& config,
const CuttlefishConfig::InstanceSpecific& instance))
: config_(config), instance_(instance) {}
const CuttlefishConfig::InstanceSpecific& instance,
GrpcSocketCreator& grpc_socket))
: config_(config), instance_(instance), grpc_socket_(grpc_socket) {}

// CommandSource
Result<std::vector<MonitorCommand>> Commands() override {
Expand All @@ -107,6 +109,11 @@ class NetsimServer : public CommandSource {
// Port configuration.
netsimd.AddParameter("--hci_port=", config_.rootcanal_hci_port());

if (config_.netsim_radio_enabled(CuttlefishConfig::NetsimRadio::Nfc)) {
netsimd.AddParameter("--grpc_uds_path=", grpc_socket_.CreateGrpcSocket(
"NetsimControlServer"));
}

// When no connector is requested, add the instance number
if (config_.netsim_connector_instance_num() ==
config_.netsim_instance_num()) {
Expand Down Expand Up @@ -229,12 +236,14 @@ class NetsimServer : public CommandSource {
std::vector<Device> devices_;
const CuttlefishConfig& config_;
const CuttlefishConfig::InstanceSpecific instance_;
GrpcSocketCreator& grpc_socket_;
};

} // namespace

fruit::Component<fruit::Required<const CuttlefishConfig,
const CuttlefishConfig::InstanceSpecific>>
const CuttlefishConfig::InstanceSpecific,
GrpcSocketCreator>>
NetsimServerComponent() {
return fruit::createComponent()
.addMultibinding<CommandSource, NetsimServer>()
Expand Down
4 changes: 3 additions & 1 deletion base/cvd/cuttlefish/host/commands/run_cvd/launch/netsim_server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@

#include "fruit/fruit.h"

#include "cuttlefish/host/commands/run_cvd/launch/grpc_socket_creator.h"
#include "cuttlefish/host/libs/config/cuttlefish_config.h"

namespace cuttlefish {

fruit::Component<fruit::Required<const CuttlefishConfig,
const CuttlefishConfig::InstanceSpecific>>
const CuttlefishConfig::InstanceSpecific,
GrpcSocketCreator>>
NetsimServerComponent();

} // namespace cuttlefish