applied changes to new netlink pkg

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()

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) {
 }