CEF/ergo
1
0
Fork 0
forked from External/ergo
Code Pull requests Activity

restructure SSL/TLS a bit, name config items better

Browse source
This commit is contained in:
Daniel Oaks 2016-04-28 20:12:23 +10:00
parent cfcecd0101
commit 2fb6acb92a
4 changed files with 29 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

12
irc/server.go
View file

@ -99,7 +99,7 @@ func NewServer(config *Config) *Server {
server.loadChannels()
for _, addr := range config.Server.Listen {
server.listen(addr, config.SSLListeners())
server.listen(addr, config.TLSListeners())
}
if config.Server.Wslisten != "" {
@ -240,18 +240,20 @@ func (server *Server) Run() {
// listen goroutine
//
func (s *Server) listen(addr string, ssl map[Name]*tls.Config) {
config, listenSSL := ssl[NewName(addr)]
func (s *Server) listen(addr string, tlsMap map[Name]*tls.Config) {
config, listenTLS := tlsMap[NewName(addr)]
listener, err := net.Listen("tcp", addr)
if err != nil {
log.Fatal(s, "listen error: ", err)
}
if listenSSL {
tlsString := "plaintext"
if listenTLS {
listener = tls.NewListener(listener, config)
tlsString = "TLS"
}
Log.info.Printf("%s listening on %s. ssl: %t", s, addr, listenSSL)
Log.info.Printf("%s listening on %s using %s.", s, addr, tlsString)
go func() {
for {