Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

go.mod: inet.af/tcpproxy -> github.com/inetaf/tcpproxy #399

Closed
wants to merge 1 commit into from
Closed

go.mod: inet.af/tcpproxy -> github.com/inetaf/tcpproxy #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-20240710054256-ddd8a41251c9
github.com/linuxkit/virtsock v0.0.0-20220523201153-1a23e78aa7a2
github.com/mdlayher/vsock v1.2.1
Expand All @@ -27,7 +28,6 @@ require (
golang.org/x/sync v0.8.0
golang.org/x/sys v0.25.0
gvisor.dev/gvisor v0.0.0-20231023213702-2691a8f9b1cf
inet.af/tcpproxy v0.0.0-20220326234310-be3ee21c9fa0
)

require (
Expand All @@ -51,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
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 h1:5iH8iuqE5apketRbSFBy+X1V0o+l+8NF1avt4HWl7cA=
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/inetaf/tcpproxy v0.0.0-20221017015627-91f861402626 h1:oeu2cpk2bBlSgMQiSQIBJ8+FZsTqMG9fwdPez/weEbk=
github.com/inetaf/tcpproxy v0.0.0-20221017015627-91f861402626/go.mod h1:Tojt5kmHpDIR2jMojxzZK2w2ZR7OILODmUo2gaSwjrk=
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-20240710054256-ddd8a41251c9 h1:LZJWucZz7ztCqY6Jsu7N9g124iJ2kt/O62j3+UchZFg=
github.com/insomniacslk/dhcp v0.0.0-20240710054256-ddd8a41251c9/go.mod h1:KclMyHxX06VrVr0DJmeFSUb1ankt7xTfoOA35pCkoic=
github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
Expand Down
2 changes: 1 addition & 1 deletion pkg/services/forwarder/ports.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/services/forwarder/tcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/virtualnetwork/mux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 vendor/inet.af/tcpproxy/.travis.yml → ...or/github.com/inetaf/tcpproxy/.travis.yml
View file
Open in desktop
File renamed without changes.
0 vendor/inet.af/tcpproxy/CONTRIBUTING.md → ...ithub.com/inetaf/tcpproxy/CONTRIBUTING.md
View file
Open in desktop
File renamed without changes.
0 vendor/inet.af/tcpproxy/LICENSE → vendor/github.com/inetaf/tcpproxy/LICENSE
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion vendor/inet.af/tcpproxy/README.md → vendor/github.com/inetaf/tcpproxy/README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 vendor/inet.af/tcpproxy/http.go → vendor/github.com/inetaf/tcpproxy/http.go
View file
Open in desktop
File renamed without changes.
0 vendor/inet.af/tcpproxy/listener.go → ...or/github.com/inetaf/tcpproxy/listener.go
View file
Open in desktop
File renamed without changes.
0 vendor/inet.af/tcpproxy/sni.go → vendor/github.com/inetaf/tcpproxy/sni.go
View file
Open in desktop
File renamed without changes.
40 changes: 32 additions & 8 deletions vendor/inet.af/tcpproxy/tcpproxy.go → ...or/github.com/inetaf/tcpproxy/tcpproxy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-20240710054256-ddd8a41251c9
## explicit; go 1.20
github.com/insomniacslk/dhcp/dhcpv4
Expand Down Expand Up @@ -276,7 +279,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 => github.com/inetaf/tcpproxy v0.0.0-20221017015627-91f861402626
## explicit; go 1.16
inet.af/tcpproxy
# inet.af/tcpproxy => github.com/inetaf/tcpproxy v0.0.0-20221017015627-91f861402626
Loading