diff options
author | 2018-09-19 07:29:37 +0100 | |
---|---|---|
committer | 2018-09-19 07:29:37 +0100 | |
commit | c349446a23440b336f4ca21900cce4d6a031cdf5 (patch) | |
tree | 983ab79eac59d59e36dfbf4a29fcf1bd811110d5 /core/dnsserver/server_https.go | |
parent | 2f1223c36a0294cd07e299aaa792a0b3f51f687a (diff) | |
download | coredns-c349446a23440b336f4ca21900cce4d6a031cdf5.tar.gz coredns-c349446a23440b336f4ca21900cce4d6a031cdf5.tar.zst coredns-c349446a23440b336f4ca21900cce4d6a031cdf5.zip |
Cleanup ParseHostOrFile (#2100)
Create plugin/pkg/transport that holds the transport related functions.
This needed to be a new pkg to prevent cyclic import errors.
This cleans up a bunch of duplicated code in core/dnsserver that also
tried to parse a transport (now all done in transport.Parse).
Signed-off-by: Miek Gieben <miek@miek.nl>
Diffstat (limited to 'core/dnsserver/server_https.go')
-rw-r--r-- | core/dnsserver/server_https.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/dnsserver/server_https.go b/core/dnsserver/server_https.go index 9b1eaaa7e..1e184e044 100644 --- a/core/dnsserver/server_https.go +++ b/core/dnsserver/server_https.go @@ -12,6 +12,7 @@ import ( "github.com/coredns/coredns/plugin/pkg/dnsutil" "github.com/coredns/coredns/plugin/pkg/doh" "github.com/coredns/coredns/plugin/pkg/response" + "github.com/coredns/coredns/plugin/pkg/transport" ) // ServerHTTPS represents an instance of a DNS-over-HTTPS server. @@ -60,7 +61,7 @@ func (s *ServerHTTPS) ServePacket(p net.PacketConn) error { return nil } // Listen implements caddy.TCPServer interface. func (s *ServerHTTPS) Listen() (net.Listener, error) { - l, err := net.Listen("tcp", s.Addr[len(TransportHTTPS+"://"):]) + l, err := net.Listen("tcp", s.Addr[len(transport.HTTPS+"://"):]) if err != nil { return nil, err } @@ -77,7 +78,7 @@ func (s *ServerHTTPS) OnStartupComplete() { return } - out := startUpZones(TransportHTTPS+"://", s.Addr, s.zones) + out := startUpZones(transport.HTTPS+"://", s.Addr, s.zones) if out != "" { fmt.Print(out) } |