proxy: support chain more than 2 protocols in server mode

This commit is contained in:
nadoo committed 2021-05-05 18:41:48 +08:00
1 parent 70cf30b5e6
commit ceb8b82df8
8 files changed
+50 -29

No files matched your search

+7 -4
View File
@@ -143,15 +143,18 @@ func NewKCPDialer(s string, d proxy.Dialer) (proxy.Dialer, error) {
// NewKCPServer returns a kcp proxy server.
func NewKCPServer(s string, p proxy.Proxy) (proxy.Server, error) {
transport := strings.Split(s, ",")
server, chain := s, ""
if idx := strings.IndexByte(s, ','); idx != -1 {
server, chain = s[:idx], s[idx+1:]
}
k, err := NewKCP(transport[0], nil, p)
k, err := NewKCP(server, nil, p)
if err != nil {
return nil, err
}
if len(transport) > 1 {
k.server, err = proxy.ServerFromURL(transport[1], p)
if chain != "" {
k.server, err = proxy.ServerFromURL(chain, p)
if err != nil {
return nil, err
}
+7 -4
View File
@@ -24,9 +24,12 @@ func init() {
// NewSmuxServer returns a smux transport layer before the real server.
func NewSmuxServer(s string, p proxy.Proxy) (proxy.Server, error) {
transport := strings.Split(s, ",")
server, chain := s, ""
if idx := strings.IndexByte(s, ','); idx != -1 {
server, chain = s[:idx], s[idx+1:]
}
u, err := url.Parse(transport[0])
u, err := url.Parse(server)
if err != nil {
log.F("[smux] parse url err: %s", err)
return nil, err
@@ -37,8 +40,8 @@ func NewSmuxServer(s string, p proxy.Proxy) (proxy.Server, error) {
addr: u.Host,
}
if len(transport) > 1 {
m.server, err = proxy.ServerFromURL(transport[1], p)
if chain != "" {
m.server, err = proxy.ServerFromURL(chain, p)
if err != nil {
return nil, err
}
+7 -4
View File
@@ -82,9 +82,12 @@ func NewTLSDialer(s string, d proxy.Dialer) (proxy.Dialer, error) {
// NewTLSServer returns a tls transport layer before the real server.
func NewTLSServer(s string, p proxy.Proxy) (proxy.Server, error) {
transport := strings.Split(s, ",")
server, chain := s, ""
if idx := strings.IndexByte(s, ','); idx != -1 {
server, chain = s[:idx], s[idx+1:]
}
t, err := NewTLS(transport[0], nil, p)
t, err := NewTLS(server, nil, p)
if err != nil {
return nil, err
}
@@ -104,8 +107,8 @@ func NewTLSServer(s string, p proxy.Proxy) (proxy.Server, error) {
MinVersion: stdtls.VersionTLS12,
}
if len(transport) > 1 {
t.server, err = proxy.ServerFromURL(transport[1], p)
if chain != "" {
t.server, err = proxy.ServerFromURL(chain, p)
if err != nil {
return nil, err
}
+7 -4
View File
@@ -17,15 +17,18 @@ func init() {
// NewUnixServer returns a unix domain socket server.
func NewUnixServer(s string, p proxy.Proxy) (proxy.Server, error) {
transport := strings.Split(s, ",")
server, chain := s, ""
if idx := strings.IndexByte(s, ','); idx != -1 {
server, chain = s[:idx], s[idx+1:]
}
unix, err := NewUnix(transport[0], nil, p)
unix, err := NewUnix(server, nil, p)
if err != nil {
return nil, err
}
if len(transport) > 1 {
unix.server, err = proxy.ServerFromURL(transport[1], p)
if chain != "" {
unix.server, err = proxy.ServerFromURL(chain, p)
if err != nil {
return nil, err
}
+7 -4
View File
@@ -18,15 +18,18 @@ func init() {
// NewWSServer returns a ws transport server.
func NewWSServer(s string, p proxy.Proxy) (proxy.Server, error) {
transport := strings.Split(s, ",")
server, chain := s, ""
if idx := strings.IndexByte(s, ','); idx != -1 {
server, chain = s[:idx], s[idx+1:]
}
w, err := NewWS(transport[0], nil, p)
w, err := NewWS(server, nil, p)
if err != nil {
return nil, err
}
if len(transport) > 1 {
w.server, err = proxy.ServerFromURL(transport[1], p)
if chain != "" {
w.server, err = proxy.ServerFromURL(chain, p)
if err != nil {
return nil, err
}