idk/go-i2ptunnel
1
0
Fork 0
mirror of https://github.com/go-i2p/go-i2ptunnel.git synced 2025-07-12 23:48:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

update dependencies and explicitly reference the tunnel in use inside of the garlic structure

Browse Source
This commit is contained in:
eyedeekay
2025-02-16 18:40:56 -05:00
parent 4ea1a86e52
commit af62b93e36
8 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
go.mod
View File

@ -16,7 +16,7 @@ require (
require (
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
github.com/cretz/bine v0.2.0 // indirect
github.com/go-i2p/sam3 v0.33.9 // indirect
github.com/go-i2p/sam3 v0.33.92 // indirect
github.com/magiconair/properties v1.8.9 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
@ -33,3 +33,19 @@ require (
golang.org/x/tools v0.29.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)
replace github.com/go-i2p/go-i2ptunnel-config => ../go-i2ptunnel-config
//replace github.com/go-i2p/onramp => ../onramp
replace github.com/go-i2p/go-connfilter => ../go-connfilter
replace github.com/go-i2p/go-forward => ../go-forward
replace github.com/go-i2p/go-limit => ../go-limit
//replace github.com/go-i2p/sam3 => ../sam3
replace github.com/go-i2p/logger => ../logger
//replace github.com/go-i2p/i2pkeys => ../i2pkeys

12
go.sum
View File

@ -9,21 +9,13 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/elazarl/goproxy v1.7.0 h1:EXv2nV4EjM60ZtsEVLYJG4oBXhDGutMKperpHsZ/v+0=
github.com/elazarl/goproxy v1.7.0/go.mod h1:X/5W/t+gzDyLfHW4DrMdpjqYjpXsURlBt9lpBDxZZZQ=
github.com/go-i2p/go-connfilter v0.0.0-20250205023438-0f2b889a80f6 h1:kOJH77NTMYNrG1+dX/T/ZO2RX1xp7ZA1eViqy4uZy5M=
github.com/go-i2p/go-connfilter v0.0.0-20250205023438-0f2b889a80f6/go.mod h1:qSZ3m4cEeyQc391rRXIGYEq9zakEPMJG9WfeQ49gByU=
github.com/go-i2p/go-forward v0.0.0-20250202052226-ee8a43dcb664 h1:j+RzLt8jZPT9CeiLFDWEXvJPb6Orn3UQgywTx8iL1O4=
github.com/go-i2p/go-forward v0.0.0-20250202052226-ee8a43dcb664/go.mod h1:+R0jJkt7KIjVs2h83ENnORyaHJtPE9QCLpbYDiU6r84=
github.com/go-i2p/go-i2ptunnel-config v0.0.0-20250209030407-ba90db65df97 h1:NywKIHXpkEA0P98SMMnwDPeAU5gk0D7aHyVLS34ijqI=
github.com/go-i2p/go-i2ptunnel-config v0.0.0-20250209030407-ba90db65df97/go.mod h1:u8CgiYIfehSFpoVWNe1up6TO4sasPpRUHxZw7W2e4sM=
github.com/go-i2p/go-limit v0.0.0-20250203203118-210616857c15 h1:ASjMbwlepoDQfrhv+H2B5ICBPJU5ES1JzmOxzPDx3YQ=
github.com/go-i2p/go-limit v0.0.0-20250203203118-210616857c15/go.mod h1:4jjmVRhvKj47sQ6B6wdDhN1IrEZunE6KwkYLQx/BeVE=
github.com/go-i2p/i2pkeys v0.0.0-20241108200332-e4f5ccdff8c4/go.mod h1:m5TlHjPZrU5KbTd7Lr+I2rljyC6aJ88HdkeMQXV0U0E=
github.com/go-i2p/i2pkeys v0.33.92 h1:e2vx3vf7tNesaJ8HmAlGPOcfiGM86jzeIGxh27I9J2Y=
github.com/go-i2p/i2pkeys v0.33.92/go.mod h1:BRURQ/twxV0WKjZlFSKki93ivBi+MirZPWudfwTzMpE=
github.com/go-i2p/onramp v0.33.92 h1:Dk3A0SGpdEw829rSjW2LqN8o16pUvuhiN0vn36z7Gpc=
github.com/go-i2p/onramp v0.33.92/go.mod h1:5sfB8H2xk05gAS2K7XAUZ7ekOfwGJu3tWF0fqdXzJG4=
github.com/go-i2p/sam3 v0.33.9 h1:3a+gunx75DFc6jxloUZTAVJbdP6736VU1dy2i7I9fKA=
github.com/go-i2p/sam3 v0.33.9/go.mod h1:oDuV145l5XWKKafeE4igJHTDpPwA0Yloz9nyKKh92eo=
github.com/go-i2p/sam3 v0.33.92 h1:TVpi4GH7Yc7nZBiE1QxLjcZfnC4fI/80zxQz1Rk36BA=
github.com/go-i2p/sam3 v0.33.92/go.mod h1:oDuV145l5XWKKafeE4igJHTDpPwA0Yloz9nyKKh92eo=
github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM=
github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
github.com/miekg/dns v1.1.51 h1:0+Xg7vObnhrz/4ZCZcZh7zPXlmU0aveS2HDBd0m0qSo=

2
lib/tcp/client/tcpclient.go
View File

@ -57,7 +57,7 @@ func (t *TCPClient) recordError(err error) {
// Get the tunnel's I2P address
func (t *TCPClient) Address() string {
return t.Garlic.B32()
return t.Garlic.StreamSession.Addr().Base32()
}
// Get the tunnel's error message

5
lib/tcp/server/tcpserver.go
View File

@ -52,7 +52,8 @@ func (t *TCPServer) recordError(err error) {
// Get the tunnel's I2P address
func (t *TCPServer) Address() string {
return t.Garlic.B32()
return t.Garlic.StreamListener.Addr().String()
//B32()
}
// Get the tunnel's error message
@ -76,7 +77,7 @@ func (t *TCPServer) Name() string {
// Start the tunnel
func (t *TCPServer) Start() error {
i2pListener, err := t.Garlic.Listen()
i2pListener, err := t.Garlic.ListenStream()
if err != nil {
return err
}

2
lib/udp/client/udpclient.go
View File

@ -59,7 +59,7 @@ func (u *UDPClient) recordError(err error) {
// Get the tunnel's I2P address
func (u *UDPClient) Address() string {
return u.Garlic.B32()
return u.Garlic.DatagramSession.Addr().String()
}
// Get the tunnel's error message

2
lib/udp/server/udpserver.go
View File

@ -59,7 +59,7 @@ func (u *UDPServer) recordError(err error) {
// Get the tunnel's I2P address
func (u *UDPServer) Address() string {
return u.Garlic.B32()
return u.Garlic.DatagramSession.Addr().String()
}
// Get the tunnel's error message

1
webui/controller/i2ptunnelconfig.go
View File

@ -20,7 +20,6 @@ type Config struct {
}
func (c *Config) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
func NewConfig(yamlFile string) (*Config, error) {

2
webui/controller/i2ptunnelcontrol.go
View File

@ -17,11 +17,9 @@ type Controller struct {
}
func (c *Controller) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
func (c *Controller) MiniServeHTTP(w http.ResponseWriter, r *http.Request) {
}
func NewController(yamlFile string) (*Controller, error) {