From: Jakub Grajciar <jgrajcia@cisco.com>
Date: Wed, 22 May 2019 09:51:47 +0000 (+0200)
Subject: gtpu: don't register udp ports unless a tunnel is created
X-Git-Tag: v20.01-rc0~576
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F52%2F19752%2F2;p=vpp.git

gtpu: don't register udp ports unless a tunnel is created

Change-Id: I2945c2a2062ee5eda78f783c55cf16c2d60f959c
Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>
---

diff --git a/src/plugins/gtpu/gtpu.c b/src/plugins/gtpu/gtpu.c
index c3a71ea0f79..7612055ed7f 100644
--- a/src/plugins/gtpu/gtpu.c
+++ b/src/plugins/gtpu/gtpu.c
@@ -620,6 +620,17 @@ int vnet_gtpu_add_del_tunnel
   if (sw_if_indexp)
     *sw_if_indexp = sw_if_index;
 
+  if (a->is_add)
+    {
+      /* register udp ports */
+      if (!is_ip6 && !udp_is_valid_dst_port (UDP_DST_PORT_GTPU, 1))
+	udp_register_dst_port (gtm->vlib_main, UDP_DST_PORT_GTPU,
+			       gtpu4_input_node.index, /* is_ip4 */ 1);
+      if (is_ip6 && !udp_is_valid_dst_port (UDP_DST_PORT_GTPU6, 0))
+	udp_register_dst_port (gtm->vlib_main, UDP_DST_PORT_GTPU6,
+			       gtpu6_input_node.index, /* is_ip4 */ 0);
+    }
+
   return 0;
 }
 
@@ -1102,11 +1113,6 @@ gtpu_init (vlib_main_t * vm)
 				       sizeof (ip46_address_t),
 				       sizeof (mcast_shared_t));
 
-  udp_register_dst_port (vm, UDP_DST_PORT_GTPU,
-			 gtpu4_input_node.index, /* is_ip4 */ 1);
-  udp_register_dst_port (vm, UDP_DST_PORT_GTPU6,
-			 gtpu6_input_node.index, /* is_ip4 */ 0);
-
   gtm->fib_node_type = fib_node_register_new_type (&gtpu_vft);
 
   return 0;