go-i2p/goSam
1
0
Fork 0
mirror of https://github.com/go-i2p/goSam.git synced 2025-06-08 09:16:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix up go module

Browse Source
This commit is contained in:
eyedeekay
2024-11-13 14:39:08 -05:00
parent 7b1b6d431a
commit b2e54236d7
23 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
accept.go
View File

@ -1,4 +1,4 @@
package goSam package gosam
import ( import (
"fmt" "fmt"
@ -44,7 +44,7 @@ func (c *Client) ListenI2P(dest string) (net.Listener, error) {
return c, nil return c, nil
} }
// Accept accepts a connection on a listening goSam.Client(Implements net.Listener) // Accept accepts a connection on a listening gosam.Client(Implements net.Listener)
// or, if the connection isn't listening yet, just calls AcceptI2P for compatibility // or, if the connection isn't listening yet, just calls AcceptI2P for compatibility
// with older versions. // with older versions.
func (c *Client) Accept() (net.Conn, error) { func (c *Client) Accept() (net.Conn, error) {

2
auth.go
View File

@ -1,4 +1,4 @@
package goSam package gosam
import "fmt" import "fmt"

14
auth/main.go
View File

@ -4,22 +4,22 @@ import (
"fmt" "fmt"
"log" "log"
"github.com/go-i2p/goSam" "github.com/go-i2p/gosam"
) )
/** /**
THIS is a freestanding test for SAMv3.2 AUTH commands using goSam. It's THIS is a freestanding test for SAMv3.2 AUTH commands using gosam. It's
intended to be run separate from the other tests so that you don't accidentally end intended to be run separate from the other tests so that you don't accidentally end
up setting SAM session passwords and leaving them in the PasswordManager if a test up setting SAM session passwords and leaving them in the PasswordManager if a test
fails for some reason before you can remove them. fails for some reason before you can remove them.
**/ **/
func main() { func main() {
client, err := goSam.NewClientFromOptions() client, err := gosam.NewClientFromOptions()
if err != nil { if err != nil {
client, err = goSam.NewClientFromOptions( client, err = gosam.NewClientFromOptions(
goSam.SetUser("user"), gosam.SetUser("user"),
goSam.SetPass("password"), gosam.SetPass("password"),
) )
fmt.Println("Looks like you restarted the I2P router before sending AUTH DISABLE.") fmt.Println("Looks like you restarted the I2P router before sending AUTH DISABLE.")
fmt.Println("This probably means that your SAM Bridge is in a broken state where it can't") fmt.Println("This probably means that your SAM Bridge is in a broken state where it can't")
@ -36,7 +36,7 @@ func main() {
if err != nil { if err != nil {
log.Println(err) log.Println(err)
} }
client2, err := goSam.NewDefaultClient() client2, err := gosam.NewDefaultClient()
if err != nil { if err != nil {
log.Println(err) log.Println(err)
} }

4
client.go
View File

@ -1,4 +1,4 @@
package goSam package gosam
import ( import (
"bufio" "bufio"
@ -15,7 +15,7 @@ import (
"time" "time"
"github.com/go-i2p/i2pkeys" "github.com/go-i2p/i2pkeys"
//samkeys "github.com/go-i2p/goSam/compat" //samkeys "github.com/go-i2p/gosam/compat"
) )
// A Client represents a single Connection to the SAM bridge // A Client represents a single Connection to the SAM bridge

2
client_test.go
View File

@ -1,7 +1,7 @@
//go:build nettest //go:build nettest
// +build nettest // +build nettest
package goSam package gosam
import "testing" import "testing"

2
conn.go
View File

@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
package goSam package gosam
import ( import (
"log" "log"

2
datagram.go
View File

@ -1,4 +1,4 @@
package goSam package gosam
import ( import (
"net" "net"

2
dest.go
View File

@ -1,4 +1,4 @@
package goSam package gosam
import ( import (
"fmt" "fmt"

2
dial.go
View File

@ -1,4 +1,4 @@
package goSam package gosam
import ( import (
"context" "context"

4
go.mod
View File

@ -3,8 +3,8 @@ module github.com/go-i2p/gosam
go 1.20 go 1.20
require ( require (
github.com/eyedeekay/i2pkeys v0.33.0
github.com/getlantern/go-socks5 v0.0.0-20171114193258-79d4dd3e2db5 github.com/getlantern/go-socks5 v0.0.0-20171114193258-79d4dd3e2db5
github.com/go-i2p/i2pkeys v0.0.0-20241108200332-e4f5ccdff8c4
) )
require ( require (
@ -18,7 +18,9 @@ require (
github.com/getlantern/ops v0.0.0-20200403153110-8476b16edcd6 // indirect github.com/getlantern/ops v0.0.0-20200403153110-8476b16edcd6 // indirect
github.com/go-stack/stack v1.8.0 // indirect github.com/go-stack/stack v1.8.0 // indirect
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
go.uber.org/atomic v1.7.0 // indirect go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.19.1 // indirect go.uber.org/zap v1.19.1 // indirect
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
) )

8
go.sum
View File

@ -3,8 +3,6 @@ github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZx
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= 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/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/eyedeekay/i2pkeys v0.33.0 h1:5SzUyWxNjV6AvYv/WaI8J4dSgAfv7/WEps6pDLe2YSs=
github.com/eyedeekay/i2pkeys v0.33.0/go.mod h1:W9KCm9lqZ+Ozwl3dwcgnpPXAML97+I8Jiht7o5A8YBM=
github.com/getlantern/context v0.0.0-20190109183933-c447772a6520 h1:NRUJuo3v3WGC/g5YiyF790gut6oQr5f3FBI88Wv0dx4= github.com/getlantern/context v0.0.0-20190109183933-c447772a6520 h1:NRUJuo3v3WGC/g5YiyF790gut6oQr5f3FBI88Wv0dx4=
github.com/getlantern/context v0.0.0-20190109183933-c447772a6520/go.mod h1:L+mq6/vvYHKjCX2oez0CgEAJmbq1fbb/oNJIWQkBybY= github.com/getlantern/context v0.0.0-20190109183933-c447772a6520/go.mod h1:L+mq6/vvYHKjCX2oez0CgEAJmbq1fbb/oNJIWQkBybY=
github.com/getlantern/errors v1.0.1 h1:XukU2whlh7OdpxnkXhNH9VTLVz0EVPGKDV5K0oWhvzw= github.com/getlantern/errors v1.0.1 h1:XukU2whlh7OdpxnkXhNH9VTLVz0EVPGKDV5K0oWhvzw=
@ -31,6 +29,8 @@ github.com/getlantern/netx v0.0.0-20211206143627-7ccfeb739cbd/go.mod h1:WEXF4pfI
github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f/go.mod h1:D5ao98qkA6pxftxoqzibIBBrLSUli+kYnJqrgBf9cIA= github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f/go.mod h1:D5ao98qkA6pxftxoqzibIBBrLSUli+kYnJqrgBf9cIA=
github.com/getlantern/ops v0.0.0-20200403153110-8476b16edcd6 h1:QthAQCekS1YOeYWSvoHI6ZatlG4B+GBDLxV/2ZkBsTA= github.com/getlantern/ops v0.0.0-20200403153110-8476b16edcd6 h1:QthAQCekS1YOeYWSvoHI6ZatlG4B+GBDLxV/2ZkBsTA=
github.com/getlantern/ops v0.0.0-20200403153110-8476b16edcd6/go.mod h1:D5ao98qkA6pxftxoqzibIBBrLSUli+kYnJqrgBf9cIA= github.com/getlantern/ops v0.0.0-20200403153110-8476b16edcd6/go.mod h1:D5ao98qkA6pxftxoqzibIBBrLSUli+kYnJqrgBf9cIA=
github.com/go-i2p/i2pkeys v0.0.0-20241108200332-e4f5ccdff8c4 h1:LRjaRCzg1ieGKZjELlaIg06Fx04RHzQLsWMYp1H6PQ4=
github.com/go-i2p/i2pkeys v0.0.0-20241108200332-e4f5ccdff8c4/go.mod h1:m5TlHjPZrU5KbTd7Lr+I2rljyC6aJ88HdkeMQXV0U0E=
github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@ -42,6 +42,8 @@ github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
@ -71,6 +73,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

2
naming.go
View File

@ -1,4 +1,4 @@
package goSam package gosam
import ( import (
"context" "context"

2
naming_test.go
View File

@ -1,7 +1,7 @@
//go:build nettest //go:build nettest
// +build nettest // +build nettest
package goSam package gosam
import ( import (
"fmt" "fmt"

2
options.go
View File

@ -1,4 +1,4 @@
package goSam package gosam
import ( import (
"fmt" "fmt"

2
options_test.go
View File

@ -1,7 +1,7 @@
//go:build nettest //go:build nettest
// +build nettest // +build nettest
package goSam package gosam
import ( import (
"fmt" "fmt"

2
raw.go
View File

@ -1 +1 @@
package goSam package gosam

2
replyParser.go
View File

@ -1,4 +1,4 @@
package goSam package gosam
import ( import (
"fmt" "fmt"

2
replyParser_test.go
View File

@ -1,4 +1,4 @@
package goSam package gosam
import ( import (
"testing" "testing"

2
rw.go
View File

@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
package goSam package gosam
import ( import (
"encoding/hex" "encoding/hex"

2
rwc.go
View File

@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
*/ */
package goSam package gosam
import ( import (
"io" "io"

4
samsocks/main.go
View File

@ -3,7 +3,7 @@ package main
import ( import (
"flag" "flag"
"github.com/go-i2p/goSam" "github.com/go-i2p/gosam"
"github.com/getlantern/go-socks5" "github.com/getlantern/go-socks5"
"log" "log"
) )
@ -14,7 +14,7 @@ var (
) )
func main() { func main() {
sam, err := goSam.NewClient(*samaddr) sam, err := gosam.NewClient(*samaddr)
if err != nil { if err != nil {
panic(err) panic(err)
} }

2
sessions.go
View File

@ -1,4 +1,4 @@
package goSam package gosam
import ( import (
"fmt" "fmt"

2
stream.go
View File

@ -1,4 +1,4 @@
package goSam package gosam
import ( import (
"fmt" "fmt"