summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJakub Grajciar <jgrajcia@cisco.com>2019-05-24 08:25:03 +0200
committerOle Trøan <otroan@employees.org>2019-05-28 08:50:21 +0000
commitf03becacfedc8a35d8cb711dcaf4fbeb5ba293cc (patch)
treebd174371956e57efc28c4bc7f6e73dbf16ca3512 /src
parent94e4531a02099eb017e84f42a1d5ed0a43c32dd0 (diff)
gre: don't register gre input nodes unless a gre tunnel is created
Change-Id: Id5c0f420e32e0504cea660fed2013f3ad28088aa Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>
Diffstat (limited to 'src')
-rw-r--r--src/vnet/gre/interface.c4
-rw-r--r--src/vnet/gre/node.c3
2 files changed, 4 insertions, 3 deletions
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;
}