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:
![49699333+dependabot[bot]@users.noreply.github.com](/assets/img/avatar_default.png)
committed by
Matthieu MOREL

parent
615420fa9f
commit
648dd2e14c
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
|
||||
|
||||
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)
|
||||
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:
|
||||
table := attr.AddRtAttr(tabIndex, nil)
|
||||
tabIndex++
|
||||
@ -675,6 +685,8 @@ func parseActions(tables []syscall.NetlinkRouteAttr) ([]Action, error) {
|
||||
action = &BpfAction{}
|
||||
case "connmark":
|
||||
action = &ConnmarkAction{}
|
||||
case "csum":
|
||||
action = &CsumAction{}
|
||||
case "gact":
|
||||
action = &GenericAction{}
|
||||
case "tunnel_key":
|
||||
@ -755,6 +767,14 @@ func parseActions(tables []syscall.NetlinkRouteAttr) ([]Action, error) {
|
||||
toAttrs(&connmark.TcGen, action.Attrs())
|
||||
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":
|
||||
switch adatum.Attr.Type {
|
||||
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 {
|
||||
return nil, err
|
||||
}
|
||||
if err := s.SetExtAck(EnableErrorMessageReporting); err != nil {
|
||||
return nil, err
|
||||
if EnableErrorMessageReporting {
|
||||
if err := s.SetExtAck(true); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
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
|
||||
SizeofTcGen = 0x14
|
||||
SizeofTcConnmark = SizeofTcGen + 0x04
|
||||
SizeofTcCsum = SizeofTcGen + 0x04
|
||||
SizeofTcMirred = SizeofTcGen + 0x08
|
||||
SizeofTcTunnelKey = SizeofTcGen + 0x04
|
||||
SizeofTcSkbEdit = SizeofTcGen
|
||||
@ -694,6 +695,36 @@ func (x *TcConnmark) Serialize() []byte {
|
||||
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 (
|
||||
TCA_ACT_MIRRED = 8
|
||||
)
|
||||
|
Reference in New Issue
Block a user