Replace pkg/bicopy and g-t-v/pkg/tcpproxy with pkg/tcpproxy

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

Author: AkihiroSuda

pkg/bicopy/bicopy.go

@@ -15,8 +15,8 @@ import (
 	"github.com/lima-vm/sshocker/pkg/ssh"
 	"github.com/sirupsen/logrus"
 
-	"github.com/lima-vm/lima/pkg/bicopy"
 	"github.com/lima-vm/lima/pkg/portfwd"
+	"github.com/lima-vm/lima/pkg/tcpproxy"
 )
 
 // forwardTCP is not thread-safe.
@@ -153,7 +153,10 @@ func (plf *pseudoLoopbackForwarder) forward(ac *net.TCPConn) error {
 		return err
 	}
 	defer unixConn.Close()
-	bicopy.Bicopy(ac, unixConn, nil)
+	proxy := tcpproxy.DialProxy{DialContext: func(_ context.Context, _, _ string) (net.Conn, error) {
+		return unixConn, nil
+	}}
+	proxy.HandleConn(ac)
 	return nil
 }
 

pkg/hostagent/port_darwin.go

@@ -10,11 +10,11 @@ import (
 	"time"
 
 	"github.com/containers/gvisor-tap-vsock/pkg/services/forwarder"
-	"github.com/containers/gvisor-tap-vsock/pkg/tcpproxy"
 	"github.com/sirupsen/logrus"
 
 	"github.com/lima-vm/lima/pkg/guestagent/api"
 	guestagentclient "github.com/lima-vm/lima/pkg/guestagent/api/client"
+	"github.com/lima-vm/lima/pkg/tcpproxy"
 )
 
 func HandleTCPConnection(ctx context.Context, client *guestagentclient.GuestAgentClient, conn net.Conn, guestAddr string) {

pkg/portfwd/client.go

@@ -4,13 +4,14 @@
 package portfwdserver
 
 import (
+	"context"
 	"errors"
 	"io"
 	"net"
 	"time"
 
-	"github.com/lima-vm/lima/pkg/bicopy"
 	"github.com/lima-vm/lima/pkg/guestagent/api"
+	"github.com/lima-vm/lima/pkg/tcpproxy"
 )
 
 type TunnelServer struct{}
@@ -35,7 +36,10 @@ func (s *TunnelServer) Start(stream api.GuestService_TunnelServer) error {
 		return err
 	}
 	rw := &GRPCServerRW{stream: stream, id: in.Id}
-	bicopy.Bicopy(rw, conn, nil)
+	proxy := tcpproxy.DialProxy{DialContext: func(_ context.Context, _, _ string) (net.Conn, error) {
+		return conn, nil
+	}}
+	proxy.HandleConn(rw)
 	return nil
 }