Update netlink vendoring (#1471)

* github.com/ema/qdisc
* github.com/mdlayher/genetlink
* github.com/mdlayher/wifi

Signed-off-by: Ben Kochie <superq@gmail.com>

vendor/github.com/mdlayher/genetlink/.travis.yml

@@ -1,16 +0,0 @@
-language: go
-go:
-  - 1.x
-os:
-  - linux
-sudo: required
-before_install:
-  - go get golang.org/x/lint/golint
-  - go get honnef.co/go/tools/cmd/staticcheck
-  - go get -d ./...
-script:
-  - go build -tags=gofuzz ./...
-  - go vet ./...
-  - staticcheck ./...
-  - golint -set_exit_status ./...
-  - go test -v -race -tags=integration ./...

vendor/github.com/mdlayher/genetlink/README.md

@@ -1,8 +1,12 @@
-genetlink [![Build Status](https://travis-ci.org/mdlayher/genetlink.svg?branch=master)](https://travis-ci.org/mdlayher/genetlink) [![GoDoc](https://godoc.org/github.com/mdlayher/genetlink?status.svg)](https://godoc.org/github.com/mdlayher/genetlink) [![Go Report Card](https://goreportcard.com/badge/github.com/mdlayher/genetlink)](https://goreportcard.com/report/github.com/mdlayher/genetlink)
+genetlink [![builds.sr.ht status](https://builds.sr.ht/~mdlayher/genetlink.svg)](https://builds.sr.ht/~mdlayher/genetlink?) [![GoDoc](https://godoc.org/github.com/mdlayher/genetlink?status.svg)](https://godoc.org/github.com/mdlayher/genetlink) [![Go Report Card](https://goreportcard.com/badge/github.com/mdlayher/genetlink)](https://goreportcard.com/report/github.com/mdlayher/genetlink)
 =========
 
 Package `genetlink` implements generic netlink interactions and data types.
 MIT Licensed.
 
 For more information about how netlink and generic netlink work,
-check out my blog series on [Linux, Netlink, and Go](https://medium.com/@mdlayher/linux-netlink-and-go-part-1-netlink-4781aaeeaca8).
+check out my blog series on [Linux, Netlink, and Go](https://mdlayher.com/blog/linux-netlink-and-go-part-1-netlink/).
+
+If you have any questions or you'd like some guidance, please join us on
+[Gophers Slack](https://invite.slack.golangbridge.org) in the `#networking`
+channel!

vendor/github.com/mdlayher/genetlink/conn.go

@@ -2,6 +2,7 @@ package genetlink
 
 import (
 	"syscall"
+	"time"
 
 	"github.com/mdlayher/netlink"
 	"golang.org/x/net/bpf"
@@ -10,8 +11,12 @@ import (
 // Protocol is the netlink protocol constant used to specify generic netlink.
 const Protocol = 0x10 // unix.NETLINK_GENERIC
 
-// A Conn is a generic netlink connection.  A Conn can be used to send and
+// A Conn is a generic netlink connection. A Conn can be used to send and
 // receive generic netlink messages to and from netlink.
+//
+// A Conn is safe for concurrent use, but to avoid contention in
+// high-throughput applications, the caller should almost certainly create a
+// pool of Conns and distribute them among workers.
 type Conn struct {
 	// Operating system-specific netlink connection.
 	c *netlink.Conn
@@ -38,13 +43,16 @@ func NewConn(c *netlink.Conn) *Conn {
 	return &Conn{c: c}
 }
 
-// Close closes the connection.
+// Close closes the connection. Close will unblock any concurrent calls to
+// Receive which are waiting on a response from the kernel.
 func (c *Conn) Close() error {
 	return c.c.Close()
 }
 
-// GetFamily retrieves a generic netlink family with the specified name.  If the
-// family does not exist, the error value can be checked using os.IsNotExist.
+// GetFamily retrieves a generic netlink family with the specified name.
+//
+// If the family does not exist, the error value can be checked using
+// netlink.IsNotExist.
 func (c *Conn) GetFamily(name string) (Family, error) {
 	return c.getFamily(name)
 }
@@ -94,8 +102,10 @@ func (c *Conn) SetWriteBuffer(bytes int) error {
 // SyscallConn returns a raw network connection. This implements the
 // syscall.Conn interface.
 //
-// Only the Control method of the returned syscall.RawConn is currently
-// implemented.
+// On Go 1.12+, all methods of the returned syscall.RawConn are supported and
+// the Conn is integrated with the runtime network poller. On versions of Go
+// prior to Go 1.12, only the Control method of the returned syscall.RawConn
+// is implemented.
 //
 // SyscallConn is intended for advanced use cases, such as getting and setting
 // arbitrary socket options using the netlink socket's file descriptor.
@@ -107,23 +117,39 @@ func (c *Conn) SyscallConn() (syscall.RawConn, error) {
 	return c.c.SyscallConn()
 }
 
+// SetDeadline sets the read and write deadlines associated with the connection.
+//
+// Deadline functionality is only supported on Go 1.12+. Calling this function
+// on older versions of Go will result in an error.
+func (c *Conn) SetDeadline(t time.Time) error {
+	return c.c.SetDeadline(t)
+}
+
+// SetReadDeadline sets the read deadline associated with the connection.
+//
+// Deadline functionality is only supported on Go 1.12+. Calling this function
+// on older versions of Go will result in an error.
+func (c *Conn) SetReadDeadline(t time.Time) error {
+	return c.c.SetReadDeadline(t)
+}
+
+// SetWriteDeadline sets the write deadline associated with the connection.
+//
+// Deadline functionality is only supported on Go 1.12+. Calling this function
+// on older versions of Go will result in an error.
+func (c *Conn) SetWriteDeadline(t time.Time) error {
+	return c.c.SetWriteDeadline(t)
+}
+
 // Send sends a single Message to netlink, wrapping it in a netlink.Message
 // using the specified generic netlink family and flags.  On success, Send
 // returns a copy of the netlink.Message with all parameters populated, for
 // later validation.
 func (c *Conn) Send(m Message, family uint16, flags netlink.HeaderFlags) (netlink.Message, error) {
-	nm := netlink.Message{
-		Header: netlink.Header{
-			Type:  netlink.HeaderType(family),
-			Flags: flags,
-		},
-	}
-
-	mb, err := m.MarshalBinary()
+	nm, err := packMessage(m, family, flags)
 	if err != nil {
 		return netlink.Message{}, err
 	}
-	nm.Data = mb
 
 	reqnm, err := c.c.Send(nm)
 	if err != nil {
@@ -141,39 +167,69 @@ func (c *Conn) Receive() ([]Message, []netlink.Message, error) {
 		return nil, nil, err
 	}
 
-	gmsgs := make([]Message, 0, len(msgs))
-	for _, nm := range msgs {
-		var gm Message
-		if err := (&gm).UnmarshalBinary(nm.Data); err != nil {
-			return nil, nil, err
-		}
-
-		gmsgs = append(gmsgs, gm)
+	gmsgs, err := unpackMessages(msgs)
+	if err != nil {
+		return nil, nil, err
 	}
 
 	return gmsgs, msgs, nil
 }
 
-// Execute sends a single Message to netlink using Conn.Send, receives one or
-// more replies using Conn.Receive, and then checks the validity of the replies
-// against the request using netlink.Validate.
+// Execute sends a single Message to netlink using Send, receives one or more
+// replies using Receive, and then checks the validity of the replies against
+// the request using netlink.Validate.
 //
-// See the documentation of Conn.Send, Conn.Receive, and netlink.Validate for
-// details about each function.
+// Execute acquires a lock for the duration of the function call which blocks
+// concurrent calls to Send and Receive, in order to ensure consistency between
+// generic netlink request/reply messages.
+//
+// See the documentation of Send, Receive, and netlink.Validate for details
+// about each function.
 func (c *Conn) Execute(m Message, family uint16, flags netlink.HeaderFlags) ([]Message, error) {
-	req, err := c.Send(m, family, flags)
+	nm, err := packMessage(m, family, flags)
 	if err != nil {
 		return nil, err
 	}
 
-	msgs, replies, err := c.Receive()
+	// Locking behavior handled by netlink.Conn.Execute.
+	msgs, err := c.c.Execute(nm)
 	if err != nil {
 		return nil, err
 	}
 
-	if err := netlink.Validate(req, replies); err != nil {
-		return nil, err
-	}
-
-	return msgs, nil
+	return unpackMessages(msgs)
+}
+
+// packMessage packs a generic netlink Message into a netlink.Message with the
+// appropriate generic netlink family and netlink flags.
+func packMessage(m Message, family uint16, flags netlink.HeaderFlags) (netlink.Message, error) {
+	nm := netlink.Message{
+		Header: netlink.Header{
+			Type:  netlink.HeaderType(family),
+			Flags: flags,
+		},
+	}
+
+	mb, err := m.MarshalBinary()
+	if err != nil {
+		return netlink.Message{}, err
+	}
+	nm.Data = mb
+
+	return nm, nil
+}
+
+// unpackMessages unpacks generic netlink Messages from a slice of netlink.Messages.
+func unpackMessages(msgs []netlink.Message) ([]Message, error) {
+	gmsgs := make([]Message, 0, len(msgs))
+	for _, nm := range msgs {
+		var gm Message
+		if err := (&gm).UnmarshalBinary(nm.Data); err != nil {
+			return nil, err
+		}
+
+		gmsgs = append(gmsgs, gm)
+	}
+
+	return gmsgs, nil
 }

vendor/github.com/mdlayher/genetlink/doc.go

@@ -1,2 +1,6 @@
 // Package genetlink implements generic netlink interactions and data types.
+//
+// If you have any questions or you'd like some guidance, please join us on
+// Gophers Slack (https://invite.slack.golangbridge.org) in the #networking
+// channel!
 package genetlink

vendor/github.com/mdlayher/genetlink/family_linux.go

@@ -12,11 +12,9 @@ import (
 	"golang.org/x/sys/unix"
 )
 
-var (
-	// errInvalidFamilyVersion is returned when a family's version is greater
-	// than an 8-bit integer.
-	errInvalidFamilyVersion = errors.New("invalid family version attribute")
-)
+// errInvalidFamilyVersion is returned when a family's version is greater
+// than an 8-bit integer.
+var errInvalidFamilyVersion = errors.New("invalid family version attribute")
 
 // getFamily retrieves a generic netlink family with the specified name.
 func (c *Conn) getFamily(name string) (Family, error) {
@@ -37,7 +35,7 @@ func (c *Conn) getFamily(name string) (Family, error) {
 		Data: b,
 	}
 
-	msgs, err := c.Execute(req, unix.GENL_ID_CTRL, netlink.HeaderFlagsRequest)
+	msgs, err := c.Execute(req, unix.GENL_ID_CTRL, netlink.Request)
 	if err != nil {
 		return Family{}, err
 	}
@@ -67,7 +65,7 @@ func (c *Conn) listFamilies() ([]Family, error) {
 		},
 	}
 
-	flags := netlink.HeaderFlagsRequest | netlink.HeaderFlagsDump
+	flags := netlink.Request | netlink.Dump
 	msgs, err := c.Execute(req, unix.GENL_ID_CTRL, flags)
 	if err != nil {
 		return nil, err

vendor/github.com/mdlayher/genetlink/family_others.go

@@ -7,12 +7,10 @@ import (
 	"runtime"
 )
 
-var (
-	// errUnimplemented is returned by all functions on platforms that
-	// cannot make use of generic netlink.
-	errUnimplemented = fmt.Errorf("generic netlink not implemented on %s/%s",
-		runtime.GOOS, runtime.GOARCH)
-)
+// errUnimplemented is returned by all functions on platforms that
+// cannot make use of generic netlink.
+var errUnimplemented = fmt.Errorf("generic netlink not implemented on %s/%s",
+	runtime.GOOS, runtime.GOARCH)
 
 // getFamily always returns an error.
 func (c *Conn) getFamily(name string) (Family, error) {

vendor/github.com/mdlayher/genetlink/go.mod

@@ -0,0 +1,10 @@
+module github.com/mdlayher/genetlink
+
+go 1.12
+
+require (
+	github.com/google/go-cmp v0.3.1
+	github.com/mdlayher/netlink v0.0.0-20190828143259-340058475d09
+	golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297
+	golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456
+)

vendor/github.com/mdlayher/genetlink/go.sum

@@ -0,0 +1,18 @@
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a h1:84IpUNXj4mCR9CuCEvSiCArMbzr/TMbuPIadKDwypkI=
+github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw=
+github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
+github.com/mdlayher/netlink v0.0.0-20190828143259-340058475d09 h1:U2vuol6i4UF6MSpZJclH4HHiLRMoq1NAzxpIpCUJK/Y=
+github.com/mdlayher/netlink v0.0.0-20190828143259-340058475d09/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 h1:k7pJ2yAPLPgbskkFdhRCsA77k2fySZ1zf2zCjvQCiIM=
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456 h1:ng0gs1AKnRRuEMZoTLLlbOd+C17zUDepwGQBb/n+JVg=
+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

vendor/github.com/mdlayher/genetlink/message.go

@@ -1,15 +1,11 @@
 package genetlink
 
-import (
-	"errors"
-)
+import "errors"
 
-var (
-	// errInvalidMessage is returned when a Message is malformed.
-	errInvalidMessage = errors.New("generic netlink message is invalid or too short")
-)
+// errInvalidMessage is returned when a Message is malformed.
+var errInvalidMessage = errors.New("generic netlink message is invalid or too short")
 
-// A Header is a generic netlink header.  A Header is sent and received with
+// A Header is a generic netlink header. A Header is sent and received with
 // each generic netlink message to indicate metadata regarding a Message.
 type Header struct {
 	// Command specifies a command to issue to netlink.
@@ -22,13 +18,13 @@ type Header struct {
 // headerLen is the length of a Header.
 const headerLen = 4 // unix.GENL_HDRLEN
 
-// A Message is a generic netlink message.  It contains a Header and an
+// A Message is a generic netlink message. It contains a Header and an
 // arbitrary byte payload, which may be decoded using information from the
 // Header.
 //
-// Data is encoded using the native endianness of the host system.  Use
-// the netlink.Uint* and netlink.PutUint* functions to encode and decode
-// integers.
+// Data is encoded using the native endianness of the host system. Use
+// the netlink.AttributeDecoder and netlink.AttributeEncoder types to decode
+// and encode data.
 type Message struct {
 	Header Header
 	Data   []byte