forwarder_guest_launcher can execute forwarder_guest
Bug: 340126051
Test: Prepare server running in the port number 12345 in the guest, and
run `forwarder_guest_launcher --host 192.168.0.1`.
Change-Id: If4f5523a285382341615b669eed0492f493b7577
diff --git a/libs/debian_service/proto/DebianService.proto b/libs/debian_service/proto/DebianService.proto
index 5e3286a..a887bf2 100644
--- a/libs/debian_service/proto/DebianService.proto
+++ b/libs/debian_service/proto/DebianService.proto
@@ -23,10 +23,12 @@
service DebianService {
rpc ReportVmIpAddr (IpAddr) returns (ReportVmIpAddrResponse) {}
- rpc OpenForwardingRequestQueue (Empty) returns (stream ForwardingRequestItem) {}
+ rpc OpenForwardingRequestQueue (QueueOpeningRequest) returns (stream ForwardingRequestItem) {}
}
-message Empty {}
+message QueueOpeningRequest {
+ int32 cid = 1;
+}
message IpAddr {
string addr = 1;
diff --git a/libs/vm_launcher_lib/java/com/android/virtualization/vmlauncher/DebianServiceImpl.java b/libs/vm_launcher_lib/java/com/android/virtualization/vmlauncher/DebianServiceImpl.java
index d62ccfb..dcc8152 100644
--- a/libs/vm_launcher_lib/java/com/android/virtualization/vmlauncher/DebianServiceImpl.java
+++ b/libs/vm_launcher_lib/java/com/android/virtualization/vmlauncher/DebianServiceImpl.java
@@ -21,9 +21,9 @@
import androidx.annotation.Keep;
import com.android.virtualization.vmlauncher.proto.DebianServiceGrpc;
-import com.android.virtualization.vmlauncher.proto.Empty;
import com.android.virtualization.vmlauncher.proto.ForwardingRequestItem;
import com.android.virtualization.vmlauncher.proto.IpAddr;
+import com.android.virtualization.vmlauncher.proto.QueueOpeningRequest;
import com.android.virtualization.vmlauncher.proto.ReportVmIpAddrResponse;
import io.grpc.stub.StreamObserver;
@@ -53,9 +53,9 @@
@Override
public void openForwardingRequestQueue(
- Empty request, StreamObserver<ForwardingRequestItem> responseObserver) {
+ QueueOpeningRequest request, StreamObserver<ForwardingRequestItem> responseObserver) {
Log.d(DebianServiceImpl.TAG, "OpenForwardingRequestQueue");
- runForwarderHost(new ForwarderHostCallback(responseObserver));
+ runForwarderHost(request.getCid(), new ForwarderHostCallback(responseObserver));
responseObserver.onCompleted();
}
@@ -77,7 +77,7 @@
}
}
- private static native void runForwarderHost(ForwarderHostCallback callback);
+ private static native void runForwarderHost(int cid, ForwarderHostCallback callback);
protected interface DebianServiceCallback {
void onIpAddressAvailable(String ipAddr);