Add `go mod` support (#2503)

* Remove vendor and go-dep

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

* Add go.mod

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

* Update Makefile and .travis.yml

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>

11 files changed, 0 insertions, 1402 deletions

diff --git a/vendor/github.com/dnstap/golang-dnstap/COPYRIGHT b/vendor/github.com/dnstap/golang-dnstap/COPYRIGHT
deleted file mode 100644
index 169e84827..000000000
--- a/vendor/github.com/dnstap/golang-dnstap/COPYRIGHT
+++ /dev/null
@@ -1,14 +0,0 @@
-Copyright (c) 2013-2014 by Farsight Security, Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
diff --git a/vendor/github.com/dnstap/golang-dnstap/FrameStreamInput.go b/vendor/github.com/dnstap/golang-dnstap/FrameStreamInput.go
deleted file mode 100644
index 5d58aa5b6..000000000
--- a/vendor/github.com/dnstap/golang-dnstap/FrameStreamInput.go
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2013-2014 by Farsight Security, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dnstap
-
-import (
-	"io"
-	"log"
-	"os"
-
-	"github.com/farsightsec/golang-framestream"
-)
-
-type FrameStreamInput struct {
-	wait    chan bool
-	decoder *framestream.Decoder
-}
-
-func NewFrameStreamInput(r io.ReadWriter, bi bool) (input *FrameStreamInput, err error) {
-	input = new(FrameStreamInput)
-	decoderOptions := framestream.DecoderOptions{
-		ContentType:   FSContentType,
-		Bidirectional: bi,
-	}
-	input.decoder, err = framestream.NewDecoder(r, &decoderOptions)
-	if err != nil {
-		return
-	}
-	input.wait = make(chan bool)
-	return
-}
-
-func NewFrameStreamInputFromFilename(fname string) (input *FrameStreamInput, err error) {
-	file, err := os.Open(fname)
-	if err != nil {
-		return nil, err
-	}
-	input, err = NewFrameStreamInput(file, false)
-	return
-}
-
-func (input *FrameStreamInput) ReadInto(output chan []byte) {
-	for {
-		buf, err := input.decoder.Decode()
-		if err != nil {
-			if err != io.EOF {
-				log.Printf("framestream.Decoder.Decode() failed: %s\n", err)
-			}
-			break
-		}
-		newbuf := make([]byte, len(buf))
-		copy(newbuf, buf)
-		output <- newbuf
-	}
-	close(input.wait)
-}
-
-func (input *FrameStreamInput) Wait() {
-	<-input.wait
-}
diff --git a/vendor/github.com/dnstap/golang-dnstap/FrameStreamOutput.go b/vendor/github.com/dnstap/golang-dnstap/FrameStreamOutput.go
deleted file mode 100644
index d00bba892..000000000
--- a/vendor/github.com/dnstap/golang-dnstap/FrameStreamOutput.go
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2014 by Farsight Security, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dnstap
-
-import (
-	"io"
-	"log"
-	"os"
-
-	"github.com/farsightsec/golang-framestream"
-)
-
-type FrameStreamOutput struct {
-	outputChannel chan []byte
-	wait          chan bool
-	enc           *framestream.Encoder
-}
-
-func NewFrameStreamOutput(w io.Writer) (o *FrameStreamOutput, err error) {
-	o = new(FrameStreamOutput)
-	o.outputChannel = make(chan []byte, outputChannelSize)
-	o.enc, err = framestream.NewEncoder(w, &framestream.EncoderOptions{ContentType: FSContentType})
-	if err != nil {
-		return
-	}
-	o.wait = make(chan bool)
-	return
-}
-
-func NewFrameStreamOutputFromFilename(fname string) (o *FrameStreamOutput, err error) {
-	if fname == "" || fname == "-" {
-		return NewFrameStreamOutput(os.Stdout)
-	}
-	w, err := os.Create(fname)
-	if err != nil {
-		return
-	}
-	return NewFrameStreamOutput(w)
-}
-
-func (o *FrameStreamOutput) GetOutputChannel() chan []byte {
-	return o.outputChannel
-}
-
-func (o *FrameStreamOutput) RunOutputLoop() {
-	for frame := range o.outputChannel {
-		if _, err := o.enc.Write(frame); err != nil {
-			log.Fatalf("framestream.Encoder.Write() failed: %s\n", err)
-			break
-		}
-	}
-	close(o.wait)
-}
-
-func (o *FrameStreamOutput) Close() {
-	close(o.outputChannel)
-	<-o.wait
-	o.enc.Flush()
-	o.enc.Close()
-}
diff --git a/vendor/github.com/dnstap/golang-dnstap/FrameStreamSockInput.go b/vendor/github.com/dnstap/golang-dnstap/FrameStreamSockInput.go
deleted file mode 100644
index 443e46cdb..000000000
--- a/vendor/github.com/dnstap/golang-dnstap/FrameStreamSockInput.go
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2013-2014 by Farsight Security, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dnstap
-
-import (
-	"log"
-	"net"
-	"os"
-)
-
-type FrameStreamSockInput struct {
-	wait     chan bool
-	listener net.Listener
-}
-
-func NewFrameStreamSockInput(listener net.Listener) (input *FrameStreamSockInput) {
-	input = new(FrameStreamSockInput)
-	input.listener = listener
-	return
-}
-
-func NewFrameStreamSockInputFromPath(socketPath string) (input *FrameStreamSockInput, err error) {
-	os.Remove(socketPath)
-	listener, err := net.Listen("unix", socketPath)
-	if err != nil {
-		return
-	}
-	return NewFrameStreamSockInput(listener), nil
-}
-
-func (input *FrameStreamSockInput) ReadInto(output chan []byte) {
-	for {
-		conn, err := input.listener.Accept()
-		if err != nil {
-			log.Printf("net.Listener.Accept() failed: %s\n", err)
-			continue
-		}
-		i, err := NewFrameStreamInput(conn, true)
-		if err != nil {
-			log.Printf("dnstap.NewFrameStreamInput() failed: %s\n", err)
-			continue
-		}
-		log.Printf("dnstap.FrameStreamSockInput: accepted a socket connection\n")
-		go i.ReadInto(output)
-	}
-}
-
-func (input *FrameStreamSockInput) Wait() {
-	select {}
-}
diff --git a/vendor/github.com/dnstap/golang-dnstap/LICENSE b/vendor/github.com/dnstap/golang-dnstap/LICENSE
deleted file mode 100644
index d64569567..000000000
--- a/vendor/github.com/dnstap/golang-dnstap/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/vendor/github.com/dnstap/golang-dnstap/QuietTextFormat.go b/vendor/github.com/dnstap/golang-dnstap/QuietTextFormat.go
deleted file mode 100644
index 69e6fe8d7..000000000
--- a/vendor/github.com/dnstap/golang-dnstap/QuietTextFormat.go
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (c) 2013-2014 by Farsight Security, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dnstap
-
-import (
-	"bytes"
-	"fmt"
-	"net"
-	"strconv"
-	"time"
-
-	"github.com/miekg/dns"
-)
-
-const quietTimeFormat = "15:04:05"
-
-func textConvertTime(s *bytes.Buffer, secs *uint64, nsecs *uint32) {
-	if secs != nil {
-		s.WriteString(time.Unix(int64(*secs), 0).Format(quietTimeFormat))
-	} else {
-		s.WriteString("??:??:??")
-	}
-	if nsecs != nil {
-		s.WriteString(fmt.Sprintf(".%06d", *nsecs/1000))
-	} else {
-		s.WriteString(".??????")
-	}
-}
-
-func textConvertIP(s *bytes.Buffer, ip []byte) {
-	if ip != nil {
-		s.WriteString(net.IP(ip).String())
-	} else {
-		s.WriteString("MISSING_ADDRESS")
-	}
-}
-
-func textConvertMessage(m *Message, s *bytes.Buffer) {
-	isQuery := false
-	printQueryAddress := false
-
-	switch *m.Type {
-	case Message_CLIENT_QUERY,
-		Message_RESOLVER_QUERY,
-		Message_AUTH_QUERY,
-		Message_FORWARDER_QUERY,
-		Message_TOOL_QUERY:
-		isQuery = true
-	case Message_CLIENT_RESPONSE,
-		Message_RESOLVER_RESPONSE,
-		Message_AUTH_RESPONSE,
-		Message_FORWARDER_RESPONSE,
-		Message_TOOL_RESPONSE:
-		isQuery = false
-	default:
-		s.WriteString("[unhandled Message.Type]\n")
-		return
-	}
-
-	if isQuery {
-		textConvertTime(s, m.QueryTimeSec, m.QueryTimeNsec)
-	} else {
-		textConvertTime(s, m.ResponseTimeSec, m.ResponseTimeNsec)
-	}
-	s.WriteString(" ")
-
-	switch *m.Type {
-	case Message_CLIENT_QUERY,
-		Message_CLIENT_RESPONSE:
-		{
-			s.WriteString("C")
-		}
-	case Message_RESOLVER_QUERY,
-		Message_RESOLVER_RESPONSE:
-		{
-			s.WriteString("R")
-		}
-	case Message_AUTH_QUERY,
-		Message_AUTH_RESPONSE:
-		{
-			s.WriteString("A")
-		}
-	case Message_FORWARDER_QUERY,
-		Message_FORWARDER_RESPONSE:
-		{
-			s.WriteString("F")
-		}
-	case Message_STUB_QUERY,
-		Message_STUB_RESPONSE:
-		{
-			s.WriteString("S")
-		}
-	case Message_TOOL_QUERY,
-		Message_TOOL_RESPONSE:
-		{
-			s.WriteString("T")
-		}
-	}
-
-	if isQuery {
-		s.WriteString("Q ")
-	} else {
-		s.WriteString("R ")
-	}
-
-	switch *m.Type {
-	case Message_CLIENT_QUERY,
-		Message_CLIENT_RESPONSE,
-		Message_AUTH_QUERY,
-		Message_AUTH_RESPONSE:
-		printQueryAddress = true
-	}
-
-	if printQueryAddress {
-		textConvertIP(s, m.QueryAddress)
-	} else {
-		textConvertIP(s, m.ResponseAddress)
-	}
-	s.WriteString(" ")
-
-	if m.SocketProtocol != nil {
-		s.WriteString(m.SocketProtocol.String())
-	}
-	s.WriteString(" ")
-
-	var err error
-	msg := new(dns.Msg)
-	if isQuery {
-		s.WriteString(strconv.Itoa(len(m.QueryMessage)))
-		s.WriteString("b ")
-		err = msg.Unpack(m.QueryMessage)
-	} else {
-		s.WriteString(strconv.Itoa(len(m.ResponseMessage)))
-		s.WriteString("b ")
-		err = msg.Unpack(m.ResponseMessage)
-	}
-
-	if err != nil {
-		s.WriteString("X ")
-	} else {
-		s.WriteString("\"" + msg.Question[0].Name + "\" ")
-		s.WriteString(dns.Class(msg.Question[0].Qclass).String() + " ")
-		s.WriteString(dns.Type(msg.Question[0].Qtype).String())
-	}
-
-	s.WriteString("\n")
-}
-
-func TextFormat(dt *Dnstap) (out []byte, ok bool) {
-	var s bytes.Buffer
-
-	if *dt.Type == Dnstap_MESSAGE {
-		textConvertMessage(dt.Message, &s)
-		return s.Bytes(), true
-	}
-
-	return nil, false
-}
diff --git a/vendor/github.com/dnstap/golang-dnstap/TextOutput.go b/vendor/github.com/dnstap/golang-dnstap/TextOutput.go
deleted file mode 100644
index 5fa2c00e0..000000000
--- a/vendor/github.com/dnstap/golang-dnstap/TextOutput.go
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2014 by Farsight Security, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dnstap
-
-import (
-	"bufio"
-	"io"
-	"log"
-	"os"
-
-	"github.com/golang/protobuf/proto"
-)
-
-type TextFormatFunc func(*Dnstap) ([]byte, bool)
-
-type TextOutput struct {
-	format        TextFormatFunc
-	outputChannel chan []byte
-	wait          chan bool
-	writer        *bufio.Writer
-}
-
-func NewTextOutput(writer io.Writer, format TextFormatFunc) (o *TextOutput) {
-	o = new(TextOutput)
-	o.format = format
-	o.outputChannel = make(chan []byte, outputChannelSize)
-	o.writer = bufio.NewWriter(writer)
-	o.wait = make(chan bool)
-	return
-}
-
-func NewTextOutputFromFilename(fname string, format TextFormatFunc) (o *TextOutput, err error) {
-	if fname == "" || fname == "-" {
-		return NewTextOutput(os.Stdout, format), nil
-	}
-	writer, err := os.Create(fname)
-	if err != nil {
-		return
-	}
-	return NewTextOutput(writer, format), nil
-}
-
-func (o *TextOutput) GetOutputChannel() chan []byte {
-	return o.outputChannel
-}
-
-func (o *TextOutput) RunOutputLoop() {
-	dt := &Dnstap{}
-	for frame := range o.outputChannel {
-		if err := proto.Unmarshal(frame, dt); err != nil {
-			log.Fatalf("dnstap.TextOutput: proto.Unmarshal() failed: %s\n", err)
-			break
-		}
-		buf, ok := o.format(dt)
-		if !ok {
-			log.Fatalf("dnstap.TextOutput: text format function failed\n")
-			break
-		}
-		if _, err := o.writer.Write(buf); err != nil {
-			log.Fatalf("dnstap.TextOutput: write failed: %s\n", err)
-			break
-		}
-		o.writer.Flush()
-	}
-	close(o.wait)
-}
-
-func (o *TextOutput) Close() {
-	close(o.outputChannel)
-	<-o.wait
-	o.writer.Flush()
-}
diff --git a/vendor/github.com/dnstap/golang-dnstap/YamlFormat.go b/vendor/github.com/dnstap/golang-dnstap/YamlFormat.go
deleted file mode 100644
index c63a4a3a1..000000000
--- a/vendor/github.com/dnstap/golang-dnstap/YamlFormat.go
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2013-2014 by Farsight Security, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dnstap
-
-import (
-	"bytes"
-	"fmt"
-	"net"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/miekg/dns"
-)
-
-const yamlTimeFormat = "2006-01-02 15:04:05.999999999"
-
-func yamlConvertMessage(m *Message, s *bytes.Buffer) {
-	s.WriteString(fmt.Sprint("  type: ", m.Type, "\n"))
-
-	if m.QueryTimeSec != nil && m.QueryTimeNsec != nil {
-		t := time.Unix(int64(*m.QueryTimeSec), int64(*m.QueryTimeNsec)).UTC()
-		s.WriteString(fmt.Sprint("  query_time: !!timestamp ", t.Format(yamlTimeFormat), "\n"))
-	}
-
-	if m.ResponseTimeSec != nil && m.ResponseTimeNsec != nil {
-		t := time.Unix(int64(*m.ResponseTimeSec), int64(*m.ResponseTimeNsec)).UTC()
-		s.WriteString(fmt.Sprint("  response_time: !!timestamp ", t.Format(yamlTimeFormat), "\n"))
-	}
-
-	if m.SocketFamily != nil {
-		s.WriteString(fmt.Sprint("  socket_family: ", m.SocketFamily, "\n"))
-	}
-
-	if m.SocketProtocol != nil {
-		s.WriteString(fmt.Sprint("  socket_protocol: ", m.SocketProtocol, "\n"))
-	}
-
-	if m.QueryAddress != nil {
-		s.WriteString(fmt.Sprint("  query_address: ", net.IP(m.QueryAddress), "\n"))
-	}
-
-	if m.ResponseAddress != nil {
-		s.WriteString(fmt.Sprint("  response_address: ", net.IP(m.ResponseAddress), "\n"))
-	}
-
-	if m.QueryPort != nil {
-		s.WriteString(fmt.Sprint("  query_port: ", *m.QueryPort, "\n"))
-	}
-
-	if m.ResponsePort != nil {
-		s.WriteString(fmt.Sprint("  response_port: ", *m.ResponsePort, "\n"))
-	}
-
-	if m.QueryZone != nil {
-		name, _, err := dns.UnpackDomainName(m.QueryZone, 0)
-		if err != nil {
-			s.WriteString("  # query_zone: parse failed\n")
-		} else {
-			s.WriteString(fmt.Sprint("  query_zone: ", strconv.Quote(name), "\n"))
-		}
-	}
-
-	if m.QueryMessage != nil {
-		msg := new(dns.Msg)
-		err := msg.Unpack(m.QueryMessage)
-		if err != nil {
-			s.WriteString("  # query_message: parse failed\n")
-		} else {
-			s.WriteString("  query_message: |\n")
-			s.WriteString("    " + strings.Replace(strings.TrimSpace(msg.String()), "\n", "\n    ", -1) + "\n")
-		}
-	}
-	if m.ResponseMessage != nil {
-		msg := new(dns.Msg)
-		err := msg.Unpack(m.ResponseMessage)
-		if err != nil {
-			s.WriteString(fmt.Sprint("  # response_message: parse failed: ", err, "\n"))
-		} else {
-			s.WriteString("  response_message: |\n")
-			s.WriteString("    " + strings.Replace(strings.TrimSpace(msg.String()), "\n", "\n    ", -1) + "\n")
-		}
-	}
-	s.WriteString("---\n")
-}
-
-func YamlFormat(dt *Dnstap) (out []byte, ok bool) {
-	var s bytes.Buffer
-
-	s.WriteString(fmt.Sprint("type: ", dt.Type, "\n"))
-	if dt.Identity != nil {
-		s.WriteString(fmt.Sprint("identity: ", strconv.Quote(string(dt.Identity)), "\n"))
-	}
-	if dt.Version != nil {
-		s.WriteString(fmt.Sprint("version: ", strconv.Quote(string(dt.Version)), "\n"))
-	}
-	if *dt.Type == Dnstap_MESSAGE {
-		s.WriteString("message:\n")
-		yamlConvertMessage(dt.Message, &s)
-	}
-	return s.Bytes(), true
-}
diff --git a/vendor/github.com/dnstap/golang-dnstap/dnstap.go b/vendor/github.com/dnstap/golang-dnstap/dnstap.go
deleted file mode 100644
index d4f786ae7..000000000
--- a/vendor/github.com/dnstap/golang-dnstap/dnstap.go
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2014 by Farsight Security, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package dnstap
-
-const outputChannelSize = 32
-
-var FSContentType = []byte("protobuf:dnstap.Dnstap")
-
-type Input interface {
-	ReadInto(chan []byte)
-	Wait()
-}
-
-type Output interface {
-	GetOutputChannel() chan []byte
-	RunOutputLoop()
-	Close()
-}
diff --git a/vendor/github.com/dnstap/golang-dnstap/dnstap.pb.go b/vendor/github.com/dnstap/golang-dnstap/dnstap.pb.go
deleted file mode 100644
index 43b5fd10a..000000000
--- a/vendor/github.com/dnstap/golang-dnstap/dnstap.pb.go
+++ /dev/null
@@ -1,448 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: dnstap.proto
-// DO NOT EDIT!
-
-/*
-Package dnstap is a generated protocol buffer package.
-
-It is generated from these files:
-	dnstap.proto
-
-It has these top-level messages:
-	Dnstap
-	Message
-*/
-package dnstap
-
-import proto "github.com/golang/protobuf/proto"
-import json "encoding/json"
-import math "math"
-
-// Reference proto, json, and math imports to suppress error if they are not otherwise used.
-var _ = proto.Marshal
-var _ = &json.SyntaxError{}
-var _ = math.Inf
-
-// SocketFamily: the network protocol family of a socket. This specifies how
-// to interpret "network address" fields.
-type SocketFamily int32
-
-const (
-	SocketFamily_INET  SocketFamily = 1
-	SocketFamily_INET6 SocketFamily = 2
-)
-
-var SocketFamily_name = map[int32]string{
-	1: "INET",
-	2: "INET6",
-}
-var SocketFamily_value = map[string]int32{
-	"INET":  1,
-	"INET6": 2,
-}
-
-func (x SocketFamily) Enum() *SocketFamily {
-	p := new(SocketFamily)
-	*p = x
-	return p
-}
-func (x SocketFamily) String() string {
-	return proto.EnumName(SocketFamily_name, int32(x))
-}
-func (x *SocketFamily) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(SocketFamily_value, data, "SocketFamily")
-	if err != nil {
-		return err
-	}
-	*x = SocketFamily(value)
-	return nil
-}
-
-// SocketProtocol: the transport protocol of a socket. This specifies how to
-// interpret "transport port" fields.
-type SocketProtocol int32
-
-const (
-	SocketProtocol_UDP SocketProtocol = 1
-	SocketProtocol_TCP SocketProtocol = 2
-)
-
-var SocketProtocol_name = map[int32]string{
-	1: "UDP",
-	2: "TCP",
-}
-var SocketProtocol_value = map[string]int32{
-	"UDP": 1,
-	"TCP": 2,
-}
-
-func (x SocketProtocol) Enum() *SocketProtocol {
-	p := new(SocketProtocol)
-	*p = x
-	return p
-}
-func (x SocketProtocol) String() string {
-	return proto.EnumName(SocketProtocol_name, int32(x))
-}
-func (x *SocketProtocol) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(SocketProtocol_value, data, "SocketProtocol")
-	if err != nil {
-		return err
-	}
-	*x = SocketProtocol(value)
-	return nil
-}
-
-// Identifies which field below is filled in.
-type Dnstap_Type int32
-
-const (
-	Dnstap_MESSAGE Dnstap_Type = 1
-)
-
-var Dnstap_Type_name = map[int32]string{
-	1: "MESSAGE",
-}
-var Dnstap_Type_value = map[string]int32{
-	"MESSAGE": 1,
-}
-
-func (x Dnstap_Type) Enum() *Dnstap_Type {
-	p := new(Dnstap_Type)
-	*p = x
-	return p
-}
-func (x Dnstap_Type) String() string {
-	return proto.EnumName(Dnstap_Type_name, int32(x))
-}
-func (x *Dnstap_Type) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Dnstap_Type_value, data, "Dnstap_Type")
-	if err != nil {
-		return err
-	}
-	*x = Dnstap_Type(value)
-	return nil
-}
-
-type Message_Type int32
-
-const (
-	// AUTH_QUERY is a DNS query message received from a resolver by an
-	// authoritative name server, from the perspective of the authorative
-	// name server.
-	Message_AUTH_QUERY Message_Type = 1
-	// AUTH_RESPONSE is a DNS response message sent from an authoritative
-	// name server to a resolver, from the perspective of the authoritative
-	// name server.
-	Message_AUTH_RESPONSE Message_Type = 2
-	// RESOLVER_QUERY is a DNS query message sent from a resolver to an
-	// authoritative name server, from the perspective of the resolver.
-	// Resolvers typically clear the RD (recursion desired) bit when
-	// sending queries.
-	Message_RESOLVER_QUERY Message_Type = 3
-	// RESOLVER_RESPONSE is a DNS response message received from an
-	// authoritative name server by a resolver, from the perspective of
-	// the resolver.
-	Message_RESOLVER_RESPONSE Message_Type = 4
-	// CLIENT_QUERY is a DNS query message sent from a client to a DNS
-	// server which is expected to perform further recursion, from the
-	// perspective of the DNS server. The client may be a stub resolver or
-	// forwarder or some other type of software which typically sets the RD
-	// (recursion desired) bit when querying the DNS server. The DNS server
-	// may be a simple forwarding proxy or it may be a full recursive
-	// resolver.
-	Message_CLIENT_QUERY Message_Type = 5
-	// CLIENT_RESPONSE is a DNS response message sent from a DNS server to
-	// a client, from the perspective of the DNS server. The DNS server
-	// typically sets the RA (recursion available) bit when responding.
-	Message_CLIENT_RESPONSE Message_Type = 6
-	// FORWARDER_QUERY is a DNS query message sent from a downstream DNS
-	// server to an upstream DNS server which is expected to perform
-	// further recursion, from the perspective of the downstream DNS
-	// server.
-	Message_FORWARDER_QUERY Message_Type = 7
-	// FORWARDER_RESPONSE is a DNS response message sent from an upstream
-	// DNS server performing recursion to a downstream DNS server, from the
-	// perspective of the downstream DNS server.
-	Message_FORWARDER_RESPONSE Message_Type = 8
-	// STUB_QUERY is a DNS query message sent from a stub resolver to a DNS
-	// server, from the perspective of the stub resolver.
-	Message_STUB_QUERY Message_Type = 9
-	// STUB_RESPONSE is a DNS response message sent from a DNS server to a
-	// stub resolver, from the perspective of the stub resolver.
-	Message_STUB_RESPONSE Message_Type = 10
-	// TOOL_QUERY is a DNS query message sent from a DNS software tool to a
-	// DNS server, from the perspective of the tool.
-	Message_TOOL_QUERY Message_Type = 11
-	// TOOL_RESPONSE is a DNS response message received by a DNS software
-	// tool from a DNS server, from the perspective of the tool.
-	Message_TOOL_RESPONSE Message_Type = 12
-)
-
-var Message_Type_name = map[int32]string{
-	1:  "AUTH_QUERY",
-	2:  "AUTH_RESPONSE",
-	3:  "RESOLVER_QUERY",
-	4:  "RESOLVER_RESPONSE",
-	5:  "CLIENT_QUERY",
-	6:  "CLIENT_RESPONSE",
-	7:  "FORWARDER_QUERY",
-	8:  "FORWARDER_RESPONSE",
-	9:  "STUB_QUERY",
-	10: "STUB_RESPONSE",
-	11: "TOOL_QUERY",
-	12: "TOOL_RESPONSE",
-}
-var Message_Type_value = map[string]int32{
-	"AUTH_QUERY":         1,
-	"AUTH_RESPONSE":      2,
-	"RESOLVER_QUERY":     3,
-	"RESOLVER_RESPONSE":  4,
-	"CLIENT_QUERY":       5,
-	"CLIENT_RESPONSE":    6,
-	"FORWARDER_QUERY":    7,
-	"FORWARDER_RESPONSE": 8,
-	"STUB_QUERY":         9,
-	"STUB_RESPONSE":      10,
-	"TOOL_QUERY":         11,
-	"TOOL_RESPONSE":      12,
-}
-
-func (x Message_Type) Enum() *Message_Type {
-	p := new(Message_Type)
-	*p = x
-	return p
-}
-func (x Message_Type) String() string {
-	return proto.EnumName(Message_Type_name, int32(x))
-}
-func (x *Message_Type) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Message_Type_value, data, "Message_Type")
-	if err != nil {
-		return err
-	}
-	*x = Message_Type(value)
-	return nil
-}
-
-// "Dnstap": this is the top-level dnstap type, which is a "union" type that
-// contains other kinds of dnstap payloads, although currently only one type
-// of dnstap payload is defined.
-// See: https://developers.google.com/protocol-buffers/docs/techniques#union
-type Dnstap struct {
-	// DNS server identity.
-	// If enabled, this is the identity string of the DNS server which generated
-	// this message. Typically this would be the same string as returned by an
-	// "NSID" (RFC 5001) query.
-	Identity []byte `protobuf:"bytes,1,opt,name=identity" json:"identity,omitempty"`
-	// DNS server version.
-	// If enabled, this is the version string of the DNS server which generated
-	// this message. Typically this would be the same string as returned by a
-	// "version.bind" query.
-	Version []byte `protobuf:"bytes,2,opt,name=version" json:"version,omitempty"`
-	// Extra data for this payload.
-	// This field can be used for adding an arbitrary byte-string annotation to
-	// the payload. No encoding or interpretation is applied or enforced.
-	Extra []byte       `protobuf:"bytes,3,opt,name=extra" json:"extra,omitempty"`
-	Type  *Dnstap_Type `protobuf:"varint,15,req,name=type,enum=dnstap.Dnstap_Type" json:"type,omitempty"`
-	// One of the following will be filled in.
-	Message          *Message `protobuf:"bytes,14,opt,name=message" json:"message,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Dnstap) Reset()         { *m = Dnstap{} }
-func (m *Dnstap) String() string { return proto.CompactTextString(m) }
-func (*Dnstap) ProtoMessage()    {}
-
-func (m *Dnstap) GetIdentity() []byte {
-	if m != nil {
-		return m.Identity
-	}
-	return nil
-}
-
-func (m *Dnstap) GetVersion() []byte {
-	if m != nil {
-		return m.Version
-	}
-	return nil
-}
-
-func (m *Dnstap) GetExtra() []byte {
-	if m != nil {
-		return m.Extra
-	}
-	return nil
-}
-
-func (m *Dnstap) GetType() Dnstap_Type {
-	if m != nil && m.Type != nil {
-		return *m.Type
-	}
-	return Dnstap_MESSAGE
-}
-
-func (m *Dnstap) GetMessage() *Message {
-	if m != nil {
-		return m.Message
-	}
-	return nil
-}
-
-// Message: a wire-format (RFC 1035 section 4) DNS message and associated
-// metadata. Applications generating "Message" payloads should follow
-// certain requirements based on the MessageType, see below.
-type Message struct {
-	// One of the Type values described above.
-	Type *Message_Type `protobuf:"varint,1,req,name=type,enum=dnstap.Message_Type" json:"type,omitempty"`
-	// One of the SocketFamily values described above.
-	SocketFamily *SocketFamily `protobuf:"varint,2,opt,name=socket_family,enum=dnstap.SocketFamily" json:"socket_family,omitempty"`
-	// One of the SocketProtocol values described above.
-	SocketProtocol *SocketProtocol `protobuf:"varint,3,opt,name=socket_protocol,enum=dnstap.SocketProtocol" json:"socket_protocol,omitempty"`
-	// The network address of the message initiator.
-	// For SocketFamily INET, this field is 4 octets (IPv4 address).
-	// For SocketFamily INET6, this field is 16 octets (IPv6 address).
-	QueryAddress []byte `protobuf:"bytes,4,opt,name=query_address" json:"query_address,omitempty"`
-	// The network address of the message responder.
-	// For SocketFamily INET, this field is 4 octets (IPv4 address).
-	// For SocketFamily INET6, this field is 16 octets (IPv6 address).
-	ResponseAddress []byte `protobuf:"bytes,5,opt,name=response_address" json:"response_address,omitempty"`
-	// The transport port of the message initiator.
-	// This is a 16-bit UDP or TCP port number, depending on SocketProtocol.
-	QueryPort *uint32 `protobuf:"varint,6,opt,name=query_port" json:"query_port,omitempty"`
-	// The transport port of the message responder.
-	// This is a 16-bit UDP or TCP port number, depending on SocketProtocol.
-	ResponsePort *uint32 `protobuf:"varint,7,opt,name=response_port" json:"response_port,omitempty"`
-	// The time at which the DNS query message was sent or received, depending
-	// on whether this is an AUTH_QUERY, RESOLVER_QUERY, or CLIENT_QUERY.
-	// This is the number of seconds since the UNIX epoch.
-	QueryTimeSec *uint64 `protobuf:"varint,8,opt,name=query_time_sec" json:"query_time_sec,omitempty"`
-	// The time at which the DNS query message was sent or received.
-	// This is the seconds fraction, expressed as a count of nanoseconds.
-	QueryTimeNsec *uint32 `protobuf:"fixed32,9,opt,name=query_time_nsec" json:"query_time_nsec,omitempty"`
-	// The initiator's original wire-format DNS query message, verbatim.
-	QueryMessage []byte `protobuf:"bytes,10,opt,name=query_message" json:"query_message,omitempty"`
-	// The "zone" or "bailiwick" pertaining to the DNS query message.
-	// This is a wire-format DNS domain name.
-	QueryZone []byte `protobuf:"bytes,11,opt,name=query_zone" json:"query_zone,omitempty"`
-	// The time at which the DNS response message was sent or received,
-	// depending on whether this is an AUTH_RESPONSE, RESOLVER_RESPONSE, or
-	// CLIENT_RESPONSE.
-	// This is the number of seconds since the UNIX epoch.
-	ResponseTimeSec *uint64 `protobuf:"varint,12,opt,name=response_time_sec" json:"response_time_sec,omitempty"`
-	// The time at which the DNS response message was sent or received.
-	// This is the seconds fraction, expressed as a count of nanoseconds.
-	ResponseTimeNsec *uint32 `protobuf:"fixed32,13,opt,name=response_time_nsec" json:"response_time_nsec,omitempty"`
-	// The responder's original wire-format DNS response message, verbatim.
-	ResponseMessage  []byte `protobuf:"bytes,14,opt,name=response_message" json:"response_message,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *Message) Reset()         { *m = Message{} }
-func (m *Message) String() string { return proto.CompactTextString(m) }
-func (*Message) ProtoMessage()    {}
-
-func (m *Message) GetType() Message_Type {
-	if m != nil && m.Type != nil {
-		return *m.Type
-	}
-	return Message_AUTH_QUERY
-}
-
-func (m *Message) GetSocketFamily() SocketFamily {
-	if m != nil && m.SocketFamily != nil {
-		return *m.SocketFamily
-	}
-	return SocketFamily_INET
-}
-
-func (m *Message) GetSocketProtocol() SocketProtocol {
-	if m != nil && m.SocketProtocol != nil {
-		return *m.SocketProtocol
-	}
-	return SocketProtocol_UDP
-}
-
-func (m *Message) GetQueryAddress() []byte {
-	if m != nil {
-		return m.QueryAddress
-	}
-	return nil
-}
-
-func (m *Message) GetResponseAddress() []byte {
-	if m != nil {
-		return m.ResponseAddress
-	}
-	return nil
-}
-
-func (m *Message) GetQueryPort() uint32 {
-	if m != nil && m.QueryPort != nil {
-		return *m.QueryPort
-	}
-	return 0
-}
-
-func (m *Message) GetResponsePort() uint32 {
-	if m != nil && m.ResponsePort != nil {
-		return *m.ResponsePort
-	}
-	return 0
-}
-
-func (m *Message) GetQueryTimeSec() uint64 {
-	if m != nil && m.QueryTimeSec != nil {
-		return *m.QueryTimeSec
-	}
-	return 0
-}
-
-func (m *Message) GetQueryTimeNsec() uint32 {
-	if m != nil && m.QueryTimeNsec != nil {
-		return *m.QueryTimeNsec
-	}
-	return 0
-}
-
-func (m *Message) GetQueryMessage() []byte {
-	if m != nil {
-		return m.QueryMessage
-	}
-	return nil
-}
-
-func (m *Message) GetQueryZone() []byte {
-	if m != nil {
-		return m.QueryZone
-	}
-	return nil
-}
-
-func (m *Message) GetResponseTimeSec() uint64 {
-	if m != nil && m.ResponseTimeSec != nil {
-		return *m.ResponseTimeSec
-	}
-	return 0
-}
-
-func (m *Message) GetResponseTimeNsec() uint32 {
-	if m != nil && m.ResponseTimeNsec != nil {
-		return *m.ResponseTimeNsec
-	}
-	return 0
-}
-
-func (m *Message) GetResponseMessage() []byte {
-	if m != nil {
-		return m.ResponseMessage
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterEnum("dnstap.SocketFamily", SocketFamily_name, SocketFamily_value)
-	proto.RegisterEnum("dnstap.SocketProtocol", SocketProtocol_name, SocketProtocol_value)
-	proto.RegisterEnum("dnstap.Dnstap_Type", Dnstap_Type_name, Dnstap_Type_value)
-	proto.RegisterEnum("dnstap.Message_Type", Message_Type_name, Message_Type_value)
-}
diff --git a/vendor/github.com/dnstap/golang-dnstap/dnstap.pb/LICENSE b/vendor/github.com/dnstap/golang-dnstap/dnstap.pb/LICENSE
deleted file mode 100644
index 0e259d42c..000000000
--- a/vendor/github.com/dnstap/golang-dnstap/dnstap.pb/LICENSE
+++ /dev/null
@@ -1,121 +0,0 @@
-Creative Commons Legal Code
-
-CC0 1.0 Universal
-
-    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
-    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
-    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
-    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
-    HEREUNDER.
-
-Statement of Purpose
-
-The laws of most jurisdictions throughout the world automatically confer
-exclusive Copyright and Related Rights (defined below) upon the creator
-and subsequent owner(s) (each and all, an "owner") of an original work of
-authorship and/or a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for
-the purpose of contributing to a commons of creative, cultural and
-scientific works ("Commons") that the public can reliably and without fear
-of later claims of infringement build upon, modify, incorporate in other
-works, reuse and redistribute as freely as possible in any form whatsoever
-and for any purposes, including without limitation commercial purposes.
-These owners may contribute to the Commons to promote the ideal of a free
-culture and the further production of creative, cultural and scientific
-works, or to gain reputation or greater distribution for their Work in
-part through the use and efforts of others.
-
-For these and/or other purposes and motivations, and without any
-expectation of additional consideration or compensation, the person
-associating CC0 with a Work (the "Affirmer"), to the extent that he or she
-is an owner of Copyright and Related Rights in the Work, voluntarily
-elects to apply CC0 to the Work and publicly distribute the Work under its
-terms, with knowledge of his or her Copyright and Related Rights in the
-Work and the meaning and intended legal effect of CC0 on those rights.
-
-1. Copyright and Related Rights. A Work made available under CC0 may be
-protected by copyright and related or neighboring rights ("Copyright and
-Related Rights"). Copyright and Related Rights include, but are not
-limited to, the following:
-
-  i. the right to reproduce, adapt, distribute, perform, display,
-     communicate, and translate a Work;
- ii. moral rights retained by the original author(s) and/or performer(s);
-iii. publicity and privacy rights pertaining to a person's image or
-     likeness depicted in a Work;
- iv. rights protecting against unfair competition in regards to a Work,
-     subject to the limitations in paragraph 4(a), below;
-  v. rights protecting the extraction, dissemination, use and reuse of data
-     in a Work;
- vi. database rights (such as those arising under Directive 96/9/EC of the
-     European Parliament and of the Council of 11 March 1996 on the legal
-     protection of databases, and under any national implementation
-     thereof, including any amended or successor version of such
-     directive); and
-vii. other similar, equivalent or corresponding rights throughout the
-     world based on applicable law or treaty, and any national
-     implementations thereof.
-
-2. Waiver. To the greatest extent permitted by, but not in contravention
-of, applicable law, Affirmer hereby overtly, fully, permanently,
-irrevocably and unconditionally waives, abandons, and surrenders all of
-Affirmer's Copyright and Related Rights and associated claims and causes
-of action, whether now known or unknown (including existing as well as
-future claims and causes of action), in the Work (i) in all territories
-worldwide, (ii) for the maximum duration provided by applicable law or
-treaty (including future time extensions), (iii) in any current or future
-medium and for any number of copies, and (iv) for any purpose whatsoever,
-including without limitation commercial, advertising or promotional
-purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
-member of the public at large and to the detriment of Affirmer's heirs and
-successors, fully intending that such Waiver shall not be subject to
-revocation, rescission, cancellation, termination, or any other legal or
-equitable action to disrupt the quiet enjoyment of the Work by the public
-as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback. Should any part of the Waiver for any reason
-be judged legally invalid or ineffective under applicable law, then the
-Waiver shall be preserved to the maximum extent permitted taking into
-account Affirmer's express Statement of Purpose. In addition, to the
-extent the Waiver is so judged Affirmer hereby grants to each affected
-person a royalty-free, non transferable, non sublicensable, non exclusive,
-irrevocable and unconditional license to exercise Affirmer's Copyright and
-Related Rights in the Work (i) in all territories worldwide, (ii) for the
-maximum duration provided by applicable law or treaty (including future
-time extensions), (iii) in any current or future medium and for any number
-of copies, and (iv) for any purpose whatsoever, including without
-limitation commercial, advertising or promotional purposes (the
-"License"). The License shall be deemed effective as of the date CC0 was
-applied by Affirmer to the Work. Should any part of the License for any
-reason be judged legally invalid or ineffective under applicable law, such
-partial invalidity or ineffectiveness shall not invalidate the remainder
-of the License, and in such case Affirmer hereby affirms that he or she
-will not (i) exercise any of his or her remaining Copyright and Related
-Rights in the Work or (ii) assert any associated claims and causes of
-action with respect to the Work, in either case contrary to Affirmer's
-express Statement of Purpose.
-
-4. Limitations and Disclaimers.
-
- a. No trademark or patent rights held by Affirmer are waived, abandoned,
-    surrendered, licensed or otherwise affected by this document.
- b. Affirmer offers the Work as-is and makes no representations or
-    warranties of any kind concerning the Work, express, implied,
-    statutory or otherwise, including without limitation warranties of
-    title, merchantability, fitness for a particular purpose, non
-    infringement, or the absence of latent or other defects, accuracy, or
-    the present or absence of errors, whether or not discoverable, all to
-    the greatest extent permissible under applicable law.
- c. Affirmer disclaims responsibility for clearing rights of other persons
-    that may apply to the Work or any use thereof, including without
-    limitation any person's Copyright and Related Rights in the Work.
-    Further, Affirmer disclaims responsibility for obtaining any necessary
-    consents, permissions or other rights required for any use of the
-    Work.
- d. Affirmer understands and acknowledges that Creative Commons is not a
-    party to this document and has no duty or obligation with respect to
-    this CC0 or use of the Work.