Move socket transport service to Rust
Bug: 274600496
Test: ninja
Test: avatar test
Change-Id: I35b3572686de012b14ce18455dd8750ebe24871f
diff --git a/rust/netsim-cxx/src/lib.rs b/rust/netsim-cxx/src/lib.rs
index 8643aeb..694575e 100644
--- a/rust/netsim-cxx/src/lib.rs
+++ b/rust/netsim-cxx/src/lib.rs
@@ -46,7 +46,6 @@
use crate::transport::dispatcher::handle_response;
use crate::transport::grpc::{register_grpc_transport, unregister_grpc_transport};
-use crate::transport::socket::run_socket_transport;
use crate::captures::handlers::{
handle_capture_cxx, handle_packet_request, handle_packet_response,
@@ -67,9 +66,6 @@
mod ffi {
extern "Rust" {
- #[cxx_name = "RunSocketTransport"]
- fn run_socket_transport(hci_port: u16);
-
// Config
#[cxx_name = "GetDev"]
#[namespace = "netsim::config"]
diff --git a/rust/netsim-cxx/src/service/mod.rs b/rust/netsim-cxx/src/service/mod.rs
index 4ee4404..194df81 100644
--- a/rust/netsim-cxx/src/service/mod.rs
+++ b/rust/netsim-cxx/src/service/mod.rs
@@ -18,6 +18,7 @@
use crate::config::get_dev;
use crate::http_server::run_http_server;
use crate::resource;
+use crate::transport::socket::run_socket_transport;
use crate::wifi as wifi_facade;
use log::info;
use log::warn;
@@ -84,6 +85,9 @@
run_http_server(self.service_params.instance_num);
}
+ // Run the socket server.
+ run_socket_transport(self.service_params.hci_port);
+
if get_dev() {
new_test_beacon(0);
new_test_beacon(1);
diff --git a/src/core/server.cc b/src/core/server.cc
index 0ce1390..7fcfe70 100644
--- a/src/core/server.cc
+++ b/src/core/server.cc
@@ -94,10 +94,6 @@
rust_service->Run();
- // Run the socket server.
- BtsLog("RunSocketTransport:%d", params.hci_port);
- RunSocketTransport(params.hci_port);
-
while (true) {
std::this_thread::sleep_for(InactivityCheckInterval);
if (netsim::device::IsShutdownTimeCxx()) {
