package/tun2socks
1
0
Fork 0
mirror of https://github.com/xjasonlyu/tun2socks.git synced 2025-10-06 09:16:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Chore: rename ShadowSocks to Shadowsocks

Browse Source
This commit is contained in:
xjasonlyu
2021-02-06 19:01:01 +08:00
parent 496d25ff23
commit b79ab7335a
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/parse.go
View File

@@ -56,7 +56,7 @@ func parseProxy(s string) (proxy.Proxy, error) {
case "socks5": case "socks5":
return proxy.NewSocks5(parseSocks(u)) return proxy.NewSocks5(parseSocks(u))
case "ss": case "ss":
return proxy.NewShadowSocks(parseShadowSocks(u)) return proxy.NewShadowsocks(parseShadowsocks(u))
} }
return nil, fmt.Errorf("unsupported protocol: %s", proto) return nil, fmt.Errorf("unsupported protocol: %s", proto)
@@ -69,7 +69,7 @@ func parseSocks(u *url.URL) (address, username, password string) {
return return
} }
func parseShadowSocks(u *url.URL) (address, method, password, obfsMode, obfsHost string) { func parseShadowsocks(u *url.URL) (address, method, password, obfsMode, obfsHost string) {
address = u.Host address = u.Host
if pass, set := u.User.Password(); set { if pass, set := u.User.Password(); set {

14
proxy/shadowsocks.go
View File

@@ -14,9 +14,9 @@ import (
"github.com/Dreamacro/go-shadowsocks2/core" "github.com/Dreamacro/go-shadowsocks2/core"
) )
var _ Proxy = (*ShadowSocks)(nil) var _ Proxy = (*Shadowsocks)(nil)
type ShadowSocks struct { type Shadowsocks struct {
*Base *Base
cipher core.Cipher cipher core.Cipher
@@ -25,13 +25,13 @@ type ShadowSocks struct {
obfsMode, obfsHost string obfsMode, obfsHost string
} }
func NewShadowSocks(addr, method, password, obfsMode, obfsHost string) (*ShadowSocks, error) { func NewShadowsocks(addr, method, password, obfsMode, obfsHost string) (*Shadowsocks, error) {
cipher, err := core.PickCipher(method, nil, password) cipher, err := core.PickCipher(method, nil, password)
if err != nil { if err != nil {
return nil, fmt.Errorf("ss initialize: %w", err) return nil, fmt.Errorf("ss initialize: %w", err)
} }
return &ShadowSocks{ return &Shadowsocks{
Base: NewBase(addr), Base: NewBase(addr),
cipher: cipher, cipher: cipher,
obfsMode: obfsMode, obfsMode: obfsMode,
@@ -39,11 +39,11 @@ func NewShadowSocks(addr, method, password, obfsMode, obfsHost string) (*ShadowS
}, nil }, nil
} }
func (ss *ShadowSocks) Type() string { func (ss *Shadowsocks) Type() string {
return "ss" return "ss"
} }
func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *adapter.Metadata) (c net.Conn, err error) { func (ss *Shadowsocks) DialContext(ctx context.Context, metadata *adapter.Metadata) (c net.Conn, err error) {
c, err = dialer.DialContext(ctx, "tcp", ss.Addr()) c, err = dialer.DialContext(ctx, "tcp", ss.Addr())
if err != nil { if err != nil {
return nil, fmt.Errorf("connect to %s: %w", ss.Addr(), err) return nil, fmt.Errorf("connect to %s: %w", ss.Addr(), err)
@@ -69,7 +69,7 @@ func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *adapter.Metada
return return
} }
func (ss *ShadowSocks) DialUDP(_ *adapter.Metadata) (net.PacketConn, error) { func (ss *Shadowsocks) DialUDP(_ *adapter.Metadata) (net.PacketConn, error) {
pc, err := dialer.ListenPacket("udp", "") pc, err := dialer.ListenPacket("udp", "")
if err != nil { if err != nil {
return nil, fmt.Errorf("listen packet: %w", err) return nil, fmt.Errorf("listen packet: %w", err)