server: support multiple route familes per peer

You can configure like the following:

[Global]
  As = 65032
  RouterId = "192.168.255.1"

[[NeighborList]]
  NeighborAddress = "10.0.255.1"
  PeerAs = 65001
  [NeighborList.RouteServer]
    RouteServerClient = true
  [[NeighborList.AfiSafiList]]
    AfiSafiName = "ipv4-unicast"
  [[NeighborList.AfiSafiList]]
    AfiSafiName = "ipv6-unicast"

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

1 files changed, 21 insertions, 4 deletions

diff --git a/table/table_manager.go b/table/table_manager.go
index 59b0a275..e135f58e 100644
--- a/table/table_manager.go
+++ b/table/table_manager.go
@@ -241,8 +241,11 @@ func (manager *TableManager) calculate(destinationList []Destination) ([]Path, [
 }
 
 func (manager *TableManager) DeletePathsforPeer(peerInfo *PeerInfo, rf bgp.RouteFamily) ([]Path, []Path, error) {
-	destinationList := manager.Tables[rf].DeleteDestByPeer(peerInfo)
-	return manager.calculate(destinationList)
+	if _, ok := manager.Tables[rf]; ok {
+		destinationList := manager.Tables[rf].DeleteDestByPeer(peerInfo)
+		return manager.calculate(destinationList)
+	}
+	return []Path{}, []Path{}, nil
 }
 
 func (manager *TableManager) ProcessPaths(pathList []Path) ([]Path, []Path, error) {
@@ -339,24 +342,38 @@ func (adj *AdjRib) getPathList(rib map[string]*ReceivedRoute) []Path {
 }
 
 func (adj *AdjRib) GetInPathList(rf bgp.RouteFamily) []Path {
+	if _, ok := adj.adjRibIn[rf]; !ok {
+		return []Path{}
+	}
 	return adj.getPathList(adj.adjRibIn[rf])
 }
 
 func (adj *AdjRib) GetOutPathList(rf bgp.RouteFamily) []Path {
+	if _, ok := adj.adjRibOut[rf]; !ok {
+		return []Path{}
+	}
 	return adj.getPathList(adj.adjRibOut[rf])
 }
 
 func (adj *AdjRib) GetInCount(rf bgp.RouteFamily) int {
+	if _, ok := adj.adjRibIn[rf]; !ok {
+		return 0
+	}
 	return len(adj.adjRibIn[rf])
 }
 
 func (adj *AdjRib) GetOutCount(rf bgp.RouteFamily) int {
+	if _, ok := adj.adjRibOut[rf]; !ok {
+		return 0
+	}
 	return len(adj.adjRibOut[rf])
 }
 
 func (adj *AdjRib) DropAllIn(rf bgp.RouteFamily) {
-	// replace old one
-	adj.adjRibIn[rf] = make(map[string]*ReceivedRoute)
+	if _, ok := adj.adjRibIn[rf]; ok {
+		// replace old one
+		adj.adjRibIn[rf] = make(map[string]*ReceivedRoute)
+	}
 }
 
 type ReceivedRoute struct {