diff options
| author | Hiroki Shirokura <slank.dev@gmail.com> | 2021-04-23 14:46:07 +0200 |
|---|---|---|
| committer | Mark Stapp <mjs@voltanet.io> | 2021-06-02 16:24:48 +0200 |
| commit | c60c1ade86c1c999f5219c0ebc35374acddb661c (patch) | |
| tree | c6ce5abfb04ada0bd371990760691779d925d95b /zebra | |
| parent | zebra: early return on seg6local nlmsg crafting (diff) | |
| download | frr-c60c1ade86c1c999f5219c0ebc35374acddb661c.tar.xz frr-c60c1ade86c1c999f5219c0ebc35374acddb661c.zip | |
*: delete ZEBRA_FLAG_SEG6*_ROUTE and add ZAPI_NEXTHOP_FLAG_SEG6*
https://github.com/FRRouting/frr/pull/5865#discussion_r597670225
As this comment says. ZEBRA_FLAG_XXX should not have been used.
To communicate SRv6 Route Information. A simple Nexthop Flag would
have been sufficient for SRv6 information. And I fixed the whole
thing that way.
Signed-off-by: Hiroki Shirokura <slank.dev@gmail.com>
Diffstat (limited to 'zebra')
| -rw-r--r-- | zebra/zapi_msg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c index f6151463c..06aaa706d 100644 --- a/zebra/zapi_msg.c +++ b/zebra/zapi_msg.c @@ -1748,7 +1748,7 @@ static bool zapi_read_nexthops(struct zserv *client, struct prefix *p, &api_nh->labels[0]); } - if (CHECK_FLAG(flags, ZEBRA_FLAG_SEG6LOCAL_ROUTE) + if (CHECK_FLAG(api_nh->flags, ZAPI_NEXTHOP_FLAG_SEG6LOCAL) && api_nh->type != NEXTHOP_TYPE_BLACKHOLE) { if (IS_ZEBRA_DEBUG_RECV) zlog_debug("%s: adding seg6local action %s", @@ -1761,7 +1761,7 @@ static bool zapi_read_nexthops(struct zserv *client, struct prefix *p, &api_nh->seg6local_ctx); } - if (CHECK_FLAG(flags, ZEBRA_FLAG_SEG6_ROUTE) + if (CHECK_FLAG(api_nh->flags, ZAPI_NEXTHOP_FLAG_SEG6) && api_nh->type != NEXTHOP_TYPE_BLACKHOLE) { if (IS_ZEBRA_DEBUG_RECV) zlog_debug("%s: adding seg6", __func__); |