portfwdserver: fix half-close

Fix issue 3685

Similar to 3684

Signed-off-by: Akihiro Suda <[email protected]>

Author: AkihiroSuda

pkg/portfwdserver/server.go

@@ -4,12 +4,14 @@
 package portfwdserver
 
 import (
+	"context"
 	"errors"
 	"io"
 	"net"
 	"time"
 
-	"github.com/lima-vm/lima/pkg/bicopy"
+	"github.com/containers/gvisor-tap-vsock/pkg/tcpproxy"
+
 	"github.com/lima-vm/lima/pkg/guestagent/api"
 )
 
@@ -29,13 +31,13 @@ func (s *TunnelServer) Start(stream api.GuestService_TunnelServer) error {
 		return err
 	}
 
-	// We simply forward data form GRPC stream to net.Conn for both tcp and udp. So simple proxy is sufficient
-	conn, err := net.Dial(in.Protocol, in.GuestAddr)
-	if err != nil {
-		return err
-	}
 	rw := &GRPCServerRW{stream: stream, id: in.Id}
-	bicopy.Bicopy(rw, conn, nil)
+	proxy := tcpproxy.DialProxy{DialContext: func(ctx context.Context, _, _ string) (net.Conn, error) {
+		// We simply forward data form GRPC stream to net.Conn for both tcp and udp. So simple proxy is sufficient
+		var d net.Dialer
+		return d.DialContext(ctx, in.Protocol, in.GuestAddr)
+	}}
+	proxy.HandleConn(rw)
 	return nil
 }