build(deps): bump github.com/vishvananda/netlink
Bumps [github.com/vishvananda/netlink](https://github.com/vishvananda/netlink) from 1.2.0-beta to 1.2.1-beta.2. - [Release notes](https://github.com/vishvananda/netlink/releases) - [Commits](https://github.com/vishvananda/netlink/compare/v1.2.0-beta...v1.2.1-beta.2) --- updated-dependencies: - dependency-name: github.com/vishvananda/netlink dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
This commit is contained in:
parent
615420fa9f
commit
648dd2e14c
2
go.mod
2
go.mod
@ -18,7 +18,7 @@ require (
|
|||||||
github.com/onsi/ginkgo v1.16.4
|
github.com/onsi/ginkgo v1.16.4
|
||||||
github.com/onsi/gomega v1.24.2
|
github.com/onsi/gomega v1.24.2
|
||||||
github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1
|
github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1
|
||||||
github.com/vishvananda/netlink v1.2.0-beta
|
github.com/vishvananda/netlink v1.2.1-beta.2
|
||||||
golang.org/x/sys v0.3.0
|
golang.org/x/sys v0.3.0
|
||||||
)
|
)
|
||||||
|
|
||||||
|
4
go.sum
4
go.sum
@ -654,8 +654,8 @@ github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtX
|
|||||||
github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk=
|
github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk=
|
||||||
github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
|
github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
|
||||||
github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho=
|
github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho=
|
||||||
github.com/vishvananda/netlink v1.2.0-beta h1:CTNzkunO9iTkRaupF540+w47mexyQgNkA/ibnuKc39w=
|
github.com/vishvananda/netlink v1.2.1-beta.2 h1:Llsql0lnQEbHj0I1OuKyp8otXp0r3q0mPkuhwHfStVs=
|
||||||
github.com/vishvananda/netlink v1.2.0-beta/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho=
|
github.com/vishvananda/netlink v1.2.1-beta.2/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho=
|
||||||
github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI=
|
github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI=
|
||||||
github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
|
github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
|
||||||
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
|
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
|
||||||
|
33
vendor/github.com/vishvananda/netlink/filter.go
generated
vendored
33
vendor/github.com/vishvananda/netlink/filter.go
generated
vendored
@ -157,6 +157,39 @@ func NewConnmarkAction() *ConnmarkAction {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type CsumUpdateFlags uint32
|
||||||
|
|
||||||
|
const (
|
||||||
|
TCA_CSUM_UPDATE_FLAG_IPV4HDR CsumUpdateFlags = 1
|
||||||
|
TCA_CSUM_UPDATE_FLAG_ICMP CsumUpdateFlags = 2
|
||||||
|
TCA_CSUM_UPDATE_FLAG_IGMP CsumUpdateFlags = 4
|
||||||
|
TCA_CSUM_UPDATE_FLAG_TCP CsumUpdateFlags = 8
|
||||||
|
TCA_CSUM_UPDATE_FLAG_UDP CsumUpdateFlags = 16
|
||||||
|
TCA_CSUM_UPDATE_FLAG_UDPLITE CsumUpdateFlags = 32
|
||||||
|
TCA_CSUM_UPDATE_FLAG_SCTP CsumUpdateFlags = 64
|
||||||
|
)
|
||||||
|
|
||||||
|
type CsumAction struct {
|
||||||
|
ActionAttrs
|
||||||
|
UpdateFlags CsumUpdateFlags
|
||||||
|
}
|
||||||
|
|
||||||
|
func (action *CsumAction) Type() string {
|
||||||
|
return "csum"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (action *CsumAction) Attrs() *ActionAttrs {
|
||||||
|
return &action.ActionAttrs
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewCsumAction() *CsumAction {
|
||||||
|
return &CsumAction{
|
||||||
|
ActionAttrs: ActionAttrs{
|
||||||
|
Action: TC_ACT_PIPE,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
type MirredAct uint8
|
type MirredAct uint8
|
||||||
|
|
||||||
func (a MirredAct) String() string {
|
func (a MirredAct) String() string {
|
||||||
|
20
vendor/github.com/vishvananda/netlink/filter_linux.go
generated
vendored
20
vendor/github.com/vishvananda/netlink/filter_linux.go
generated
vendored
@ -607,6 +607,16 @@ func EncodeActions(attr *nl.RtAttr, actions []Action) error {
|
|||||||
}
|
}
|
||||||
toTcGen(action.Attrs(), &connmark.TcGen)
|
toTcGen(action.Attrs(), &connmark.TcGen)
|
||||||
aopts.AddRtAttr(nl.TCA_CONNMARK_PARMS, connmark.Serialize())
|
aopts.AddRtAttr(nl.TCA_CONNMARK_PARMS, connmark.Serialize())
|
||||||
|
case *CsumAction:
|
||||||
|
table := attr.AddRtAttr(tabIndex, nil)
|
||||||
|
tabIndex++
|
||||||
|
table.AddRtAttr(nl.TCA_ACT_KIND, nl.ZeroTerminated("csum"))
|
||||||
|
aopts := table.AddRtAttr(nl.TCA_ACT_OPTIONS, nil)
|
||||||
|
csum := nl.TcCsum{
|
||||||
|
UpdateFlags: uint32(action.UpdateFlags),
|
||||||
|
}
|
||||||
|
toTcGen(action.Attrs(), &csum.TcGen)
|
||||||
|
aopts.AddRtAttr(nl.TCA_CSUM_PARMS, csum.Serialize())
|
||||||
case *BpfAction:
|
case *BpfAction:
|
||||||
table := attr.AddRtAttr(tabIndex, nil)
|
table := attr.AddRtAttr(tabIndex, nil)
|
||||||
tabIndex++
|
tabIndex++
|
||||||
@ -675,6 +685,8 @@ func parseActions(tables []syscall.NetlinkRouteAttr) ([]Action, error) {
|
|||||||
action = &BpfAction{}
|
action = &BpfAction{}
|
||||||
case "connmark":
|
case "connmark":
|
||||||
action = &ConnmarkAction{}
|
action = &ConnmarkAction{}
|
||||||
|
case "csum":
|
||||||
|
action = &CsumAction{}
|
||||||
case "gact":
|
case "gact":
|
||||||
action = &GenericAction{}
|
action = &GenericAction{}
|
||||||
case "tunnel_key":
|
case "tunnel_key":
|
||||||
@ -755,6 +767,14 @@ func parseActions(tables []syscall.NetlinkRouteAttr) ([]Action, error) {
|
|||||||
toAttrs(&connmark.TcGen, action.Attrs())
|
toAttrs(&connmark.TcGen, action.Attrs())
|
||||||
action.(*ConnmarkAction).Zone = connmark.Zone
|
action.(*ConnmarkAction).Zone = connmark.Zone
|
||||||
}
|
}
|
||||||
|
case "csum":
|
||||||
|
switch adatum.Attr.Type {
|
||||||
|
case nl.TCA_CSUM_PARMS:
|
||||||
|
csum := *nl.DeserializeTcCsum(adatum.Value)
|
||||||
|
action.(*CsumAction).ActionAttrs = ActionAttrs{}
|
||||||
|
toAttrs(&csum.TcGen, action.Attrs())
|
||||||
|
action.(*CsumAction).UpdateFlags = CsumUpdateFlags(csum.UpdateFlags)
|
||||||
|
}
|
||||||
case "gact":
|
case "gact":
|
||||||
switch adatum.Attr.Type {
|
switch adatum.Attr.Type {
|
||||||
case nl.TCA_GACT_PARMS:
|
case nl.TCA_GACT_PARMS:
|
||||||
|
6
vendor/github.com/vishvananda/netlink/nl/nl_linux.go
generated
vendored
6
vendor/github.com/vishvananda/netlink/nl/nl_linux.go
generated
vendored
@ -504,8 +504,10 @@ func (req *NetlinkRequest) Execute(sockType int, resType uint16) ([][]byte, erro
|
|||||||
if err := s.SetReceiveTimeout(&SocketTimeoutTv); err != nil {
|
if err := s.SetReceiveTimeout(&SocketTimeoutTv); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if err := s.SetExtAck(EnableErrorMessageReporting); err != nil {
|
if EnableErrorMessageReporting {
|
||||||
return nil, err
|
if err := s.SetExtAck(true); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
defer s.Close()
|
defer s.Close()
|
||||||
|
31
vendor/github.com/vishvananda/netlink/nl/tc_linux.go
generated
vendored
31
vendor/github.com/vishvananda/netlink/nl/tc_linux.go
generated
vendored
@ -90,6 +90,7 @@ const (
|
|||||||
SizeofTcU32Sel = 0x10 // without keys
|
SizeofTcU32Sel = 0x10 // without keys
|
||||||
SizeofTcGen = 0x14
|
SizeofTcGen = 0x14
|
||||||
SizeofTcConnmark = SizeofTcGen + 0x04
|
SizeofTcConnmark = SizeofTcGen + 0x04
|
||||||
|
SizeofTcCsum = SizeofTcGen + 0x04
|
||||||
SizeofTcMirred = SizeofTcGen + 0x08
|
SizeofTcMirred = SizeofTcGen + 0x08
|
||||||
SizeofTcTunnelKey = SizeofTcGen + 0x04
|
SizeofTcTunnelKey = SizeofTcGen + 0x04
|
||||||
SizeofTcSkbEdit = SizeofTcGen
|
SizeofTcSkbEdit = SizeofTcGen
|
||||||
@ -694,6 +695,36 @@ func (x *TcConnmark) Serialize() []byte {
|
|||||||
return (*(*[SizeofTcConnmark]byte)(unsafe.Pointer(x)))[:]
|
return (*(*[SizeofTcConnmark]byte)(unsafe.Pointer(x)))[:]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const (
|
||||||
|
TCA_CSUM_UNSPEC = iota
|
||||||
|
TCA_CSUM_PARMS
|
||||||
|
TCA_CSUM_TM
|
||||||
|
TCA_CSUM_PAD
|
||||||
|
TCA_CSUM_MAX = TCA_CSUM_PAD
|
||||||
|
)
|
||||||
|
|
||||||
|
// struct tc_csum {
|
||||||
|
// tc_gen;
|
||||||
|
// __u32 update_flags;
|
||||||
|
// }
|
||||||
|
|
||||||
|
type TcCsum struct {
|
||||||
|
TcGen
|
||||||
|
UpdateFlags uint32
|
||||||
|
}
|
||||||
|
|
||||||
|
func (msg *TcCsum) Len() int {
|
||||||
|
return SizeofTcCsum
|
||||||
|
}
|
||||||
|
|
||||||
|
func DeserializeTcCsum(b []byte) *TcCsum {
|
||||||
|
return (*TcCsum)(unsafe.Pointer(&b[0:SizeofTcCsum][0]))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *TcCsum) Serialize() []byte {
|
||||||
|
return (*(*[SizeofTcCsum]byte)(unsafe.Pointer(x)))[:]
|
||||||
|
}
|
||||||
|
|
||||||
const (
|
const (
|
||||||
TCA_ACT_MIRRED = 8
|
TCA_ACT_MIRRED = 8
|
||||||
)
|
)
|
||||||
|
2
vendor/modules.txt
vendored
2
vendor/modules.txt
vendored
@ -154,7 +154,7 @@ github.com/safchain/ethtool
|
|||||||
# github.com/sirupsen/logrus v1.8.1
|
# github.com/sirupsen/logrus v1.8.1
|
||||||
## explicit; go 1.13
|
## explicit; go 1.13
|
||||||
github.com/sirupsen/logrus
|
github.com/sirupsen/logrus
|
||||||
# github.com/vishvananda/netlink v1.2.0-beta
|
# github.com/vishvananda/netlink v1.2.1-beta.2
|
||||||
## explicit; go 1.12
|
## explicit; go 1.12
|
||||||
github.com/vishvananda/netlink
|
github.com/vishvananda/netlink
|
||||||
github.com/vishvananda/netlink/nl
|
github.com/vishvananda/netlink/nl
|
||||||
|
Loading…
x
Reference in New Issue
Block a user