WIP: TSI/TCP fix

Signed-off-by: Matej Hrica <[email protected]>

Author: mtjhrc

src/devices/src/virtio/vsock/proxy.rs

@@ -25,6 +25,7 @@ pub enum ProxyError {
 pub enum ProxyStatus {
     Idle,
     Connecting,
+    ConnectedUnconfirmed,
     Connected,
     Listening,
     Closed,

src/devices/src/virtio/vsock/tcp.rs

@@ -341,7 +341,7 @@ impl TcpProxy {
     }
 
     fn switch_to_connected(&mut self) {
-        self.status = ProxyStatus::Connected;
+        self.status = ProxyStatus::ConnectedUnconfirmed;
         match fcntl(self.fd, FcntlArg::F_GETFL) {
             Ok(flags) => match OFlag::from_bits(flags) {
                 Some(flags) => {
@@ -395,7 +395,7 @@ impl Proxy for TcpProxy {
         if self.status == ProxyStatus::Connecting {
             update.polling = Some((self.id, self.fd, EventSet::IN | EventSet::OUT));
         } else {
-            if self.status == ProxyStatus::Connected {
+            if self.status == ProxyStatus::ConnectedUnconfirmed {
                 update.polling = Some((self.id, self.fd, EventSet::IN));
             }
             self.push_connect_rsp(result);
@@ -413,6 +413,15 @@ impl Proxy for TcpProxy {
             self.peer_port,
         );
 
+        if self.status != ProxyStatus::ConnectedUnconfirmed {
+            warn!(
+                "tcp: confirm_connect: Expected state to be {:?}, but it is {:?}",
+                ProxyStatus::ConnectedUnconfirmed,
+                self.status
+            );
+        }
+        self.status = ProxyStatus::Connected;
+
         self.peer_buf_alloc = pkt.buf_alloc();
         self.peer_fwd_cnt = Wrapping(pkt.fwd_cnt());