From 3cea3ab217c17251ea4a893ed7fb21d689fbf1ed Mon Sep 17 00:00:00 2001
From: James Mills <prologic@shortcircuit.net.au>
Date: Fri, 9 Jun 2017 01:53:08 -0700
Subject: [PATCH] Fixed host selectors by provising a -host option and passing
 this through to server and handlers

---
 cmd/gopherd/main.go |  4 +++-
 gopher.go           | 17 +++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/cmd/gopherd/main.go b/cmd/gopherd/main.go
index 6d6a5ac..98d4e5c 100644
--- a/cmd/gopherd/main.go
+++ b/cmd/gopherd/main.go
@@ -19,6 +19,7 @@ func cwd() string {
 func main() {
 	var (
 		bind = flag.String("bind", ":70", "port to listen on")
+		host = flag.String("host", "localhost", "fqdn hostname")
 		root = flag.String("root", cwd(), "root directory to serve")
 	)
 
@@ -26,5 +27,6 @@ func main() {
 
 	gopher.Handle("/", gopher.FileServer(gopher.Dir(*root)))
 
-	log.Fatal(gopher.ListenAndServe(*bind, nil))
+	server := gopher.Server{Addr: *bind, Hostname: *host}
+	log.Fatal(server.ListenAndServe())
 }
diff --git a/gopher.go b/gopher.go
index 5d8811a..38fb1a8 100644
--- a/gopher.go
+++ b/gopher.go
@@ -531,6 +531,8 @@ type Server struct {
 	Addr    string  // TCP address to listen on, ":gopher" if empty
 	Handler Handler // handler to invoke, gopher.DefaultServeMux if nil
 
+	Hostname string // FQDN Hostname to reach this server on
+
 	// ErrorLog specifies an optional logger for errors accepting
 	// connections and unexpected behavior from handlers.
 	// If nil, logging goes to os.Stderr via the log package's
@@ -558,7 +560,7 @@ func (sh serverHandler) ServeGopher(rw ResponseWriter, req *Request) {
 //
 // If the address is not a FQDN, LocalHost as passed to the Handler
 // may not be accessible to clients, so links may not work.
-func (s Server) ListenAndServe() error {
+func (s *Server) ListenAndServe() error {
 	addr := s.Addr
 	if addr == "" {
 		addr = ":70"
@@ -608,7 +610,7 @@ func (s *Server) ListenAndServeTLS(certFile, keyFile string) error {
 }
 
 // Serve ...
-func (s Server) Serve(l net.Listener) error {
+func (s *Server) Serve(l net.Listener) error {
 	defer l.Close()
 
 	ctx := context.Background()
@@ -731,8 +733,15 @@ func (c *conn) readRequest(ctx context.Context) (w *response, err error) {
 		return nil, err
 	}
 
-	req.LocalHost = host
-	req.LocalPort = int(n)
+	server := ctx.Value(ServerContextKey).(*Server)
+	if server.Hostname == "" {
+		req.LocalHost = host
+		req.LocalPort = int(n)
+	} else {
+		req.LocalHost = server.Hostname
+		// TODO: Parse this from -bind option
+		req.LocalPort = int(n)
+	}
 
 	w = &response{
 		conn: c,