diff options
| author | Russ White <russ@riw.us> | 2022-06-23 07:00:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-23 07:00:33 -0400 |
| commit | 98b3ab772e994ac39a005b144cc2fc6da535d345 (patch) | |
| tree | 8733d372eb6b3c36ec4af5563fcdb9494ebb6fb6 /lib/zclient.c | |
| parent | 2d088d8d535de7ef084b4583cdfda4b48a324a62 (diff) | |
| parent | 5609e70fb87a3b23b55629a33e5afb298974c142 (diff) | |
Merge pull request #10629 from leonshaw/fix/mp-evpn-nh
lib, zebra, bgpd: Move route EVPN flag to nexthop
Diffstat (limited to 'lib/zclient.c')
| -rw-r--r-- | lib/zclient.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/zclient.c b/lib/zclient.c index a933b6bb2b..e556b768ac 100644 --- a/lib/zclient.c +++ b/lib/zclient.c @@ -1038,7 +1038,7 @@ int zapi_nexthop_encode(struct stream *s, const struct zapi_nexthop *api_nh, stream_putl(s, api_nh->weight); /* Router MAC for EVPN routes. */ - if (CHECK_FLAG(api_flags, ZEBRA_FLAG_EVPN_ROUTE)) + if (CHECK_FLAG(nh_flags, ZAPI_NEXTHOP_FLAG_EVPN)) stream_put(s, &(api_nh->rmac), sizeof(struct ethaddr)); @@ -1402,7 +1402,7 @@ int zapi_nexthop_decode(struct stream *s, struct zapi_nexthop *api_nh, STREAM_GETL(s, api_nh->weight); /* Router MAC for EVPN routes. */ - if (CHECK_FLAG(api_flags, ZEBRA_FLAG_EVPN_ROUTE)) + if (CHECK_FLAG(api_nh->flags, ZAPI_NEXTHOP_FLAG_EVPN)) STREAM_GET(&(api_nh->rmac), s, sizeof(struct ethaddr)); @@ -1830,6 +1830,9 @@ int zapi_nexthop_from_nexthop(struct zapi_nexthop *znh, if (CHECK_FLAG(nh->flags, NEXTHOP_FLAG_ONLINK)) SET_FLAG(znh->flags, ZAPI_NEXTHOP_FLAG_ONLINK); + if (CHECK_FLAG(nh->flags, NEXTHOP_FLAG_EVPN)) + SET_FLAG(znh->flags, ZAPI_NEXTHOP_FLAG_EVPN); + if (nh->nh_label && (nh->nh_label->num_labels > 0)) { /* Validate */ |