diff options
Diffstat (limited to 'zebra/zebra_srte.c')
| -rw-r--r-- | zebra/zebra_srte.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/zebra/zebra_srte.c b/zebra/zebra_srte.c index 6dd60af9fb..7933ef66b1 100644 --- a/zebra/zebra_srte.c +++ b/zebra/zebra_srte.c @@ -99,7 +99,7 @@ struct zebra_sr_policy *zebra_sr_policy_find_by_name(char *name) static int zebra_sr_policy_notify_update_client(struct zebra_sr_policy *policy, struct zserv *client) { - const zebra_nhlfe_t *nhlfe; + const struct zebra_nhlfe *nhlfe; struct stream *s; uint32_t message = 0; unsigned long nump = 0; @@ -116,6 +116,7 @@ static int zebra_sr_policy_notify_update_client(struct zebra_sr_policy *policy, SET_FLAG(message, ZAPI_MESSAGE_SRTE); stream_putl(s, message); + stream_putw(s, SAFI_UNICAST); switch (policy->endpoint.ipa_type) { case IPADDR_V4: stream_putw(s, AF_INET); @@ -196,7 +197,7 @@ static void zebra_sr_policy_notify_update(struct zebra_sr_policy *policy) exit(1); } - rnh = zebra_lookup_rnh(&p, zvrf_id(zvrf), RNH_NEXTHOP_TYPE); + rnh = zebra_lookup_rnh(&p, zvrf_id(zvrf), SAFI_UNICAST); if (!rnh) return; @@ -205,13 +206,13 @@ static void zebra_sr_policy_notify_update(struct zebra_sr_policy *policy) zebra_sr_policy_notify_update_client(policy, client); else /* Fallback to the IGP shortest path. */ - zebra_send_rnh_update(rnh, client, RNH_NEXTHOP_TYPE, - zvrf_id(zvrf), policy->color); + zebra_send_rnh_update(rnh, client, zvrf_id(zvrf), + policy->color); } } static void zebra_sr_policy_activate(struct zebra_sr_policy *policy, - zebra_lsp_t *lsp) + struct zebra_lsp *lsp) { policy->status = ZEBRA_SR_POLICY_UP; policy->lsp = lsp; @@ -222,7 +223,7 @@ static void zebra_sr_policy_activate(struct zebra_sr_policy *policy, } static void zebra_sr_policy_update(struct zebra_sr_policy *policy, - zebra_lsp_t *lsp, + struct zebra_lsp *lsp, struct zapi_srte_tunnel *old_tunnel) { bool bsid_changed; @@ -267,7 +268,7 @@ int zebra_sr_policy_validate(struct zebra_sr_policy *policy, struct zapi_srte_tunnel *new_tunnel) { struct zapi_srte_tunnel old_tunnel = policy->segment_list; - zebra_lsp_t *lsp; + struct zebra_lsp *lsp; if (new_tunnel) policy->segment_list = *new_tunnel; @@ -293,7 +294,7 @@ int zebra_sr_policy_validate(struct zebra_sr_policy *policy, int zebra_sr_policy_bsid_install(struct zebra_sr_policy *policy) { struct zapi_srte_tunnel *zt = &policy->segment_list; - zebra_nhlfe_t *nhlfe; + struct zebra_nhlfe *nhlfe; if (zt->local_label == MPLS_LABEL_NONE) return 0; |