server: fix soft-reset-in to handle in-policy change properly

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

2 files changed, 12 insertions, 1 deletions

diff --git a/table/adj.go b/table/adj.go
index f7914557..65d9d161 100644
--- a/table/adj.go
+++ b/table/adj.go
@@ -75,6 +75,17 @@ func (adj *AdjRib) Update(pathList []*Path) {
 	}
 }
 
+func (adj *AdjRib) RefreshAcceptedNumber(rfList []bgp.RouteFamily) {
+	for _, rf := range rfList {
+		adj.accepted[rf] = 0
+		for _, p := range adj.table[rf] {
+			if p.Filtered(adj.id) != POLICY_DIRECTION_IN {
+				adj.accepted[rf]++
+			}
+		}
+	}
+}
+
 func (adj *AdjRib) PathList(rfList []bgp.RouteFamily, accepted bool) []*Path {
 	pathList := make([]*Path, 0, adj.Count(rfList))
 	for _, rf := range rfList {
diff --git a/table/path.go b/table/path.go
index 65c33a26..12739ec6 100644
--- a/table/path.go
+++ b/table/path.go
@@ -214,7 +214,7 @@ func (path *Path) ToApiStruct(id string) *api.Path {
 		Age:        int64(time.Now().Sub(path.OriginInfo().timestamp).Seconds()),
 		IsWithdraw: path.IsWithdraw,
 		Validation: int32(path.OriginInfo().validation.ToInt()),
-		Filtered:   path.Filtered(id) > POLICY_DIRECTION_NONE,
+		Filtered:   path.Filtered(id) == POLICY_DIRECTION_IN,
 		Family:     family,
 	}
 }