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

rename some variables for clarity

Browse source
This commit is contained in:
Shivaram Lingamneni 2019-11-20 17:43:40 -05:00
parent 50783d5276
commit 7432ef07a7
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
irc/server.go
View file

@ -308,7 +308,7 @@ func (server *Server) createListener(addr string, conf listenerConfig, bindMode
return
} else if err == nil {
var proxyLine string
if conf.IsTLSProxy {
if conf.ProxyBeforeTLS {
proxyLine = readRawProxyLine(conn)
if proxyLine == "" {
server.logger.Error("internal", "bad TLS-proxy line from", addr)
@ -877,7 +877,7 @@ func (server *Server) loadDatastore(config *Config) error {
func (server *Server) setupListeners(config *Config) (err error) {
logListener := func(addr string, config listenerConfig) {
server.logger.Info("listeners",
fmt.Sprintf("now listening on %s, tls=%t, tlsproxy=%t, tor=%t.", addr, (config.TLSConfig != nil), config.IsTLSProxy, config.IsTor),
fmt.Sprintf("now listening on %s, tls=%t, tlsproxy=%t, tor=%t.", addr, (config.TLSConfig != nil), config.ProxyBeforeTLS, config.Tor),
)
}
@ -904,7 +904,7 @@ func (server *Server) setupListeners(config *Config) (err error) {
publicPlaintextListener := ""
// create new listeners that were not previously configured
for newAddr, newConfig := range config.Server.trueListeners {
if strings.HasPrefix(newAddr, ":") && !newConfig.IsTor && !newConfig.IsSTSOnly && newConfig.TLSConfig == nil {
if strings.HasPrefix(newAddr, ":") && !newConfig.Tor && !newConfig.STSOnly && newConfig.TLSConfig == nil {
publicPlaintextListener = newAddr
}
_, exists := server.listeners[newAddr]