VOL-3978 - update to go 1.16.3
- lint required re-format of "generaged" files
- tidied up go.mod
Change-Id: I8fbab94b679061a5e9ba05f95a33b2bb4ca9edc4
diff --git a/vendor/github.com/google/gopacket/layers/gen.go b/vendor/github.com/google/gopacket/layers/gen.go
deleted file mode 100644
index ab7a0c0..0000000
--- a/vendor/github.com/google/gopacket/layers/gen.go
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2012 Google, Inc. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license
-// that can be found in the LICENSE file in the root of the source
-// tree.
-
-// +build ignore
-
-// This binary pulls known ports from IANA, and uses them to populate
-// iana_ports.go's TCPPortNames and UDPPortNames maps.
-//
-// go run gen.go | gofmt > iana_ports.go
-package main
-
-import (
- "bytes"
- "encoding/xml"
- "flag"
- "fmt"
- "io/ioutil"
- "net/http"
- "os"
- "strconv"
- "time"
-)
-
-const fmtString = `// Copyright 2012 Google, Inc. All rights reserved.
-
-package layers
-
-// Created by gen.go, don't edit manually
-// Generated at %s
-// Fetched from %q
-
-// TCPPortNames contains the port names for all TCP ports.
-var TCPPortNames = tcpPortNames
-
-// UDPPortNames contains the port names for all UDP ports.
-var UDPPortNames = udpPortNames
-
-// SCTPPortNames contains the port names for all SCTP ports.
-var SCTPPortNames = sctpPortNames
-
-var tcpPortNames = map[TCPPort]string{
-%s}
-var udpPortNames = map[UDPPort]string{
-%s}
-var sctpPortNames = map[SCTPPort]string{
-%s}
-`
-
-var url = flag.String("url", "http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xml", "URL to grab port numbers from")
-
-func main() {
- fmt.Fprintf(os.Stderr, "Fetching ports from %q\n", *url)
- resp, err := http.Get(*url)
- if err != nil {
- panic(err)
- }
- defer resp.Body.Close()
- body, err := ioutil.ReadAll(resp.Body)
- if err != nil {
- panic(err)
- }
- fmt.Fprintln(os.Stderr, "Parsing XML")
- var registry struct {
- Records []struct {
- Protocol string `xml:"protocol"`
- Number string `xml:"number"`
- Name string `xml:"name"`
- } `xml:"record"`
- }
- xml.Unmarshal(body, ®istry)
- var tcpPorts bytes.Buffer
- var udpPorts bytes.Buffer
- var sctpPorts bytes.Buffer
- done := map[string]map[int]bool{
- "tcp": map[int]bool{},
- "udp": map[int]bool{},
- "sctp": map[int]bool{},
- }
- for _, r := range registry.Records {
- port, err := strconv.Atoi(r.Number)
- if err != nil {
- continue
- }
- if r.Name == "" {
- continue
- }
- var b *bytes.Buffer
- switch r.Protocol {
- case "tcp":
- b = &tcpPorts
- case "udp":
- b = &udpPorts
- case "sctp":
- b = &sctpPorts
- default:
- continue
- }
- if done[r.Protocol][port] {
- continue
- }
- done[r.Protocol][port] = true
- fmt.Fprintf(b, "\t%d: %q,\n", port, r.Name)
- }
- fmt.Fprintln(os.Stderr, "Writing results to stdout")
- fmt.Printf(fmtString, time.Now(), *url, tcpPorts.String(), udpPorts.String(), sctpPorts.String())
-}
diff --git a/vendor/github.com/google/gopacket/layers/gen2.go b/vendor/github.com/google/gopacket/layers/gen2.go
deleted file mode 100644
index 150cad7..0000000
--- a/vendor/github.com/google/gopacket/layers/gen2.go
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 2012 Google, Inc. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license
-// that can be found in the LICENSE file in the root of the source
-// tree.
-
-// +build ignore
-
-// This binary handles creating string constants and function templates for enums.
-//
-// go run gen.go | gofmt > enums_generated.go
-package main
-
-import (
- "fmt"
- "log"
- "os"
- "text/template"
- "time"
-)
-
-const fmtString = `// Copyright 2012 Google, Inc. All rights reserved.
-
-package layers
-
-// Created by gen2.go, don't edit manually
-// Generated at %s
-
-import (
- "fmt"
-
- "github.com/google/gopacket"
-)
-
-`
-
-var funcsTmpl = template.Must(template.New("foo").Parse(`
-// Decoder calls {{.Name}}Metadata.DecodeWith's decoder.
-func (a {{.Name}}) Decode(data []byte, p gopacket.PacketBuilder) error {
- return {{.Name}}Metadata[a].DecodeWith.Decode(data, p)
-}
-// String returns {{.Name}}Metadata.Name.
-func (a {{.Name}}) String() string {
- return {{.Name}}Metadata[a].Name
-}
-// LayerType returns {{.Name}}Metadata.LayerType.
-func (a {{.Name}}) LayerType() gopacket.LayerType {
- return {{.Name}}Metadata[a].LayerType
-}
-
-type errorDecoderFor{{.Name}} int
-func (a *errorDecoderFor{{.Name}}) Decode(data []byte, p gopacket.PacketBuilder) error {
- return a
-}
-func (a *errorDecoderFor{{.Name}}) Error() string {
- return fmt.Sprintf("Unable to decode {{.Name}} %d", int(*a))
-}
-
-var errorDecodersFor{{.Name}} [{{.Num}}]errorDecoderFor{{.Name}}
-var {{.Name}}Metadata [{{.Num}}]EnumMetadata
-
-func initUnknownTypesFor{{.Name}}() {
- for i := 0; i < {{.Num}}; i++ {
- errorDecodersFor{{.Name}}[i] = errorDecoderFor{{.Name}}(i)
- {{.Name}}Metadata[i] = EnumMetadata{
- DecodeWith: &errorDecodersFor{{.Name}}[i],
- Name: "Unknown{{.Name}}",
- }
- }
-}
-`))
-
-func main() {
- fmt.Fprintf(os.Stderr, "Writing results to stdout\n")
- fmt.Printf(fmtString, time.Now())
- types := []struct {
- Name string
- Num int
- }{
- {"LinkType", 256},
- {"EthernetType", 65536},
- {"PPPType", 65536},
- {"IPProtocol", 256},
- {"SCTPChunkType", 256},
- {"PPPoECode", 256},
- {"FDDIFrameControl", 256},
- {"EAPOLType", 256},
- {"ProtocolFamily", 256},
- {"Dot11Type", 256},
- {"USBTransportType", 256},
- }
-
- fmt.Println("func init() {")
- for _, t := range types {
- fmt.Printf("initUnknownTypesFor%s()\n", t.Name)
- }
- fmt.Println("initActualTypeData()")
- fmt.Println("}")
- for _, t := range types {
- if err := funcsTmpl.Execute(os.Stdout, t); err != nil {
- log.Fatalf("Failed to execute template %s: %v", t.Name, err)
- }
- }
-}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 41de634..b7a3c8d 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1,16 +1,26 @@
# github.com/aead/cmac v0.0.0-20160719120800-7af84192f0b1
-github.com/aead/cmac/aes
+## explicit
github.com/aead/cmac
+github.com/aead/cmac/aes
# github.com/davecgh/go-spew v1.1.1
+## explicit
github.com/davecgh/go-spew/spew
# github.com/deckarep/golang-set v1.7.1
+## explicit
github.com/deckarep/golang-set
# github.com/google/gopacket v1.1.17
+## explicit
github.com/google/gopacket
github.com/google/gopacket/layers
+# github.com/kr/pretty v0.2.1
+## explicit
# github.com/pmezard/go-difflib v1.0.0
github.com/pmezard/go-difflib/difflib
# github.com/stretchr/testify v1.5.1
+## explicit
github.com/stretchr/testify/assert
+# gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15
+## explicit
# gopkg.in/yaml.v2 v2.2.8
+## explicit
gopkg.in/yaml.v2