ssr: update due to 3rd party package change

This commit is contained in:
nadoo committed 2020-07-23 21:12:48 +08:00
1 parent e23a29f057
commit c43bf0bbbb
3 files changed
+28 -16

No files matched your search

+9 -7
View File
@@ -10,7 +10,7 @@ import (
shadowsocksr "github.com/mzz2017/shadowsocksR"
"github.com/mzz2017/shadowsocksR/obfs"
"github.com/mzz2017/shadowsocksR/protocol"
"github.com/mzz2017/shadowsocksR/ssr"
ssrinfo "github.com/mzz2017/shadowsocksR/ssr"
"github.com/mzz2017/shadowsocksR/streamCipher"
"github.com/nadoo/glider/common/log"
@@ -18,6 +18,10 @@ import (
"github.com/nadoo/glider/proxy"
)
func init() {
proxy.RegisterDialer("ssr", NewSSRDialer)
}
// SSR struct.
type SSR struct {
dialer proxy.Dialer
@@ -33,10 +37,6 @@ type SSR struct {
ProtocolData interface{}
}
func init() {
proxy.RegisterDialer("ssr", NewSSRDialer)
}
// NewSSR returns a shadowsocksr proxy, ssr://method:pass@host:port/query
func NewSSR(s string, d proxy.Dialer) (*SSR, error) {
u, err := url.Parse(s)
@@ -62,6 +62,8 @@ func NewSSR(s string, d proxy.Dialer) (*SSR, error) {
p.Obfs = query.Get("obfs")
p.ObfsParam = query.Get("obfs_param")
p.ProtocolData = new(protocol.AuthData)
return p, nil
}
@@ -110,7 +112,7 @@ func (s *SSR) Dial(network, addr string) (net.Conn, error) {
return nil, errors.New("[ssr] unsupported obfs type: " + s.Obfs)
}
obfsServerInfo := &ssr.ServerInfoForObfs{
obfsServerInfo := &ssrinfo.ServerInfo{
Host: rs[0],
Port: uint16(port),
TcpMss: 1460,
@@ -123,7 +125,7 @@ func (s *SSR) Dial(network, addr string) (net.Conn, error) {
return nil, errors.New("[ssr] unsupported protocol type: " + s.Protocol)
}
protocolServerInfo := &ssr.ServerInfoForObfs{
protocolServerInfo := &ssrinfo.ServerInfo{
Host: rs[0],
Port: uint16(port),
TcpMss: 1460,