diff options
| author |   Neale Ranns <nranns@cisco.com> | 2017-12-05 13:24:04 -0800 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2017-12-09 20:55:08 +0000 |
| commit | 9128637ee8f7b0d903551f165a1447d427e8dd19 (patch) | |
| tree | 244014dd1064643946d64066e352ee1627bf622c /src/vnet/bier/bier_disp_entry.c | |
| parent | cef87f1a5eb4d69cf11ce1cd3c5506edcfba74c4 (diff) | |
BIER in non-MPLS netowrks
as decsribed in section 2.2
ihttps://tools.ietf.org/html/draft-ietf-bier-mpls-encapsulation-10
with BIFT encoding from:
https://tools.ietf.org/html/draft-wijnandsxu-bier-non-mpls-bift-encoding-00
changes:
1 - introduce the new BIFT lookup table. BIER tables that have an associated
MPLS label are added to the MPLS-FIB. Those that don't are added to the
BIER table
2 - BIER routes that have no associated output MPLS label will add a BIFT label.
3 - The BIER FMask has a path-list as a member to resolve via any possible path.
Change-Id: I1fd4d9dbd074f0e855c16e9329b81460ebe1efce
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet/bier/bier_disp_entry.c')
| -rw-r--r-- | src/vnet/bier/bier_disp_entry.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/vnet/bier/bier_disp_entry.c b/src/vnet/bier/bier_disp_entry.c index 3326aba2f86..2fe2e4ab909 100644 --- a/src/vnet/bier/bier_disp_entry.c +++ b/src/vnet/bier/bier_disp_entry.c @@ -145,6 +145,7 @@ bier_disp_entry_restack (bier_disp_entry_t *bde, fib_path_list_contribute_forwarding(pli, fib_forw_chain_type_from_dpo_proto( bier_hdr_proto_to_dpo(pproto)), + FIB_PATH_LIST_FWD_FLAG_COLLAPSE, &via_dpo); bier_disp_entry_path_list_walk_ctx_t ctx = { @@ -254,24 +255,26 @@ format_bier_disp_entry (u8* s, va_list *args) bde = bier_disp_entry_get(bdei); - s = format(s, "bier-disp:[%d]", bdei); + s = format(s, "%Ubier-disp:[%d]", format_white_space, indent, bdei); FOR_EACH_BIER_HDR_PROTO(pproto) { if (INDEX_INVALID != bde->bde_pl[pproto]) { - s = format(s, "\n"); - s = fib_path_list_format(bde->bde_pl[pproto], s); + s = format(s, "\n%U%U\n", + format_white_space, indent+2, + format_bier_hdr_proto, pproto); + s = format(s, "%U", format_fib_path_list, bde->bde_pl[pproto], indent+4); if (flags & BIER_SHOW_DETAIL) { s = format(s, "\n%UForwarding:", - format_white_space, indent); + format_white_space, indent+4); s = format(s, "\n%Urpf-id:%d", - format_white_space, indent+1, + format_white_space, indent+6, bde->bde_fwd[pproto].bde_rpf_id); s = format(s, "\n%U%U", - format_white_space, indent+1, + format_white_space, indent+6, format_dpo_id, &bde->bde_fwd[pproto].bde_dpo, indent+2); } } |