lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-02 23:47:07 -05:00
Code Issues Releases Wiki Activity

fix some lint warnings.

Browse Source
This commit is contained in:
lucifer9 2019-06-27 14:27:47 +08:00
parent e744537b80
commit 1955d72e3e
1 changed files with 26 additions and 28 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,33 +135,31 @@ 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
} }
listener.server = server err = server.ServeTLS(tcpListener, "", "")
go func() { if err != nil {
tcpListener, err := internet.ListenSystem(ctx, &net.TCPAddr{ newError("stoping serving TLS").Base(err).WriteToLog(session.ExportIDToError(ctx))
IP: address.IP(), }
Port: int(port), }()
}, streamSettings.SocketSettings) return listener, nil
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() {