Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Commit

Permalink
network: Ignore routes with proto as "kernel"
Browse files Browse the repository at this point in the history
Routes with proto "kernel" are routes that are automatically added
by the kernel.
It is a route added automatically when you assign an address to an
interface which is not /32.
With this commit, these routes are ignored. The guest kernel
would add these routes on the guest side. A corresponding commit on the
agent side would no longer delete these routes while updating them.

Without this commit, netlink gives an error complaining that a route
already exists when you try to add a route with the same dest subnet.

Something like:
dest: 192.168.1.0/24 device:net1 source:192.168.1.217 scope:253
dest: 192.168.1.0/24 device:net2 source:192.168.1.218 scope:253

Depends-on: github.com/kata-containers/agent#624

Fixes: #1811

Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>
  • Loading branch information
amshinde committed Aug 6, 2019
1 parent 00e0aaa commit df7cf77
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
5 changes: 5 additions & 0 deletions netmon/netmon.go
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,11 @@ func convertRoutes(netRoutes []netlink.Route) []vcTypes.Route {
// by Kata yet.
for _, netRoute := range netRoutes {
dst := ""

if netRoute.Protocol == unix.RTPROT_KERNEL {
continue
}

if netRoute.Dst != nil {
if netRoute.Dst.IP.To4() != nil {
dst = netRoute.Dst.String()
Expand Down
4 changes: 4 additions & 0 deletions virtcontainers/network.go
Original file line number Diff line number Diff line change
Expand Up @@ -1170,6 +1170,10 @@ func generateInterfacesAndRoutes(networkNS NetworkNamespace) ([]*vcTypes.Interfa
for _, route := range endpoint.Properties().Routes {
var r vcTypes.Route

if route.Protocol == unix.RTPROT_KERNEL {
continue
}

if route.Dst != nil {
r.Dest = route.Dst.String()

Expand Down

0 comments on commit df7cf77

Please sign in to comment.