Merge pull request #409 from AkihiroSuda/remove-replace-inetaf-tcpproxy

go.mod: remove `replace inet.af/tcpproxy => github.com/inetaf/tcpproxy`

go.mod

@@ -29,7 +29,6 @@ require (
 	golang.org/x/sync v0.8.0
 	golang.org/x/sys v0.26.0
 	gvisor.dev/gvisor v0.0.0-20240826182512-9f3309e5b121
-	inet.af/tcpproxy v0.0.0-20220326234310-be3ee21c9fa0
 )
 
 require (
@@ -52,5 +51,3 @@ require (
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
-
-replace inet.af/tcpproxy => github.com/inetaf/tcpproxy v0.0.0-20221017015627-91f861402626

pkg/services/forwarder/ports.go

@@ -16,13 +16,13 @@ import (
 	"sync"
 
 	"github.com/containers/gvisor-tap-vsock/pkg/sshclient"
+	"github.com/containers/gvisor-tap-vsock/pkg/tcpproxy"
 	"github.com/containers/gvisor-tap-vsock/pkg/types"
 	log "github.com/sirupsen/logrus"
 	"gvisor.dev/gvisor/pkg/tcpip"
 	"gvisor.dev/gvisor/pkg/tcpip/adapters/gonet"
 	"gvisor.dev/gvisor/pkg/tcpip/network/ipv4"
 	"gvisor.dev/gvisor/pkg/tcpip/stack"
-	"inet.af/tcpproxy"
 )
 
 type PortsForwarder struct {

pkg/services/forwarder/tcp.go

@@ -6,13 +6,13 @@ import (
 	"net"
 	"sync"
 
+	"github.com/containers/gvisor-tap-vsock/pkg/tcpproxy"
 	log "github.com/sirupsen/logrus"
 	"gvisor.dev/gvisor/pkg/tcpip"
 	"gvisor.dev/gvisor/pkg/tcpip/adapters/gonet"
 	"gvisor.dev/gvisor/pkg/tcpip/stack"
 	"gvisor.dev/gvisor/pkg/tcpip/transport/tcp"
 	"gvisor.dev/gvisor/pkg/waiter"
-	"inet.af/tcpproxy"
 )
 
 const linkLocalSubnet = "169.254.0.0/16"

vendor/inet.af/tcpproxy/tcpproxy.go → pkg/tcpproxy/tcpproxy.go

@@ -1,3 +1,5 @@
+// Copied from https://github.com/inetaf/tcpproxy/blob/91f861402626c6ba93eaa57ee257109c4f07bd00/tcpproxy.go
+
 // Copyright 2017 Google Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -81,16 +83,6 @@ type Proxy struct {
 	ListenFunc func(net, laddr string) (net.Listener, error)
 }
 
-// Matcher reports whether hostname matches the Matcher's criteria.
-type Matcher func(ctx context.Context, hostname string) bool
-
-// equals is a trivial Matcher that implements string equality.
-func equals(want string) Matcher {
-	return func(_ context.Context, got string) bool {
-		return want == got
-	}
-}
-
 // config contains the proxying state for one listener.
 type config struct {
 	routes []route
@@ -372,11 +364,15 @@ func (dp *DialProxy) HandleConn(src net.Conn) {
 
 	if ka := dp.keepAlivePeriod(); ka > 0 {
 		if c, ok := UnderlyingConn(src).(*net.TCPConn); ok {
+			//nolint:errcheck
 			c.SetKeepAlive(true)
+			//nolint:errcheck
 			c.SetKeepAlivePeriod(ka)
 		}
 		if c, ok := dst.(*net.TCPConn); ok {
+			//nolint:errcheck
 			c.SetKeepAlive(true)
+			//nolint:errcheck
 			c.SetKeepAlivePeriod(ka)
 		}
 	}

pkg/virtualnetwork/mux.go

@@ -7,12 +7,12 @@ import (
 	"net/http"
 	"strconv"
 
+	"github.com/containers/gvisor-tap-vsock/pkg/tcpproxy"
 	"github.com/containers/gvisor-tap-vsock/pkg/types"
 	log "github.com/sirupsen/logrus"
 	"gvisor.dev/gvisor/pkg/tcpip"
 	"gvisor.dev/gvisor/pkg/tcpip/adapters/gonet"
 	"gvisor.dev/gvisor/pkg/tcpip/network/ipv4"
-	"inet.af/tcpproxy"
 )
 
 func (n *VirtualNetwork) Mux() *http.ServeMux {