family dependent add-path config

config/peer.go

@@ -21,8 +21,6 @@ type Peer struct {
 	PeerAS                  uint32
 	Passive                 bool
 	RouterID                uint32
-	AddPathSend             routingtable.ClientOptions
-	AddPathRecv             bool
 	RouteServerClient       bool
 	RouteReflectorClient    bool
 	RouteReflectorClusterID uint32
@@ -35,4 +33,6 @@ type AddressFamilyConfig struct {
 	RIB          *locRIB.LocRIB
 	ImportFilter *filter.Filter
 	ExportFilter *filter.Filter
+	AddPathSend  routingtable.ClientOptions
+	AddPathRecv  bool
 }

main_ipv4.go

@@ -40,13 +40,13 @@ func startServer(b server.BGPServer, rib *locRIB.LocRIB) {
 		KeepAlive:         time.Second * 30,
 		Passive:           true,
 		RouterID:          b.RouterID(),
-		AddPathSend: routingtable.ClientOptions{
-			MaxPaths: 10,
-		},
 		IPv4: &config.AddressFamilyConfig{
 			RIB:          rib,
 			ImportFilter: filter.NewAcceptAllFilter(),
 			ExportFilter: filter.NewAcceptAllFilter(),
+			AddPathSend: routingtable.ClientOptions{
+				MaxPaths: 10,
+			},
 		},
 		RouteServerClient: true,
 	})
@@ -62,15 +62,15 @@ func startServer(b server.BGPServer, rib *locRIB.LocRIB) {
 		KeepAlive:         time.Second * 30,
 		Passive:           true,
 		RouterID:          b.RouterID(),
-		AddPathSend: routingtable.ClientOptions{
-			MaxPaths: 10,
-		},
-		AddPathRecv:       true,
 		RouteServerClient: true,
 		IPv4: &config.AddressFamilyConfig{
 			RIB:          rib,
 			ImportFilter: filter.NewAcceptAllFilter(),
 			ExportFilter: filter.NewAcceptAllFilter(),
+			AddPathSend: routingtable.ClientOptions{
+				MaxPaths: 10,
+			},
+			AddPathRecv: true,
 		},
 	})
 }

main_ipv6.go

@@ -38,13 +38,13 @@ func startServer(b server.BGPServer, rib *locRIB.LocRIB) {
 		KeepAlive:         time.Second * 30,
 		Passive:           true,
 		RouterID:          b.RouterID(),
-		AddPathSend: routingtable.ClientOptions{
-			BestOnly: true,
-		},
 		IPv6: &config.AddressFamilyConfig{
 			RIB:          rib,
 			ImportFilter: filter.NewAcceptAllFilter(),
 			ExportFilter: filter.NewDrainFilter(),
+			AddPathSend: routingtable.ClientOptions{
+				BestOnly: true,
+			},
 		},
 	})
 
@@ -59,13 +59,13 @@ func startServer(b server.BGPServer, rib *locRIB.LocRIB) {
 		KeepAlive:         time.Second * 30,
 		Passive:           true,
 		RouterID:          b.RouterID(),
-		AddPathSend: routingtable.ClientOptions{
-			BestOnly: true,
-		},
 		IPv6: &config.AddressFamilyConfig{
 			RIB:          rib,
 			ImportFilter: filter.NewDrainFilter(),
 			ExportFilter: filter.NewAcceptAllFilter(),
+			AddPathSend: routingtable.ClientOptions{
+				BestOnly: true,
+			},
 		},
 	})
 }