adelorenzo/kilo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #152 from squat/check_netlink_events

Browse Source 
pkg/route: correct route error check
This commit is contained in:
Lucas Servén Marín 2021-05-02 20:08:06 +02:00 committed by GitHub
commit e843262064
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/route/route.go
View File

@ -108,14 +108,14 @@ func (t *Table) Run(stop <-chan struct{}) (<-chan error, error) {
switch e.Type { switch e.Type {
// Watch for deleted routes to reconcile this table's routes. // Watch for deleted routes to reconcile this table's routes.
case unix.RTM_DELROUTE: case unix.RTM_DELROUTE:
// Filter out invalid routes.
if e.Route.Dst == nil {
continue
}
t.mu.Lock() t.mu.Lock()
for k := range t.rs { for k := range t.rs {
switch r := t.rs[k].(type) { switch r := t.rs[k].(type) {
case *netlink.Route: case *netlink.Route:
// Filter out invalid routes.
if r == nil || r.Dst == nil {
continue
}
// If any deleted route's destination matches a destination // If any deleted route's destination matches a destination
// in the table, reset the corresponding route just in case. // in the table, reset the corresponding route just in case.
if r.Dst.IP.Equal(e.Route.Dst.IP) && r.Dst.Mask.String() == e.Route.Dst.Mask.String() { if r.Dst.IP.Equal(e.Route.Dst.IP) && r.Dst.Mask.String() == e.Route.Dst.Mask.String() {