diff options
Diffstat (limited to 'src/vnet')
| -rw-r--r-- | src/vnet/vxlan-gbp/vxlan_gbp.c | 44 | ||||
| -rw-r--r-- | src/vnet/vxlan-gbp/vxlan_gbp.h | 5 |
2 files changed, 44 insertions, 5 deletions
diff --git a/src/vnet/vxlan-gbp/vxlan_gbp.c b/src/vnet/vxlan-gbp/vxlan_gbp.c index 45e4fdc390c..ec4f923bdbc 100644 --- a/src/vnet/vxlan-gbp/vxlan_gbp.c +++ b/src/vnet/vxlan-gbp/vxlan_gbp.c @@ -352,6 +352,42 @@ mcast_shared_remove (ip46_address_t * dst) hash_unset_mem_free (&vxlan_gbp_main.mcast_shared, dst); } +inline void +vxlan_gbp_register_udp_ports (void) +{ + vxlan_gbp_main_t *vxm = &vxlan_gbp_main; + + if (vxm->udp_ports_registered == 0) + { + udp_register_dst_port (vxm->vlib_main, UDP_DST_PORT_vxlan_gbp, + vxlan4_gbp_input_node.index, /* is_ip4 */ 1); + udp_register_dst_port (vxm->vlib_main, UDP_DST_PORT_vxlan6_gbp, + vxlan6_gbp_input_node.index, /* is_ip4 */ 0); + } + /* + * Counts the number of vxlan_gbp tunnels + */ + vxm->udp_ports_registered += 1; +} + +inline void +vxlan_gbp_unregister_udp_ports (void) +{ + vxlan_gbp_main_t *vxm = &vxlan_gbp_main; + + ASSERT (vxm->udp_ports_registered != 0); + + if (vxm->udp_ports_registered == 1) + { + udp_unregister_dst_port (vxm->vlib_main, UDP_DST_PORT_vxlan_gbp, + /* is_ip4 */ 1); + udp_unregister_dst_port (vxm->vlib_main, UDP_DST_PORT_vxlan6_gbp, + /* is_ip4 */ 0); + } + + vxm->udp_ports_registered -= 1; +} + int vnet_vxlan_gbp_tunnel_add_del (vnet_vxlan_gbp_tunnel_add_del_args_t * a, u32 * sw_if_indexp) { @@ -455,6 +491,8 @@ int vnet_vxlan_gbp_tunnel_add_del return VNET_API_ERROR_INVALID_REGISTRATION; } + vxlan_gbp_register_udp_ports (); + t->hw_if_index = vnet_register_interface (vnm, vxlan_gbp_device_class.index, dev_instance, vxlan_gbp_hw_class.index, dev_instance); @@ -608,6 +646,7 @@ int vnet_vxlan_gbp_tunnel_add_del mcast_shared_remove (&t->dst); } + vxlan_gbp_unregister_udp_ports (); vnet_delete_hw_interface (vnm, t->hw_if_index); hash_unset (vxm->instance_used, t->user_instance); @@ -1088,11 +1127,6 @@ vxlan_gbp_init (vlib_main_t * vm) sizeof (ip46_address_t), sizeof (mcast_shared_t)); - udp_register_dst_port (vm, UDP_DST_PORT_vxlan_gbp, - vxlan4_gbp_input_node.index, /* is_ip4 */ 1); - udp_register_dst_port (vm, UDP_DST_PORT_vxlan6_gbp, - vxlan6_gbp_input_node.index, /* is_ip4 */ 0); - fib_node_register_type (FIB_NODE_TYPE_VXLAN_GBP_TUNNEL, &vxlan_gbp_vft); return 0; diff --git a/src/vnet/vxlan-gbp/vxlan_gbp.h b/src/vnet/vxlan-gbp/vxlan_gbp.h index 755205fc9ea..f9edcdcbd93 100644 --- a/src/vnet/vxlan-gbp/vxlan_gbp.h +++ b/src/vnet/vxlan-gbp/vxlan_gbp.h @@ -162,6 +162,9 @@ typedef struct /* Mapping from sw_if_index to tunnel index */ u32 *tunnel_index_by_sw_if_index; + /* On demand udp port registration */ + u32 udp_ports_registered; + /* convenience */ vlib_main_t *vlib_main; vnet_main_t *vnet_main; @@ -176,6 +179,8 @@ extern vlib_node_registration_t vxlan4_gbp_input_node; extern vlib_node_registration_t vxlan6_gbp_input_node; extern vlib_node_registration_t vxlan4_gbp_encap_node; extern vlib_node_registration_t vxlan6_gbp_encap_node; +extern void vxlan_gbp_register_udp_ports (void); +extern void vxlan_gbp_unregister_udp_ports (void); u8 *format_vxlan_gbp_encap_trace (u8 * s, va_list * args); |