From 55f170b58066a98d76ddefddd5c6c0bddc9b5bf3 Mon Sep 17 00:00:00 2001
From: Daniel Czerwonk <daniel@dan-nrw.de>
Date: Sun, 18 Nov 2018 15:15:28 +0100
Subject: [PATCH] applied changes to new netlink pkg
---
protocols/netlink/netlink.go | 4 ++--
protocols/netlink/netlink_reader.go | 16 ++++++----------
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/protocols/netlink/netlink.go b/protocols/netlink/netlink.go
index fa39d601..62ce9449 100644
--- a/protocols/netlink/netlink.go
+++ b/protocols/netlink/netlink.go
@@ -35,10 +35,10 @@ func (n *Netlink) Start() {
}
// 1. from locRib to Kernel
- n.locRib.ClientManager.RegisterWithOptions(n.writer, options)
+ n.locRib.RegisterWithOptions(n.writer, options)
// 2. from Kernel to locRib
- n.reader.ClientManager.RegisterWithOptions(n.locRib, options)
+ n.reader.clientManager.RegisterWithOptions(n.locRib, options)
// Listen for new routes from kernel
go n.reader.Read()
diff --git a/protocols/netlink/netlink_reader.go b/protocols/netlink/netlink_reader.go
index abe22307..7fcfbbb2 100644
--- a/protocols/netlink/netlink_reader.go
+++ b/protocols/netlink/netlink_reader.go
@@ -22,9 +22,9 @@ const (
// NetlinkReader read routes from the Linux Kernel and propagates it to the locRIB
type NetlinkReader struct {
- options *config.Netlink
- routingtable.ClientManager
- filter *filter.Filter
+ clientManager *routingtable.ClientManager
+ options *config.Netlink
+ filter *filter.Filter
mu sync.RWMutex
routes []netlink.Route
@@ -37,7 +37,7 @@ func NewNetlinkReader(options *config.Netlink) *NetlinkReader {
filter: options.ImportFilter,
}
- nr.ClientManager = routingtable.NewClientManager(nr)
+ nr.clientManager = routingtable.NewClientManager(nr)
return nr
}
@@ -124,7 +124,7 @@ func (nr *NetlinkReader) addPathsToClients(routes []netlink.Route) {
}
}
- for _, client := range nr.ClientManager.Clients() {
+ for _, client := range nr.clientManager.Clients() {
log.WithFields(log.Fields{
"pfx": pfx,
"path": path,
@@ -179,7 +179,7 @@ func (nr *NetlinkReader) removePathsFromClients(routes []netlink.Route) {
}
}
- for _, client := range nr.ClientManager.Clients() {
+ for _, client := range nr.clientManager.Clients() {
log.WithFields(log.Fields{
"pfx": pfx,
"path": path,
@@ -231,10 +231,6 @@ func (nr *NetlinkReader) UpdateNewClient(routingtable.RouteTableClient) error {
func (nr *NetlinkReader) Register(routingtable.RouteTableClient) {
}
-// RegisterWithOptions is Not supported
-func (nr *NetlinkReader) RegisterWithOptions(routingtable.RouteTableClient, routingtable.ClientOptions) {
-}
-
// Unregister is Not supported
func (nr *NetlinkReader) Unregister(routingtable.RouteTableClient) {
}
--
GitLab