lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-09-30 07:46:41 -04:00
Code Issues Releases Wiki Activity

Added Stoppable listener for TLS listener

Browse Source
This commit is contained in:
Shelikhoo 2016-08-15 18:43:17 +08:00
parent c8cd1320c7
commit 062d05fdcf
No known key found for this signature in database
GPG Key ID: 7791BDB0709ABD21
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
transport/internet/ws/hub.go
View File

@ -83,7 +83,12 @@ func (wsl *WSListener) listenws(address v2net.Address, port v2net.Port) error {
if effectiveConfig.Pto == "wss" {
listenerfunc = func() error {
return http.ListenAndServeTLS(address.String()+":"+strconv.Itoa(int(port.Value())), effectiveConfig.Cert, effectiveConfig.PrivKey, nil)
var err error
wsl.listener, err = getstopableTLSlistener(effectiveConfig.Cert, effectiveConfig.PrivKey, address.String()+":"+strconv.Itoa(int(port.Value())))
if err != nil {
return err
}
return http.Serve(wsl.listener, nil)
}
}

18
transport/internet/ws/stopabletlslistener.go Normal file
View File

@ -0,0 +1,18 @@
package ws
import "crypto/tls"
func getstopableTLSlistener(cert, key, listenaddr string) (*StoppableListener, error) {
cer, err := tls.LoadX509KeyPair(cert, key)
if err != nil {
return nil, err
}
config := &tls.Config{Certificates: []tls.Certificate{cer}}
ln, err := tls.Listen("tcp", listenaddr, config)
if err != nil {
return nil, err
}
lns, err := NewStoppableListener(ln)
return lns, err
}