RepoMirrors/netlink
1
0
Fork 0
mirror of https://github.com/vishvananda/netlink synced 2025-04-19 05:35:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

veth: Set peer hardware addr when creating

Browse Source 
This commit extends LinkAdd function for Veth by allowing to specify
peer hardware addr.

Signed-off-by: Martynas Pumputis <m@lambda.lt>
This commit is contained in:
Martynas Pumputis 2019-06-17 20:45:05 +02:00 committed by Alessandro Boch
parent 123a384710
commit 99a56c251a
3 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
link.go
View File

@ -327,6 +327,7 @@ func (tuntap *Tuntap) Type() string {
type Veth struct { type Veth struct {
LinkAttrs LinkAttrs
PeerName string // veth on create only PeerName string // veth on create only
PeerHardwareAddr net.HardwareAddr
} }
func (veth *Veth) Attrs() *LinkAttrs { func (veth *Veth) Attrs() *LinkAttrs {

4
link_linux.go
View File

@ -1172,7 +1172,9 @@ func (h *Handle) linkModify(link Link, flags int) error {
if base.MTU > 0 { if base.MTU > 0 {
peer.AddRtAttr(unix.IFLA_MTU, nl.Uint32Attr(uint32(base.MTU))) peer.AddRtAttr(unix.IFLA_MTU, nl.Uint32Attr(uint32(base.MTU)))
} }
if link.PeerHardwareAddr != nil {
peer.AddRtAttr(unix.IFLA_ADDRESS, []byte(link.PeerHardwareAddr))
}
case *Vxlan: case *Vxlan:
addVxlanAttrs(link, linkInfo) addVxlanAttrs(link, linkInfo)
case *Bond: case *Bond:

27
link_test.go
View File

@ -87,6 +87,9 @@ func testLinkAddDel(t *testing.T, link Link) {
if peer.TxQLen != testTxQLen { if peer.TxQLen != testTxQLen {
t.Fatalf("TxQLen of peer is %d, should be %d", peer.TxQLen, testTxQLen) t.Fatalf("TxQLen of peer is %d, should be %d", peer.TxQLen, testTxQLen)
} }
if !bytes.Equal(peer.Attrs().HardwareAddr, original.PeerHardwareAddr) {
t.Fatalf("Peer MAC addr is %s, should be %s", peer.Attrs().HardwareAddr, original.PeerHardwareAddr)
}
} }
} }
} else { } else {
@ -634,7 +637,19 @@ func TestLinkAddDelVeth(t *testing.T) {
tearDown := setUpNetlinkTest(t) tearDown := setUpNetlinkTest(t)
defer tearDown() defer tearDown()
veth := &Veth{LinkAttrs: LinkAttrs{Name: "foo", TxQLen: testTxQLen, MTU: 1400, NumTxQueues: testTxQueues, NumRxQueues: testRxQueues}, PeerName: "bar"} peerMAC, _ := net.ParseMAC("00:12:34:56:78:02")
veth := &Veth{
LinkAttrs: LinkAttrs{
Name: "foo",
TxQLen: testTxQLen,
MTU: 1400,
NumTxQueues: testTxQueues,
NumRxQueues: testRxQueues,
},
PeerName: "bar",
PeerHardwareAddr: peerMAC,
}
testLinkAddDel(t, veth) testLinkAddDel(t, veth)
} }
@ -891,7 +906,7 @@ func TestLinkSetNs(t *testing.T) {
} }
defer newns.Close() defer newns.Close()
link := &Veth{LinkAttrs{Name: "foo"}, "bar"} link := &Veth{LinkAttrs{Name: "foo"}, "bar", nil}
if err := LinkAdd(link); err != nil { if err := LinkAdd(link); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -1291,7 +1306,7 @@ func TestLinkSubscribe(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
link := &Veth{LinkAttrs{Name: "foo", TxQLen: testTxQLen, MTU: 1400}, "bar"} link := &Veth{LinkAttrs{Name: "foo", TxQLen: testTxQLen, MTU: 1400}, "bar", nil}
if err := LinkAdd(link); err != nil { if err := LinkAdd(link); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -1338,7 +1353,7 @@ func TestLinkSubscribeWithOptions(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
link := &Veth{LinkAttrs{Name: "foo", TxQLen: testTxQLen, MTU: 1400}, "bar"} link := &Veth{LinkAttrs{Name: "foo", TxQLen: testTxQLen, MTU: 1400}, "bar", nil}
if err := LinkAdd(link); err != nil { if err := LinkAdd(link); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -1372,7 +1387,7 @@ func TestLinkSubscribeAt(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
link := &Veth{LinkAttrs{Name: "test", TxQLen: testTxQLen, MTU: 1400}, "bar"} link := &Veth{LinkAttrs{Name: "test", TxQLen: testTxQLen, MTU: 1400}, "bar", nil}
if err := nh.LinkAdd(link); err != nil { if err := nh.LinkAdd(link); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -1414,7 +1429,7 @@ func TestLinkSubscribeListExisting(t *testing.T) {
} }
defer nh.Delete() defer nh.Delete()
link := &Veth{LinkAttrs{Name: "test", TxQLen: testTxQLen, MTU: 1400}, "bar"} link := &Veth{LinkAttrs{Name: "test", TxQLen: testTxQLen, MTU: 1400}, "bar", nil}
if err := nh.LinkAdd(link); err != nil { if err := nh.LinkAdd(link); err != nil {
t.Fatal(err) t.Fatal(err)
} }