VPP-15 Add ethernet support for nsh-gre's decap-next

[vpp.git] / vnet / vnet / nsh-gre / nsh_gre.c

diff --git a/vnet/vnet/nsh-gre/nsh_gre.c b/vnet/vnet/nsh-gre/nsh_gre.c
index f85e71a..ee968a3 100644 (file)
--- a/vnet/vnet/nsh-gre/nsh_gre.c
+++ b/vnet/vnet/nsh-gre/nsh_gre.c
@@ -34,6 +34,8 @@ static u8 * format_decap_next (u8 * s, va_list * args)
       return format (s, "ip4");
     case NSH_INPUT_NEXT_IP6_INPUT:
       return format (s, "ip6");
+    case NSH_INPUT_NEXT_ETHERNET_INPUT:
+      return format (s, "ethernet");
     default:
       return format (s, "index %d", next_index);
     }
@@ -214,7 +216,7 @@ static int nsh_gre_rewrite (nsh_gre_tunnel_t * t)
 
   /* Copy any TLVs */
   if (vec_len(t->tlvs))
-    memcpy (nsh0->tlvs, t->tlvs, 4*vec_len(t->tlvs));
+    clib_memcpy (nsh0->tlvs, t->tlvs, 4*vec_len(t->tlvs));
 
   t->rewrite = rw;
   return (0);
@@ -338,7 +340,7 @@ static uword unformat_decap_next (unformat_input_t * input, va_list * args)
   else if (unformat (input, "ip6"))
     *result = NSH_INPUT_NEXT_IP6_INPUT;
   else if (unformat (input, "ethernet"))
-    *result = NSH_INPUT_NEXT_IP6_INPUT;
+    *result = NSH_INPUT_NEXT_ETHERNET_INPUT;
   else if (unformat (input, "%d", &tmp))
     *result = tmp;
   else