X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ffib%2Ffib_types.c;h=2fce6a85c741538847c5fbb0dbb1038aab99e6a6;hb=e2fe09742;hp=7b07fa976a4ad14463d98d8f9bc64a40e446eefc;hpb=46023762d1da674ff73954f0d1523d450bfcf03c;p=vpp.git

diff --git a/src/vnet/fib/fib_types.c b/src/vnet/fib/fib_types.c
index 7b07fa976a4..2fce6a85c74 100644
--- a/src/vnet/fib/fib_types.c
+++ b/src/vnet/fib/fib_types.c
@@ -89,6 +89,69 @@ fib_prefix_from_ip46_addr (const ip46_address_t *addr,
     pfx->fp_len = ((ip46_address_is_ip4(addr) ?
 		    32 : 128));
     pfx->fp_addr = *addr;
+    pfx->___fp___pad = 0;
+}
+
+u8 *
+format_fib_route_path_flags (u8 *s, va_list *ap)
+{
+    fib_route_path_flags_t flags = va_arg (*ap, fib_route_path_flags_t);
+
+    if (flags & FIB_ROUTE_PATH_RESOLVE_VIA_HOST)
+        s = format (s, "via-host");
+    if (flags & FIB_ROUTE_PATH_RESOLVE_VIA_ATTACHED)
+        s = format (s, "via-attached,");
+    if (flags & FIB_ROUTE_PATH_LOCAL)
+        s = format (s, "local,");
+    if (flags & FIB_ROUTE_PATH_ATTACHED)
+        s = format (s, "attached,");
+    if (flags & FIB_ROUTE_PATH_DROP)
+         s = format (s, "drop,");
+   if (flags & FIB_ROUTE_PATH_EXCLUSIVE)
+        s = format (s, "exclusive,");
+    if (flags & FIB_ROUTE_PATH_INTF_RX)
+        s = format (s, "intf-rx,");
+    if (flags & FIB_ROUTE_PATH_RPF_ID)
+        s = format (s, "rpf-id,");
+    if (flags & FIB_ROUTE_PATH_SOURCE_LOOKUP)
+        s = format (s, "src-lkup,");
+    if (flags & FIB_ROUTE_PATH_UDP_ENCAP)
+        s = format (s, "udp-encap,");
+    if (flags & FIB_ROUTE_PATH_BIER_FMASK)
+        s = format (s, "bier-fmask,");
+    if (flags & FIB_ROUTE_PATH_BIER_TABLE)
+        s = format (s, "bier-table,");
+    if (flags & FIB_ROUTE_PATH_BIER_IMP)
+        s = format (s, "bier-imp,");
+    if (flags & FIB_ROUTE_PATH_DEAG)
+        s = format (s, "deag,");
+    if (flags & FIB_ROUTE_PATH_DVR)
+        s = format (s, "dvr,");
+    if (flags & FIB_ROUTE_PATH_ICMP_UNREACH)
+        s = format (s, "imcp-unreach,");
+    if (flags & FIB_ROUTE_PATH_ICMP_PROHIBIT)
+        s = format (s, "icmp-prohibit,");
+    if (flags & FIB_ROUTE_PATH_CLASSIFY)
+        s = format (s, "classify,");
+    if (flags & FIB_ROUTE_PATH_POP_PW_CW)
+        s = format (s, "pop-pw-cw,");
+
+    return (s);
+}
+
+u8 *
+format_fib_route_path (u8 *s, va_list *ap)
+{
+    fib_route_path_t *rpath = va_arg (*ap, fib_route_path_t*);
+
+    s = format (s, "%U %U, %U, [%U]",
+                format_dpo_proto, rpath->frp_proto,
+                format_ip46_address, &rpath->frp_addr, IP46_TYPE_ANY,
+                format_vnet_sw_if_index_name, vnet_get_main (),
+                rpath->frp_sw_if_index,
+                format_fib_route_path_flags, rpath->frp_flags);
+
+    return (s);
 }
 
 void
@@ -100,6 +163,14 @@ fib_prefix_from_mpls_label (mpls_label_t label,
     pfx->fp_len = 21;
     pfx->fp_label = label;
     pfx->fp_eos = eos;
+    pfx->___fp___pad = 0;
+}
+
+void
+fib_prefix_copy (fib_prefix_t *dst,
+                 const fib_prefix_t *src)
+{
+    clib_memcpy(dst, src, sizeof(*dst));
 }
 
 int
@@ -159,6 +230,21 @@ fib_prefix_is_cover (const fib_prefix_t *p1,
     return (0);
 }
 
+u8
+fib_prefix_get_host_length (fib_protocol_t proto)
+{
+    switch (proto)
+    {
+    case FIB_PROTOCOL_IP4:
+	return (32);
+    case FIB_PROTOCOL_IP6:
+	return (128);
+    case FIB_PROTOCOL_MPLS:
+	return (21);
+    }
+    return (0);
+}
+
 int
 fib_prefix_is_host (const fib_prefix_t *prefix)
 {
@@ -174,6 +260,25 @@ fib_prefix_is_host (const fib_prefix_t *prefix)
     return (0);
 }
 
+void
+fib_prefix_normalize (const fib_prefix_t *p,
+                      fib_prefix_t *out)
+{
+    fib_prefix_copy (out, p);
+
+    switch (p->fp_proto)
+    {
+    case FIB_PROTOCOL_IP4:
+	ip4_address_normalize(&out->fp_addr.ip4, out->fp_len);
+        break;
+    case FIB_PROTOCOL_IP6:
+	ip6_address_normalize(&out->fp_addr.ip6, out->fp_len);
+        break;
+    case FIB_PROTOCOL_MPLS:
+	break;
+    }
+}
+
 u8 *
 format_fib_prefix (u8 * s, va_list * args)
 {