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

By copying <https://github.com/inetaf/tcpproxy/blob/91f861402626/tcpproxy.go> to `pkg/tcpproxy/tcpproxy.go`. Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
containers · Oct 17, 2024 · c315e61 · c315e61
1 parent 0d35eaa
commit c315e61
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 618 deletions.
diff --git a/go.mod b/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
diff --git a/pkg/services/forwarder/ports.go b/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 {

diff --git a/pkg/services/forwarder/tcp.go b/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"

diff --git a/vendor/inet.af/tcpproxy/tcpproxy.go → pkg/tcpproxy/tcpproxy.go b/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");

diff --git a/pkg/virtualnetwork/mux.go b/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 {

diff --git a/vendor/inet.af/tcpproxy/.travis.yml b/vendor/inet.af/tcpproxy/.travis.yml
diff --git a/vendor/inet.af/tcpproxy/CONTRIBUTING.md b/vendor/inet.af/tcpproxy/CONTRIBUTING.md
diff --git a/vendor/inet.af/tcpproxy/LICENSE b/vendor/inet.af/tcpproxy/LICENSE
diff --git a/vendor/inet.af/tcpproxy/README.md b/vendor/inet.af/tcpproxy/README.md