diff --git a/cmd/discosrv/main.go b/cmd/discosrv/main.go index 7dfea117..16f0623e 100644 --- a/cmd/discosrv/main.go +++ b/cmd/discosrv/main.go @@ -52,7 +52,7 @@ var ( certFile = "cert.pem" keyFile = "key.pem" debug = false - useHttp = false + useHTTP = false ) func main() { @@ -76,14 +76,14 @@ func main() { flag.StringVar(&certFile, "cert", certFile, "Certificate file") flag.StringVar(&keyFile, "key", keyFile, "Key file") flag.BoolVar(&debug, "debug", debug, "Debug") - flag.BoolVar(&useHttp, "http", useHttp, "Listen on HTTP (behind an HTTPS proxy)") + flag.BoolVar(&useHTTP, "http", useHTTP, "Listen on HTTP (behind an HTTPS proxy)") flag.Parse() log.Println(LongVersion) var cert tls.Certificate var err error - if !useHttp { + if !useHTTP { cert, err = tls.LoadX509KeyPair(certFile, keyFile) if err != nil { log.Fatalln("Failed to load X509 key pair:", err) diff --git a/cmd/discosrv/querysrv.go b/cmd/discosrv/querysrv.go index d1d4f3d5..6d55be79 100644 --- a/cmd/discosrv/querysrv.go +++ b/cmd/discosrv/querysrv.go @@ -83,7 +83,7 @@ func (s *querysrv) Serve() { Cache: lru.New(lruSize), } - if useHttp { + if useHTTP { listener, err := net.Listen("tcp", s.addr) if err != nil { log.Println("Listen:", err) @@ -153,7 +153,7 @@ func (s *querysrv) handler(w http.ResponseWriter, req *http.Request) { }() var remoteIP net.IP - if useHttp { + if useHTTP { remoteIP = net.ParseIP(req.Header.Get("X-Forwarded-For")) } else { addr, err := net.ResolveTCPAddr("tcp", req.RemoteAddr)