github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-30 09:13:29 +00:00
Code Issues Projects Releases Wiki Activity

network: delete IP addrs on bridge model to prevent ARP conflict

Browse Source 
Fixes: #1673

Signed-off-by: Zha Bin <zhabin@linux.alibaba.com>
This commit is contained in:
Zha Bin 2019-04-22 14:22:34 +08:00
parent 86d51f59d4
commit bdb1047a67
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
virtcontainers/network.go
View File

@ -716,6 +716,16 @@ func bridgeNetworkPair(endpoint Endpoint, queues int, disableVhostNet bool) erro
netPair.VirtIface.Name, netPair.Name, err) netPair.VirtIface.Name, netPair.Name, err)
} }
// Clear the IP addresses from the veth interface to prevent ARP conflict
netPair.VirtIface.Addrs, err = netlink.AddrList(link, netlink.FAMILY_V4)
if err != nil {
return fmt.Errorf("Unable to obtain veth IP addresses: %s", err)
}
if err := clearIPs(link, netPair.VirtIface.Addrs); err != nil {
return fmt.Errorf("Unable to clear veth IP addresses: %s", err)
}
if err := netHandle.LinkSetUp(link); err != nil { if err := netHandle.LinkSetUp(link); err != nil {
return fmt.Errorf("Could not enable veth %s: %s", netPair.VirtIface.Name, err) return fmt.Errorf("Could not enable veth %s: %s", netPair.VirtIface.Name, err)
} }
@ -1001,7 +1011,8 @@ func unBridgeNetworkPair(endpoint Endpoint) error {
return fmt.Errorf("Could not detach veth %s: %s", netPair.VirtIface.Name, err) return fmt.Errorf("Could not detach veth %s: %s", netPair.VirtIface.Name, err)
} }
return nil // Restore the IPs that were cleared
return setIPs(link, netPair.VirtIface.Addrs)
} }
func removeTCFiltering(endpoint Endpoint) error { func removeTCFiltering(endpoint Endpoint) error {