From f03becacfedc8a35d8cb711dcaf4fbeb5ba293cc Mon Sep 17 00:00:00 2001 From: Jakub Grajciar Date: Fri, 24 May 2019 08:25:03 +0200 Subject: gre: don't register gre input nodes unless a gre tunnel is created Change-Id: Id5c0f420e32e0504cea660fed2013f3ad28088aa Signed-off-by: Jakub Grajciar --- src/vnet/gre/interface.c | 4 ++++ src/vnet/gre/node.c | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/vnet') diff --git a/src/vnet/gre/interface.c b/src/vnet/gre/interface.c index 2025838d9ad..ea93536fb27 100644 --- a/src/vnet/gre/interface.c +++ b/src/vnet/gre/interface.c @@ -306,6 +306,10 @@ vnet_gre_tunnel_add (vnet_gre_tunnel_add_del_args_t * a, if (sw_if_indexp) *sw_if_indexp = sw_if_index; + /* register gre46-input nodes */ + ip4_register_protocol (IP_PROTOCOL_GRE, gre4_input_node.index); + ip6_register_protocol (IP_PROTOCOL_GRE, gre6_input_node.index); + return 0; } diff --git a/src/vnet/gre/node.c b/src/vnet/gre/node.c index ff74d1b4e79..891fc9c08d4 100644 --- a/src/vnet/gre/node.c +++ b/src/vnet/gre/node.c @@ -577,9 +577,6 @@ gre_input_init (vlib_main_t * vm) gre_register_input_protocol (vm, GRE_PROTOCOL_mpls_unicast, mpls_unicast_input->index, GRE_TUNNEL_TYPE_L3); - ip4_register_protocol (IP_PROTOCOL_GRE, gre4_input_node.index); - ip6_register_protocol (IP_PROTOCOL_GRE, gre6_input_node.index); - return 0; } -- cgit 1.2.3-korg