Cleanup: put middleware helper functions in pkgs (#245)

Move all (almost all) Go files in middleware into their
own packages. This makes for better naming and discoverability.

Lot of changes elsewhere to make this change.

The middleware.State was renamed to request.Request which is better,
but still does not cover all use-cases. It was also moved out middleware
because it is used by `dnsserver` as well.

A pkg/dnsutil packages was added for shared, handy, dns util functions.

All normalize functions are now put in normalize.go

1 files changed, 0 insertions, 36 deletions

diff --git a/middleware/host.go b/middleware/host.go
deleted file mode 100644
index 65dbefbca..000000000
--- a/middleware/host.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package middleware
-
-import (
-	"net"
-	"strings"
-
-	"github.com/miekg/dns"
-)
-
-// Host represents a host from the Corefile, may contain port.
-type (
-	Host string
-	Addr string
-)
-
-// Normalize will return the host portion of host, stripping
-// of any port. The host will also be fully qualified and lowercased.
-func (h Host) Normalize() string {
-	// separate host and port
-	host, _, err := net.SplitHostPort(string(h))
-	if err != nil {
-		host, _, _ = net.SplitHostPort(string(h) + ":")
-	}
-	return strings.ToLower(dns.Fqdn(host))
-}
-
-// Normalize will return a normalized address, if not port is specified
-// port 53 is added, otherwise the port will be left as is.
-func (a Addr) Normalize() string {
-	// separate host and port
-	addr, port, err := net.SplitHostPort(string(a))
-	if err != nil {
-		addr, port, _ = net.SplitHostPort(string(a) + ":53")
-	}
-	return net.JoinHostPort(addr, port)
-}