root/gost_software
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
rui.zheng 2017-08-06 22:42:20 +08:00
parent 55622a5f43
commit 0834a62f62
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cmd/gost/main.go
View File

@ -97,7 +97,7 @@ func initChain() (*gost.Chain, error) {
} }
tlsCfg := &tls.Config{ tlsCfg := &tls.Config{
ServerName: serverName, ServerName: serverName,
InsecureSkipVerify: !toBool(node.Values.Get("scure")), InsecureSkipVerify: !toBool(node.Values.Get("secure")),
RootCAs: rootCAs, RootCAs: rootCAs,
} }
var tr gost.Transporter var tr gost.Transporter
@ -109,24 +109,22 @@ func initChain() (*gost.Chain, error) {
wsOpts.EnableCompression = toBool(node.Values.Get("compression")) wsOpts.EnableCompression = toBool(node.Values.Get("compression"))
wsOpts.ReadBufferSize, _ = strconv.Atoi(node.Values.Get("rbuf")) wsOpts.ReadBufferSize, _ = strconv.Atoi(node.Values.Get("rbuf"))
wsOpts.WriteBufferSize, _ = strconv.Atoi(node.Values.Get("wbuf")) wsOpts.WriteBufferSize, _ = strconv.Atoi(node.Values.Get("wbuf"))
node.HandshakeOptions = append(node.HandshakeOptions, tr = gost.WSTransporter(wsOpts)
gost.WSOptionsHandshakeOption(wsOpts),
)
tr = gost.WSTransporter(nil)
case "wss": case "wss":
tr = gost.WSSTransporter(nil) wsOpts := &gost.WSOptions{}
wsOpts.EnableCompression = toBool(node.Values.Get("compression"))
wsOpts.ReadBufferSize, _ = strconv.Atoi(node.Values.Get("rbuf"))
wsOpts.WriteBufferSize, _ = strconv.Atoi(node.Values.Get("wbuf"))
tr = gost.WSSTransporter(wsOpts)
case "kcp": case "kcp":
if !chain.IsEmpty() { if !chain.IsEmpty() {
return nil, errors.New("KCP must be the first node in the proxy chain") return nil, errors.New("KCP must be the first node in the proxy chain")
} }
config, err := parseKCPConfig(node.Values.Get("c")) config, err := parseKCPConfig(node.Values.Get("c"))
if err != nil { if err != nil {
log.Log("[kcp]", err) return nil, err
} }
node.HandshakeOptions = append(node.HandshakeOptions, tr = gost.KCPTransporter(config)
gost.KCPConfigHandshakeOption(config),
)
tr = gost.KCPTransporter(nil)
case "ssh": case "ssh":
if node.Protocol == "direct" || node.Protocol == "remote" || node.Protocol == "forward" { if node.Protocol == "direct" || node.Protocol == "remote" || node.Protocol == "forward" {
tr = gost.SSHForwardTransporter() tr = gost.SSHForwardTransporter()
@ -146,18 +144,15 @@ func initChain() (*gost.Chain, error) {
TLSConfig: tlsCfg, TLSConfig: tlsCfg,
KeepAlive: toBool(node.Values.Get("keepalive")), KeepAlive: toBool(node.Values.Get("keepalive")),
} }
node.HandshakeOptions = append(node.HandshakeOptions, tr = gost.QUICTransporter(config)
gost.QUICConfigHandshakeOption(config),
)
tr = gost.QUICTransporter(nil)
case "http2": case "http2":
tr = gost.HTTP2Transporter(nil) tr = gost.HTTP2Transporter(tlsCfg)
node.DialOptions = append(node.DialOptions, node.DialOptions = append(node.DialOptions,
gost.ChainDialOption(chain), gost.ChainDialOption(chain),
) )
chain = gost.NewChain() // cutoff the chain for multiplex chain = gost.NewChain() // cutoff the chain for multiplex
case "h2": case "h2":
tr = gost.H2Transporter(nil) tr = gost.H2Transporter(tlsCfg)
node.DialOptions = append(node.DialOptions, node.DialOptions = append(node.DialOptions,
gost.ChainDialOption(chain), gost.ChainDialOption(chain),
) )
@ -256,7 +251,7 @@ func serve(chain *gost.Chain) error {
case "kcp": case "kcp":
config, err := parseKCPConfig(node.Values.Get("c")) config, err := parseKCPConfig(node.Values.Get("c"))
if err != nil { if err != nil {
log.Log("[kcp]", err) return err
} }
ln, err = gost.KCPListener(node.Addr, config) ln, err = gost.KCPListener(node.Addr, config)
case "ssh": case "ssh":