devices/vsock: refactor UdpProxy as TsiDgramProxy

Since UdpProxy now supports more than UDP, let's refactor it as
TsiDgramProxy.

Signed-off-by: Sergio Lopez <[email protected]>

Author: slp

src/devices/src/virtio/vsock/mod.rs

@@ -16,8 +16,8 @@ mod proxy;
 mod reaper;
 #[cfg(target_os = "macos")]
 mod timesync;
+mod tsi_dgram;
 mod tsi_stream;
-mod udp;
 mod unix;
 
 pub use self::defs::uapi::VIRTIO_ID_VSOCK as TYPE_VSOCK;

src/devices/src/virtio/vsock/muxer.rs

@@ -13,8 +13,8 @@ use super::proxy::{Proxy, ProxyRemoval, ProxyUpdate};
 use super::reaper::ReaperThread;
 #[cfg(target_os = "macos")]
 use super::timesync::TimesyncThread;
+use super::tsi_dgram::TsiDgramProxy;
 use super::tsi_stream::TsiStreamProxy;
-use super::udp::UdpProxy;
 use super::unix::UnixProxy;
 use super::VsockError;
 use crossbeam_channel::{unbounded, Sender};
@@ -316,7 +316,7 @@ impl VsockMuxer {
                         warn!("vsock: rejecting udp unix proxy because tsi_unix is disabled");
                         return;
                     }
-                    match UdpProxy::new(
+                    match TsiDgramProxy::new(
                         id,
                         self.cid,
                         req.family,

src/devices/src/virtio/vsock/udp.rs renamed to src/devices/src/virtio/vsock/tsi_dgram.rs

@@ -27,7 +27,7 @@ use utils::epoll::EventSet;
 
 use vm_memory::GuestMemoryMmap;
 
-pub struct UdpProxy {
+pub struct TsiDgramProxy {
     pub id: u64,
     cid: u64,
     local_port: u32,
@@ -45,7 +45,7 @@ pub struct UdpProxy {
     peer_fwd_cnt: Wrapping<u32>,
 }
 
-impl UdpProxy {
+impl TsiDgramProxy {
     pub fn new(
         id: u64,
         cid: u64,
@@ -93,7 +93,7 @@ impl UdpProxy {
             };
         }
 
-        Ok(UdpProxy {
+        Ok(TsiDgramProxy {
             id,
             cid,
             local_port: 0,
@@ -230,7 +230,7 @@ impl UdpProxy {
     }
 }
 
-impl Proxy for UdpProxy {
+impl Proxy for TsiDgramProxy {
     fn id(&self) -> u64 {
         self.id
     }
@@ -464,7 +464,7 @@ impl Proxy for UdpProxy {
     }
 }
 
-impl AsRawFd for UdpProxy {
+impl AsRawFd for TsiDgramProxy {
     fn as_raw_fd(&self) -> RawFd {
         self.fd.as_raw_fd()
     }