Skip to content

fix: Remove NLM_F_EXCL flag from Netlink Delete call (#2150) #2158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 22, 2023
Merged

fix: Remove NLM_F_EXCL flag from Netlink Delete call (#2150) #2158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions netlink/ip_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func (Netlink) setIPAddress(ifName string, ipAddress net.IP, ipNet *net.IPNet, a
flags = unix.NLM_F_CREATE | unix.NLM_F_EXCL | unix.NLM_F_ACK
} else {
msgType = unix.RTM_DELADDR
flags = unix.NLM_F_EXCL | unix.NLM_F_ACK
flags = unix.NLM_F_ACK
}

req := newRequest(msgType, flags)
Expand Down Expand Up @@ -225,7 +225,7 @@ func setIpRoute(route *Route, add bool) error {
flags = unix.NLM_F_CREATE | unix.NLM_F_EXCL | unix.NLM_F_ACK
} else {
msgType = unix.RTM_DELROUTE
flags = unix.NLM_F_EXCL | unix.NLM_F_ACK
flags = unix.NLM_F_ACK
}

req := newRequest(msgType, flags)
Expand Down
64 changes: 64 additions & 0 deletions netlink/netlink_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"testing"

"github.com/stretchr/testify/require"
"golang.org/x/sys/unix"
)

const (
Expand Down Expand Up @@ -311,3 +312,66 @@ func TestAddRemoveStaticArp(t *testing.T) {
t.Errorf("DeleteLink failed: %+v", err)
}
}

func TestAddRemoveIPAddress(t *testing.T) {
_, err := addDummyInterface(ifName)
if err != nil {
t.Errorf("addDummyInterface failed: %v", err)
}

ip := net.ParseIP("192.168.0.4")
_, ipNet, _ := net.ParseCIDR("192.168.0.4/24")
nl := NewNetlink()

err = nl.setIPAddress(ifName, ip, ipNet, true)
if err != nil {
t.Errorf("ret val %v", err)
}

err = nl.setIPAddress(ifName, ip, ipNet, false)
if err != nil {
t.Errorf("ret val %v", err)
}

err = nl.DeleteLink(ifName)
if err != nil {
t.Errorf("DeleteLink failed: %+v", err)
}
}

func TestAddDeleteRoute(t *testing.T) {
_, err := addDummyInterface(ifName)
if err != nil {
t.Errorf("addDummyInterface failed: %v", err)
}

nl := NewNetlink()
err = nl.SetLinkState(ifName, true)
if err != nil {
t.Errorf("ret val %v", err)
}
_, dstIPNet, _ := net.ParseCIDR("192.168.0.4/24")
netif, _ := net.InterfaceByName(ifName)

route := Route{
Family: unix.AF_INET,
Dst: dstIPNet,
LinkIndex: netif.Index,
Scope: RT_SCOPE_LINK,
}

err = setIpRoute(&route, true)
if err != nil {
t.Errorf("ret val %v", err)
}

err = setIpRoute(&route, false)
if err != nil {
t.Errorf("ret val %v", err)
}

err = nl.DeleteLink(ifName)
if err != nil {
t.Errorf("DeleteLink failed: %+v", err)
}
}