Merge pull request #3684 from balajiv113/fix-keepalive

AkihiroSuda · web-flow · commit d8776481e572 · 2025-07-04T15:01:37.000+09:00
Fix tunneling of connection when keepalive is set
diff --git a/pkg/portfwd/client.go b/pkg/portfwd/client.go
@@ -10,9 +10,9 @@ 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/bicopy"
 	"github.com/lima-vm/lima/pkg/guestagent/api"
 	guestagentclient "github.com/lima-vm/lima/pkg/guestagent/api/client"
 )
@@ -33,7 +33,10 @@ func HandleTCPConnection(ctx context.Context, client *guestagentclient.GuestAgen
 	}
 
 	rw := &GrpcClientRW{stream: stream, id: id, addr: guestAddr, protocol: "tcp"}
-	bicopy.Bicopy(rw, conn, nil)
+	proxy := tcpproxy.DialProxy{DialContext: func(_ context.Context, _, _ string) (net.Conn, error) {
+		return conn, nil
+	}}
+	proxy.HandleConn(rw)
 }
 
 func HandleUDPConnection(ctx context.Context, client *guestagentclient.GuestAgentClient, conn net.PacketConn, guestAddr string) {

Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@ import (`
`10`	`10`	`"time"`
`11`	`11`
`12`	`12`	`"github.com/containers/gvisor-tap-vsock/pkg/services/forwarder"`
	`13`	`+ "github.com/containers/gvisor-tap-vsock/pkg/tcpproxy"`
`13`	`14`	`"github.com/sirupsen/logrus"`
`14`	`15`
`15`		`- "github.com/lima-vm/lima/pkg/bicopy"`
`16`	`16`	`"github.com/lima-vm/lima/pkg/guestagent/api"`
`17`	`17`	`guestagentclient "github.com/lima-vm/lima/pkg/guestagent/api/client"`
`18`	`18`	`)`
`@@ -33,7 +33,10 @@ func HandleTCPConnection(ctx context.Context, client *guestagentclient.GuestAgen`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`rw := &GrpcClientRW{stream: stream, id: id, addr: guestAddr, protocol: "tcp"}`
`36`		`- bicopy.Bicopy(rw, conn, nil)`
	`36`	`+ proxy := tcpproxy.DialProxy{DialContext: func(_ context.Context, _, _ string) (net.Conn, error) {`
	`37`	`+ return conn, nil`
	`38`	`+ }}`
	`39`	`+ proxy.HandleConn(rw)`
`37`	`40`	`}`
`38`	`41`
`39`	`42`	`func HandleUDPConnection(ctx context.Context, client *guestagentclient.GuestAgentClient, conn net.PacketConn, guestAddr string) {`