server: support route reflector behavior

scenario_test is also added

Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>

2 files changed, 79 insertions, 28 deletions

diff --git a/server/peer.go b/server/peer.go
index 70d464ec..80d4d0dc 100644
--- a/server/peer.go
+++ b/server/peer.go
@@ -44,7 +44,6 @@ type Peer struct {
 	inPolicies            []*policy.Policy
 	defaultInPolicy       config.DefaultPolicyType
 	isConfederationMember bool
-	isEBGP                bool
 }
 
 func NewPeer(g config.Global, conf config.Neighbor) *Peer {
@@ -61,17 +60,19 @@ func NewPeer(g config.Global, conf config.Neighbor) *Peer {
 		k, _ := bgp.GetRouteFamily(rf.AfiSafiName)
 		peer.rfMap[k] = true
 	}
+	id := net.ParseIP(string(conf.RouteReflector.RouteReflectorConfig.RouteReflectorClusterId)).To4()
 	peer.peerInfo = &table.PeerInfo{
-		AS:      conf.NeighborConfig.PeerAs,
-		LocalAS: g.GlobalConfig.As,
-		LocalID: g.GlobalConfig.RouterId,
-		Address: conf.NeighborConfig.NeighborAddress,
+		AS:                      conf.NeighborConfig.PeerAs,
+		LocalAS:                 g.GlobalConfig.As,
+		LocalID:                 g.GlobalConfig.RouterId,
+		Address:                 conf.NeighborConfig.NeighborAddress,
+		RouteReflectorClient:    peer.isRouteReflectorClient(),
+		RouteReflectorClusterID: id,
 	}
 	peer.adjRib = table.NewAdjRib(peer.configuredRFlist())
 	peer.fsm = NewFSM(&g, &conf)
 
 	if conf.NeighborConfig.PeerAs != g.GlobalConfig.As {
-		peer.isEBGP = true
 		for _, member := range g.Confederation.ConfederationConfig.MemberAs {
 			if member == conf.NeighborConfig.PeerAs {
 				peer.isConfederationMember = true
@@ -83,10 +84,22 @@ func NewPeer(g config.Global, conf config.Neighbor) *Peer {
 	return peer
 }
 
+func (peer *Peer) isEBGPPeer() bool {
+	return peer.conf.NeighborConfig.PeerAs != peer.gConf.GlobalConfig.As
+}
+
+func (peer *Peer) isIBGPPeer() bool {
+	return peer.conf.NeighborConfig.PeerAs == peer.gConf.GlobalConfig.As
+}
+
 func (peer *Peer) isRouteServerClient() bool {
 	return peer.conf.RouteServer.RouteServerConfig.RouteServerClient
 }
 
+func (peer *Peer) isRouteReflectorClient() bool {
+	return peer.conf.RouteReflector.RouteReflectorConfig.RouteReflectorClient
+}
+
 func (peer *Peer) configuredRFlist() []bgp.RouteFamily {
 	rfList := []bgp.RouteFamily{}
 	for _, rf := range peer.conf.AfiSafis.AfiSafiList {
@@ -177,7 +190,7 @@ func (peer *Peer) handleBGPmessage(m *bgp.BGPMessage) ([]*table.Path, bool, []*b
 		update = true
 		peer.conf.Timers.TimersState.UpdateRecvTime = time.Now().Unix()
 		body := m.Body.(*bgp.BGPUpdate)
-		confedCheckRequired := !peer.isConfederationMember && peer.isEBGP
+		confedCheckRequired := !peer.isConfederationMember && peer.isEBGPPeer()
 		_, err := bgp.ValidateUpdateMsg(body, peer.rfMap, confedCheckRequired)
 		if err != nil {
 			log.WithFields(log.Fields{
@@ -213,8 +226,7 @@ func (peer *Peer) startFSMHandler(incoming chan *fsmMsg) {
 }
 
 func (peer *Peer) PassConn(conn *net.TCPConn) {
-	isEBGP := peer.gConf.GlobalConfig.As != peer.conf.NeighborConfig.PeerAs
-	if isEBGP {
+	if peer.isEBGPPeer() {
 		ttl := 1
 		SetTcpTTLSockopts(conn, ttl)
 	}
diff --git a/server/server.go b/server/server.go
index 51b84c73..92e3d178 100644
--- a/server/server.go
+++ b/server/server.go
@@ -378,16 +378,56 @@ func filterpath(peer *Peer, pathList []*table.Path) []*table.Path {
 			continue
 		}
 
-		selfGenerated := path.GetSource().ID == nil
-		fromAS := path.GetSource().AS
-		myAS := peer.gConf.GlobalConfig.As
-		if !selfGenerated && !peer.isEBGP && myAS == fromAS {
-			log.WithFields(log.Fields{
-				"Topic": "Peer",
-				"Key":   peer.conf.NeighborConfig.NeighborAddress,
-				"Data":  path,
-			}).Debug("From same AS, ignore.")
-			continue
+		//iBGP handling
+		if !path.IsLocal() && peer.isIBGPPeer() {
+			ignore := true
+			info := path.GetSource()
+
+			//if the path comes from eBGP peer
+			if info.AS != peer.conf.NeighborConfig.PeerAs {
+				ignore = false
+			}
+			// RFC4456 8. Avoiding Routing Information Loops
+			// A router that recognizes the ORIGINATOR_ID attribute SHOULD
+			// ignore a route received with its BGP Identifier as the ORIGINATOR_ID.
+			if id := path.GetOriginatorID(); peer.gConf.GlobalConfig.RouterId.Equal(id) {
+				log.WithFields(log.Fields{
+					"Topic":        "Peer",
+					"Key":          peer.conf.NeighborConfig.NeighborAddress,
+					"OriginatorID": id,
+					"Data":         path,
+				}).Debug("Originator ID is mine, ignore")
+				continue
+			}
+			if info.RouteReflectorClient {
+				ignore = false
+			}
+			if peer.isRouteReflectorClient() {
+				// RFC4456 8. Avoiding Routing Information Loops
+				// If the local CLUSTER_ID is found in the CLUSTER_LIST,
+				// the advertisement received SHOULD be ignored.
+				for _, clusterId := range path.GetClusterList() {
+					if clusterId.Equal(peer.peerInfo.RouteReflectorClusterID) {
+						log.WithFields(log.Fields{
+							"Topic":     "Peer",
+							"Key":       peer.conf.NeighborConfig.NeighborAddress,
+							"ClusterID": clusterId,
+							"Data":      path,
+						}).Debug("cluster list path attribute has local cluster id, ignore")
+						continue
+					}
+				}
+				ignore = false
+			}
+
+			if ignore {
+				log.WithFields(log.Fields{
+					"Topic": "Peer",
+					"Key":   peer.conf.NeighborConfig.NeighborAddress,
+					"Data":  path,
+				}).Debug("From same AS, ignore.")
+				continue
+			}
 		}
 
 		if peer.conf.NeighborConfig.NeighborAddress.Equal(path.GetSource().Address) {
@@ -568,14 +608,14 @@ func (server *BgpServer) broadcastPeerState(peer *Peer) {
 	server.broadcastReqs = remainReqs
 }
 
-func (server *BgpServer) propagateUpdate(neighborAddress string, RouteServerClient bool, pathList []*table.Path) []*SenderMsg {
+func (server *BgpServer) propagateUpdate(peer *Peer, pathList []*table.Path) []*SenderMsg {
 	msgs := make([]*SenderMsg, 0)
 
-	if RouteServerClient {
-		p := server.neighborMap[neighborAddress]
-		newPathList := applyPolicies(p, nil, POLICY_DIRECTION_IN, pathList)
+	if peer != nil && peer.isRouteServerClient() {
+		newPathList := applyPolicies(peer, nil, POLICY_DIRECTION_IN, pathList)
 		for _, loc := range server.localRibMap {
 			targetPeer := server.neighborMap[loc.OwnerName()]
+			neighborAddress := peer.conf.NeighborConfig.NeighborAddress.String()
 			if loc.isGlobal() || loc.OwnerName() == neighborAddress {
 				continue
 			}
@@ -695,8 +735,7 @@ func (server *BgpServer) handleFSMMessage(peer *Peer, e *fsmMsg, incoming chan *
 					server.roaClient.validate(pathList)
 				}
 			}
-			msgs = append(msgs, server.propagateUpdate(peer.conf.NeighborConfig.NeighborAddress.String(),
-				peer.isRouteServerClient(), pathList)...)
+			msgs = append(msgs, server.propagateUpdate(peer, pathList)...)
 		default:
 			log.WithFields(log.Fields{
 				"Topic": "Peer",
@@ -1156,7 +1195,7 @@ func (server *BgpServer) handleGrpc(grpcReq *GrpcRequest) []*SenderMsg {
 	case REQ_MOD_PATH:
 		pathList := server.handleModPathRequest(grpcReq)
 		if len(pathList) > 0 {
-			msgs = server.propagateUpdate("", false, pathList)
+			msgs = server.propagateUpdate(nil, pathList)
 			grpcReq.ResponseCh <- &GrpcResponse{}
 			close(grpcReq.ResponseCh)
 		}
@@ -1282,7 +1321,7 @@ func (server *BgpServer) handleGrpc(grpcReq *GrpcRequest) []*SenderMsg {
 			break
 		}
 		pathList := peer.adjRib.GetInPathList(grpcReq.RouteFamily)
-		msgs = server.propagateUpdate(peer.conf.NeighborConfig.NeighborAddress.String(), peer.isRouteServerClient(), pathList)
+		msgs = server.propagateUpdate(peer, pathList)
 
 		if grpcReq.RequestType == REQ_NEIGHBOR_SOFT_RESET_IN {
 			grpcReq.ResponseCh <- &GrpcResponse{}
@@ -1488,7 +1527,7 @@ func (server *BgpServer) handleGrpc(grpcReq *GrpcRequest) []*SenderMsg {
 	case REQ_VRF, REQ_VRFS, REQ_VRF_MOD:
 		pathList := server.handleVrfRequest(grpcReq)
 		if len(pathList) > 0 {
-			msgs = server.propagateUpdate("", false, pathList)
+			msgs = server.propagateUpdate(nil, pathList)
 		}
 	default:
 		errmsg := fmt.Errorf("Unknown request type: %v", grpcReq.RequestType)