External/grumble
1
0
Fork 1
mirror of https://github.com/mumble-voip/grumble.git synced 2025-12-20 14:20:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Slightly too aggressive in getting stuff out

Browse source
This commit is contained in:
Ola Bini 2019-12-17 19:48:39 +00:00
parent 541bc4c5a6
commit 4db50b4fa3
No known key found for this signature in database
GPG key ID: 6786A150F6A2B28F
1 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

37
server/server.go
View file

@ -1428,19 +1428,20 @@ func (server *Server) Start() (err error) {
} }
*/ */
// Wrap a TLS listener around the TCP connection
certFn := filepath.Join(Args.DataDir, "cert.pem")
keyFn := filepath.Join(Args.DataDir, "key.pem")
cert, err := tls.LoadX509KeyPair(certFn, keyFn)
if err != nil {
return err
}
server.tlscfg = &tls.Config{
Certificates: []tls.Certificate{cert},
ClientAuth: tls.RequestClientCert,
}
server.tlsl = tls.NewListener(server.tcpl, server.tlscfg)
if shouldListenWeb { if shouldListenWeb {
// Wrap a TLS listener around the TCP connection
certFn := filepath.Join(Args.DataDir, "cert.pem")
keyFn := filepath.Join(Args.DataDir, "key.pem")
cert, err := tls.LoadX509KeyPair(certFn, keyFn)
if err != nil {
return err
}
server.tlscfg = &tls.Config{
Certificates: []tls.Certificate{cert},
ClientAuth: tls.RequestClientCert,
}
server.tlsl = tls.NewListener(server.tcpl, server.tlscfg)
// Create HTTP server and WebSocket "listener" // Create HTTP server and WebSocket "listener"
webaddr := &net.TCPAddr{IP: net.ParseIP(host), Port: webport} webaddr := &net.TCPAddr{IP: net.ParseIP(host), Port: webport}
server.webtlscfg = &tls.Config{ server.webtlscfg = &tls.Config{
@ -1540,18 +1541,18 @@ func (server *Server) Stop() (err error) {
} else if err != nil { } else if err != nil {
return err return err
} }
// Close the listeners
err = server.tlsl.Close()
if err != nil {
return err
}
err = server.webwsl.Close() err = server.webwsl.Close()
if err != nil { if err != nil {
return err return err
} }
} }
// Close the listeners
err = server.tlsl.Close()
if err != nil {
return err
}
err = server.tcpl.Close() err = server.tcpl.Close()
if err != nil { if err != nil {
return err return err