ip: Use full reassembly for fragments in ip6-local

Type: fix

shallow was the default, but probably by accident as it depended on
module load order.
full assembly is the v4 behaviour.

using proper types allows gdb to print enum names.

Signed-off-by: Neale Ranns <neale@graphiant.com>
Change-Id: If157c5b83614c7adbd7a15a8227a68f8caf4e92c
Signed-off-by: Neale Ranns <nranns@cisco.com>

diff --git a/src/vnet/ip/ip6_forward.c b/src/vnet/ip/ip6_forward.c
index 659955a..7499274 100644 (file)
--- a/src/vnet/ip/ip6_forward.c
+++ b/src/vnet/ip/ip6_forward.c
@@ -1313,7 +1313,7 @@ ip6_local_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
          vlib_prefetch_buffer_data (b[3], LOAD);
        }
 
-      u8 error[2];
+      ip6_error_t error[2];
       error[0] = IP6_ERROR_UNKNOWN_PROTOCOL;
       error[1] = IP6_ERROR_UNKNOWN_PROTOCOL;
 

diff --git a/src/vnet/ip/reass/ip6_sv_reass.c b/src/vnet/ip/reass/ip6_sv_reass.c
index 8bc1fd8..201e5e9 100644 (file)
--- a/src/vnet/ip/reass/ip6_sv_reass.c
+++ b/src/vnet/ip/reass/ip6_sv_reass.c
@@ -983,8 +983,6 @@ ip6_sv_reass_init_function (vlib_main_t * vm)
 
   if ((error = vlib_call_init_function (vm, ip_main_init)))
     return error;
-  ip6_register_protocol (IP_PROTOCOL_IPV6_FRAGMENTATION,
-                        ip6_sv_reass_node.index);
 
   rm->fq_index = vlib_frame_queue_main_init (ip6_sv_reass_node.index, 0);
   rm->fq_feature_index =