summaryrefslogtreecommitdiffhomepage
path: root/pkg
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@gmail.com>2019-03-29 12:50:10 +0900
committerFUJITA Tomonori <fujita.tomonori@gmail.com>2019-03-29 14:00:13 +0900
commit49448ac67d61bf769e0b443a4dccd9972ebae117 (patch)
tree1c4e3368e103fdda90f36193eab053bba3416d51 /pkg
parent8ee5f62074c63d82eed8082102737f7a4a3d4080 (diff)
server: fix ListPath handle UseMultiPath option
Signed-off-by: FUJITA Tomonori <fujita.tomonori@gmail.com>
Diffstat (limited to 'pkg')
-rw-r--r--pkg/server/server.go13
1 files changed, 9 insertions, 4 deletions
diff --git a/pkg/server/server.go b/pkg/server/server.go
index 249b791c..229f1a8f 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -2417,12 +2417,17 @@ func (s *BgpServer) ListPath(ctx context.Context, r *api.ListPathRequest, fn fun
Prefix: dst.GetNlri().String(),
Paths: make([]*api.Path, 0, len(dst.GetAllKnownPathList())),
}
- for i, path := range dst.GetAllKnownPathList() {
+ knownPathList := dst.GetAllKnownPathList()
+ for i, path := range knownPathList {
p := toPathApi(path, getValidation(v, idx))
idx++
- if i == 0 && !table.SelectionOptions.DisableBestPathSelection {
- switch r.TableType {
- case api.TableType_LOCAL, api.TableType_GLOBAL:
+ if !table.SelectionOptions.DisableBestPathSelection {
+ if i == 0 {
+ switch r.TableType {
+ case api.TableType_LOCAL, api.TableType_GLOBAL:
+ p.Best = true
+ }
+ } else if s.bgpConfig.Global.UseMultiplePaths.Config.Enabled && path.Equal(knownPathList[i-1]) {
p.Best = true
}
}