Merge pull request #338 from praveenkumar/tcpproxy_module

go.mod: Change inet.af/tcpproxy to github.com/inetaf/tcpproxy
containers · Mar 20, 2024 · a0238e5 · a0238e5
2 parents 3f76a19 + 600910c
commit a0238e5
Show file tree

Hide file tree

Showing 14 changed files with 70 additions and 125 deletions.
diff --git a/go.mod b/go.mod
@@ -9,6 +9,7 @@ require (
 	github.com/coreos/stream-metadata-go v0.4.4
 	github.com/dustin/go-humanize v1.0.1
 	github.com/google/gopacket v1.1.19
+	github.com/inetaf/tcpproxy v0.0.0-20240214030015-3ce58045626c
 	github.com/insomniacslk/dhcp v0.0.0-20220504074936-1ca156eafb9f
 	github.com/linuxkit/virtsock v0.0.0-20220523201153-1a23e78aa7a2
 	github.com/mdlayher/vsock v1.2.1
@@ -26,7 +27,6 @@ require (
 	golang.org/x/sync v0.6.0
 	golang.org/x/sys v0.18.0
 	gvisor.dev/gvisor v0.0.0-20231023213702-2691a8f9b1cf
-	inet.af/tcpproxy v0.0.0-20220326234310-be3ee21c9fa0
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -42,6 +42,8 @@ github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis=
+github.com/inetaf/tcpproxy v0.0.0-20240214030015-3ce58045626c h1:gYfYE403/nlrGNYj6BEOs9ucLCAGB9gstlSk92DttTg=
+github.com/inetaf/tcpproxy v0.0.0-20240214030015-3ce58045626c/go.mod h1:Di7LXRyUcnvAcLicFhtM9/MlZl/TNgRSDHORM2c6CMI=
 github.com/insomniacslk/dhcp v0.0.0-20220504074936-1ca156eafb9f h1:l1QCwn715k8nYkj4Ql50rzEog3WnMdrd4YYMMwemxEo=
 github.com/insomniacslk/dhcp v0.0.0-20220504074936-1ca156eafb9f/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
 github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw=
@@ -198,5 +200,3 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gvisor.dev/gvisor v0.0.0-20231023213702-2691a8f9b1cf h1:0A28IFBR6VcMacM0m6Rn5/nr8pk8xa2TyIkjSaFAOPc=
 gvisor.dev/gvisor v0.0.0-20231023213702-2691a8f9b1cf/go.mod h1:8hmigyCdYtw5xJGfQDJzSH5Ju8XEIDBnpyi8+O6GRt8=
-inet.af/tcpproxy v0.0.0-20220326234310-be3ee21c9fa0 h1:PqdHrvQRVK1zapJkd0qf6+tevvSIcWdfenVqJd3PHWU=
-inet.af/tcpproxy v0.0.0-20220326234310-be3ee21c9fa0/go.mod h1:Tojt5kmHpDIR2jMojxzZK2w2ZR7OILODmUo2gaSwjrk=
diff --git a/pkg/services/forwarder/ports.go b/pkg/services/forwarder/ports.go
@@ -17,12 +17,12 @@ import (
 
 	"github.com/containers/gvisor-tap-vsock/pkg/sshclient"
 	"github.com/containers/gvisor-tap-vsock/pkg/types"
+	"github.com/inetaf/tcpproxy"
 	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 {

diff --git a/pkg/services/forwarder/tcp.go b/pkg/services/forwarder/tcp.go
@@ -6,13 +6,13 @@ import (
 	"net"
 	"sync"
 
+	"github.com/inetaf/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"

diff --git a/pkg/virtualnetwork/mux.go b/pkg/virtualnetwork/mux.go
@@ -8,11 +8,11 @@ import (
 	"strconv"
 
 	"github.com/containers/gvisor-tap-vsock/pkg/types"
+	"github.com/inetaf/tcpproxy"
 	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 {

diff --git a/vendor/inet.af/tcpproxy/.travis.yml → ...or/github.com/inetaf/tcpproxy/.travis.yml b/vendor/inet.af/tcpproxy/.travis.yml → ...or/github.com/inetaf/tcpproxy/.travis.yml
diff --git a/vendor/inet.af/tcpproxy/CONTRIBUTING.md → ...ithub.com/inetaf/tcpproxy/CONTRIBUTING.md b/vendor/inet.af/tcpproxy/CONTRIBUTING.md → ...ithub.com/inetaf/tcpproxy/CONTRIBUTING.md
diff --git a/vendor/inet.af/tcpproxy/LICENSE → vendor/github.com/inetaf/tcpproxy/LICENSE b/vendor/inet.af/tcpproxy/LICENSE → vendor/github.com/inetaf/tcpproxy/LICENSE
diff --git a/vendor/inet.af/tcpproxy/README.md → vendor/github.com/inetaf/tcpproxy/README.md b/vendor/inet.af/tcpproxy/README.md → vendor/github.com/inetaf/tcpproxy/README.md
diff --git a/vendor/inet.af/tcpproxy/http.go → vendor/github.com/inetaf/tcpproxy/http.go b/vendor/inet.af/tcpproxy/http.go → vendor/github.com/inetaf/tcpproxy/http.go
diff --git a/vendor/inet.af/tcpproxy/listener.go → ...or/github.com/inetaf/tcpproxy/listener.go b/vendor/inet.af/tcpproxy/listener.go → ...or/github.com/inetaf/tcpproxy/listener.go
diff --git a/vendor/inet.af/tcpproxy/sni.go → vendor/github.com/inetaf/tcpproxy/sni.go b/vendor/inet.af/tcpproxy/sni.go → vendor/github.com/inetaf/tcpproxy/sni.go
diff --git a/vendor/inet.af/tcpproxy/tcpproxy.go → ...or/github.com/inetaf/tcpproxy/tcpproxy.go b/vendor/inet.af/tcpproxy/tcpproxy.go → ...or/github.com/inetaf/tcpproxy/tcpproxy.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -41,6 +41,9 @@ github.com/google/go-cmp/cmp/internal/value
 ## explicit; go 1.12
 github.com/google/gopacket
 github.com/google/gopacket/layers
+# github.com/inetaf/tcpproxy v0.0.0-20240214030015-3ce58045626c
+## explicit; go 1.16
+github.com/inetaf/tcpproxy
 # github.com/insomniacslk/dhcp v0.0.0-20220504074936-1ca156eafb9f
 ## explicit; go 1.13
 github.com/insomniacslk/dhcp/dhcpv4
@@ -262,6 +265,3 @@ gvisor.dev/gvisor/pkg/tcpip/transport/tcp
 gvisor.dev/gvisor/pkg/tcpip/transport/tcpconntrack
 gvisor.dev/gvisor/pkg/tcpip/transport/udp
 gvisor.dev/gvisor/pkg/waiter
-# inet.af/tcpproxy v0.0.0-20220326234310-be3ee21c9fa0
-## explicit; go 1.16
-inet.af/tcpproxy