From ff92d56893bb7c404507acf9ab65b9e9af015e2a Mon Sep 17 00:00:00 2001 From: Ben Kochie Date: Wed, 3 Apr 2019 14:28:06 +0200 Subject: [PATCH] Update library for current netlink Update the library to be compatible with the latest netlink library master. --- get.go | 2 +- get_test.go | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/get.go b/get.go index b0e8430..13325fb 100644 --- a/get.go +++ b/get.go @@ -157,7 +157,7 @@ func parseTC_Fq_Qd_Stats(attr netlink.Attribute) (TC_Fq_Qd_Stats, error) { func getQdiscMsgs(c *netlink.Conn) ([]netlink.Message, error) { req := netlink.Message{ Header: netlink.Header{ - Flags: netlink.HeaderFlagsRequest | netlink.HeaderFlagsDump, + Flags: netlink.Request | netlink.Dump, Type: 38, // RTM_GETQDISC }, Data: []byte{0}, diff --git a/get_test.go b/get_test.go index f895f63..0a1751b 100644 --- a/get_test.go +++ b/get_test.go @@ -9,7 +9,7 @@ import ( ) func TestGetAndParseFail(t *testing.T) { - c := nltest.Dial(func(req netlink.Message) ([]netlink.Message, error) { + c := nltest.Dial(func(req []netlink.Message) ([]netlink.Message, error) { return nltest.Error(int(syscall.ENOENT), req) }) @@ -26,8 +26,8 @@ func TestGetAndParseFail(t *testing.T) { func TestGetAndParseShort(t *testing.T) { msg := netlink.Message{Data: []byte{0xff, 0xff, 0xff, 0xff}} - c := nltest.Dial(func(req netlink.Message) ([]netlink.Message, error) { - msg.Header.Sequence = req.Header.Sequence + c := nltest.Dial(func(req []netlink.Message) ([]netlink.Message, error) { + msg.Header.Sequence = req[0].Header.Sequence return []netlink.Message{msg}, nil }) @@ -44,8 +44,8 @@ func TestGetAndParseShort(t *testing.T) { func TestGetAndParseUnmarshal(t *testing.T) { msg := netlink.Message{Data: []byte{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}} - c := nltest.Dial(func(req netlink.Message) ([]netlink.Message, error) { - msg.Header.Sequence = req.Header.Sequence + c := nltest.Dial(func(req []netlink.Message) ([]netlink.Message, error) { + msg.Header.Sequence = req[0].Header.Sequence return []netlink.Message{msg}, nil }) @@ -63,8 +63,8 @@ func TestGetAndParseOK(t *testing.T) { d := []byte{0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 128, 255, 255, 255, 255, 2, 0, 0, 0, 7, 0, 1, 0, 102, 113, 0, 0, 84, 0, 2, 0, 8, 0, 1, 0, 16, 39, 0, 0, 8, 0, 2, 0, 100, 0, 0, 0, 8, 0, 3, 0, 212, 11, 0, 0, 8, 0, 4, 0, 36, 59, 0, 0, 8, 0, 5, 0, 1, 0, 0, 0, 8, 0, 7, 0, 255, 255, 255, 255, 8, 0, 9, 0, 64, 156, 0, 0, 8, 0, 10, 0, 255, 3, 0, 0, 8, 0, 11, 0, 142, 12, 1, 0, 8, 0, 8, 0, 10, 0, 0, 0, 132, 0, 7, 0, 84, 0, 4, 0, 125, 97, 0, 0, 0, 0, 0, 0, 86, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 203, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 114, 61, 37, 209, 53, 184, 251, 255, 255, 7, 0, 0, 255, 7, 0, 0, 0, 0, 0, 0, 227, 183, 1, 0, 20, 0, 1, 0, 139, 42, 111, 15, 0, 0, 0, 0, 159, 76, 30, 0, 0, 0, 0, 0, 24, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 0, 44, 0, 3, 0, 139, 42, 111, 15, 0, 0, 0, 0, 159, 76, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 84, 0, 4, 0, 125, 97, 0, 0, 0, 0, 0, 0, 86, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 203, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 114, 61, 37, 209, 53, 184, 251, 255, 255, 7, 0, 0, 255, 7, 0, 0, 0, 0, 0, 0, 227, 183, 1, 0} msg := netlink.Message{Data: d} - c := nltest.Dial(func(req netlink.Message) ([]netlink.Message, error) { - msg.Header.Sequence = req.Header.Sequence + c := nltest.Dial(func(req []netlink.Message) ([]netlink.Message, error) { + msg.Header.Sequence = req[0].Header.Sequence return []netlink.Message{msg}, nil })