policy: apply export-policy after normal path-attribute updates

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

1 files changed, 7 insertions, 2 deletions

diff --git a/server/peer.go b/server/peer.go
index e8890bc2..a1738e63 100644
--- a/server/peer.go
+++ b/server/peer.go
@@ -188,14 +188,19 @@ func (peer *Peer) processOutgoingPaths(paths, withdrawals []*table.Path) []*tabl
 		Neighbor: peer.fsm.peerInfo.Address,
 	}
 	for _, path := range paths {
-		path = peer.policy.ApplyPolicy(peer.TableID(), table.POLICY_DIRECTION_EXPORT, filterpath(peer, path), options)
-		if path == nil {
+		if filterpath(peer, path) == nil {
 			continue
 		}
 		if !peer.isRouteServerClient() {
 			path = path.Clone(path.IsWithdraw)
 			path.UpdatePathAttrs(peer.fsm.gConf, peer.fsm.pConf)
 		}
+
+		path = peer.policy.ApplyPolicy(peer.TableID(), table.POLICY_DIRECTION_EXPORT, path, options)
+		if path == nil {
+			continue
+		}
+
 		outgoing = append(outgoing, path)
 	}