wss: added a new scheme wss for convenience

This commit is contained in:
nadoo committed 2021-07-09 19:17:16 +08:00
1 parent a62674838e
commit 15f9e74e39
11 files changed
+166 -75

No files matched your search

+3 -5
View File
@@ -2,6 +2,7 @@ package trojan
import (
"crypto/tls"
"fmt"
"net"
"github.com/nadoo/glider/log"
@@ -14,10 +15,8 @@ import (
func NewClearTextDialer(s string, d proxy.Dialer) (proxy.Dialer, error) {
t, err := NewTrojan(s, d, nil)
if err != nil {
log.F("[trojan] create instance error: %s", err)
return nil, err
return nil, fmt.Errorf("[trojanc] create instance error: %s", err)
}
t.withTLS = false
return t, err
}
@@ -26,8 +25,7 @@ func NewClearTextDialer(s string, d proxy.Dialer) (proxy.Dialer, error) {
func NewTrojanDialer(s string, d proxy.Dialer) (proxy.Dialer, error) {
t, err := NewTrojan(s, d, nil)
if err != nil {
log.F("[trojan] create instance error: %s", err)
return nil, err
return nil, fmt.Errorf("[trojan] create instance error: %s", err)
}
t.tlsConfig = &tls.Config{
+4 -6
View File
@@ -19,8 +19,7 @@ import (
func NewClearTextServer(s string, p proxy.Proxy) (proxy.Server, error) {
t, err := NewTrojan(s, nil, p)
if err != nil {
log.F("[trojan] create instance error: %s", err)
return nil, err
return nil, fmt.Errorf("[trojanc] create instance error: %s", err)
}
t.withTLS = false
@@ -31,8 +30,7 @@ func NewClearTextServer(s string, p proxy.Proxy) (proxy.Server, error) {
func NewTrojanServer(s string, p proxy.Proxy) (proxy.Server, error) {
t, err := NewTrojan(s, nil, p)
if err != nil {
log.F("[trojan] create instance error: %s", err)
return nil, err
return nil, fmt.Errorf("[trojan] create instance error: %s", err)
}
if t.certFile == "" || t.keyFile == "" {
@@ -41,8 +39,8 @@ func NewTrojanServer(s string, p proxy.Proxy) (proxy.Server, error) {
cert, err := tls.LoadX509KeyPair(t.certFile, t.keyFile)
if err != nil {
log.F("[trojan] unable to load cert: %s, key %s", t.certFile, t.keyFile)
return nil, err
return nil, fmt.Errorf("[trojan] unable to load cert: %s, key %s, error: %s",
t.certFile, t.keyFile, err)
}
t.tlsConfig = &tls.Config{
+1 -5
View File
@@ -55,7 +55,7 @@ func NewTrojan(s string, d proxy.Dialer, p proxy.Proxy) (*Trojan, error) {
serverName: query.Get("serverName"),
certFile: query.Get("cert"),
keyFile: query.Get("key"),
// fallback: "127.0.0.1:80",
fallback: query.Get("fallback"),
}
if _, port, _ := net.SplitHostPort(t.addr); port == "" {
@@ -76,9 +76,5 @@ func NewTrojan(s string, d proxy.Dialer, p proxy.Proxy) (*Trojan, error) {
hash.Write([]byte(pass))
hex.Encode(t.pass[:], hash.Sum(nil))
if fb := u.Query().Get("fallback"); fb != "" {
t.fallback = fb
}
return t, nil
}