github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "fix some lint warnings." 

This reverts commit 1955d72e3e.
pull/1783/head
lucifer9 2019-06-29 10:21:34 +08:00
parent 1955d72e3e
commit f59c0542c9
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
transport/internet/http/hub.go
View File

@ -108,12 +108,12 @@ func Listen(ctx context.Context, address net.Address, port net.Port, streamSetti
config := tls.ConfigFromStreamSettings(streamSettings) config := tls.ConfigFromStreamSettings(streamSettings)
if config == nil { if config == nil {
// return nil, newError("TLS must be enabled for http transport.").AtWarning() // return nil, newError("TLS must be enabled for http transport.").AtWarning()
h2s := &http2.Server{} h2s:=&http2.Server{}
server := &http.Server{ server := &http.Server{
Addr: serial.Concat(address, ":", port), Addr: serial.Concat(address, ":", port),
// TLSConfig: config.GetTLSConfig(tls.WithNextProto("h2")), // TLSConfig: config.GetTLSConfig(tls.WithNextProto("h2")),
Handler: h2c.NewHandler(listener, h2s), Handler: h2c.NewHandler(listener,h2s),
ReadHeaderTimeout: time.Second * 4, ReadHeaderTimeout: time.Second * 4,
} }
@ -135,31 +135,33 @@ func Listen(ctx context.Context, address net.Address, port net.Port, streamSetti
}() }()
return listener, nil return listener, nil
} } else {
server := &http.Server{ server := &http.Server{
Addr: serial.Concat(address, ":", port), Addr: serial.Concat(address, ":", port),
TLSConfig: config.GetTLSConfig(tls.WithNextProto("h2")), TLSConfig: config.GetTLSConfig(tls.WithNextProto("h2")),
Handler: listener, Handler: listener,
ReadHeaderTimeout: time.Second * 4, ReadHeaderTimeout: time.Second * 4,
}
listener.server = server
go func() {
tcpListener, err := internet.ListenSystem(ctx, &net.TCPAddr{
IP: address.IP(),
Port: int(port),
}, streamSettings.SocketSettings)
if err != nil {
newError("failed to listen on", address, ":", port).Base(err).WriteToLog(session.ExportIDToError(ctx))
return
} }
err = server.ServeTLS(tcpListener, "", "") listener.server = server
if err != nil { go func() {
newError("stoping serving TLS").Base(err).WriteToLog(session.ExportIDToError(ctx)) tcpListener, err := internet.ListenSystem(ctx, &net.TCPAddr{
} IP: address.IP(),
}() Port: int(port),
return listener, nil }, streamSettings.SocketSettings)
if err != nil {
newError("failed to listen on", address, ":", port).Base(err).WriteToLog(session.ExportIDToError(ctx))
return
}
err = server.ServeTLS(tcpListener, "", "")
if err != nil {
newError("stoping serving TLS").Base(err).WriteToLog(session.ExportIDToError(ctx))
}
}()
return listener, nil
}
} }
func init() { func init() {