Merge "[rialto] Log request and response type for debugging" into main
diff --git a/rialto/src/main.rs b/rialto/src/main.rs
index ad9b776..48b69b3 100644
--- a/rialto/src/main.rs
+++ b/rialto/src/main.rs
@@ -177,7 +177,9 @@
let mut vsock_stream = VsockStream::new(socket_device, host_addr())?;
while let ServiceVmRequest::Process(req) = vsock_stream.read_request()? {
+ info!("Received request: {}", req.name());
let response = process_request(req, bcc_handover.as_ref());
+ info!("Sending response: {}", response.name());
vsock_stream.write_response(&response)?;
vsock_stream.flush()?;
}
diff --git a/service_vm/comm/src/message.rs b/service_vm/comm/src/message.rs
index 80a9608..9f83b78 100644
--- a/service_vm/comm/src/message.rs
+++ b/service_vm/comm/src/message.rs
@@ -56,6 +56,18 @@
RequestClientVmAttestation(ClientVmAttestationParams),
}
+impl Request {
+ /// Returns the name of the request.
+ pub fn name(&self) -> &'static str {
+ match self {
+ Self::Reverse(_) => "Reverse",
+ Self::GenerateEcdsaP256KeyPair => "GenerateEcdsaP256KeyPair",
+ Self::GenerateCertificateRequest(_) => "GenerateCertificateRequest",
+ Self::RequestClientVmAttestation(_) => "RequestClientVmAttestation",
+ }
+ }
+}
+
/// Represents the params passed to `Request::RequestClientVmAttestation`.
#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct ClientVmAttestationParams {
@@ -98,6 +110,19 @@
Err(RequestProcessingError),
}
+impl Response {
+ /// Returns the name of the response.
+ pub fn name(&self) -> &'static str {
+ match self {
+ Self::Reverse(_) => "Reverse",
+ Self::GenerateEcdsaP256KeyPair(_) => "GenerateEcdsaP256KeyPair",
+ Self::GenerateCertificateRequest(_) => "GenerateCertificateRequest",
+ Self::RequestClientVmAttestation(_) => "RequestClientVmAttestation",
+ Self::Err(_) => "Err",
+ }
+ }
+}
+
/// Errors related to request processing.
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
pub enum RequestProcessingError {