mirror of
https://github.com/nadoo/glider.git
synced 2026-11-19 07:09:42 +08:00
wss: added a new scheme wss for convenience
This commit is contained in:
1 parent
a62674838e
commit
15f9e74e39
11 files changed
+166
-75
No files matched your search
@@ -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{
|
||||
|
||||
Reference in new issue
Block a user