dns, dhcp: on-demand udp port registration

[vpp.git] / src / vnet / dhcp / dhcp4_proxy_node.c

diff --git a/src/vnet/dhcp/dhcp4_proxy_node.c b/src/vnet/dhcp/dhcp4_proxy_node.c
index 6b15c51..99e5a73 100644 (file)
--- a/src/vnet/dhcp/dhcp4_proxy_node.c
+++ b/src/vnet/dhcp/dhcp4_proxy_node.c
@@ -685,7 +685,7 @@ dhcp_proxy_to_client_input (vlib_main_t * vm,
       hi0 = vnet_get_sup_hw_interface (vnm, original_sw_if_index);
       ei0 = pool_elt_at_index (em->interfaces, hi0->hw_instance);
       clib_memcpy (mac0->src_address, ei0->address, sizeof (ei0->address));
-      memset (mac0->dst_address, 0xff, sizeof (mac0->dst_address));
+      clib_memset (mac0->dst_address, 0xff, sizeof (mac0->dst_address));
       mac0->type = (si0->type == VNET_SW_INTERFACE_TYPE_SUB) ?
        clib_net_to_host_u16 (0x8100) : clib_net_to_host_u16 (0x0800);
 
@@ -736,14 +736,14 @@ VLIB_REGISTER_NODE (dhcp_proxy_to_client_node, static) = {
 };
 /* *INDENT-ON* */
 
-static clib_error_t *
-dhcp4_proxy_init (vlib_main_t * vm)
+void
+dhcp_maybe_register_udp_ports (void)
 {
   dhcp_proxy_main_t *dm = &dhcp_proxy_main;
-  vlib_node_t *error_drop_node;
+  vlib_main_t *vm = dm->vlib_main;
 
-  error_drop_node = vlib_get_node_by_name (vm, (u8 *) "error-drop");
-  dm->error_drop_node_index = error_drop_node->index;
+  if (dm->udp_ports_registered)
+    return;
 
   udp_register_dst_port (vm, UDP_DST_PORT_dhcp_to_client,
                         dhcp_proxy_to_client_node.index, 1 /* is_ip4 */ );
@@ -751,6 +751,19 @@ dhcp4_proxy_init (vlib_main_t * vm)
   udp_register_dst_port (vm, UDP_DST_PORT_dhcp_to_server,
                         dhcp_proxy_to_server_node.index, 1 /* is_ip4 */ );
 
+  dm->udp_ports_registered = 1;
+}
+
+static clib_error_t *
+dhcp4_proxy_init (vlib_main_t * vm)
+{
+  dhcp_proxy_main_t *dm = &dhcp_proxy_main;
+  vlib_node_t *error_drop_node;
+
+  error_drop_node = vlib_get_node_by_name (vm, (u8 *) "error-drop");
+  dm->error_drop_node_index = error_drop_node->index;
+  dm->vlib_main = vm;
+
   return 0;
 }
 
@@ -777,6 +790,8 @@ dhcp4_proxy_set_server (ip46_address_t * addr,
   if (ip46_address_is_zero (src_addr))
     return VNET_API_ERROR_INVALID_SRC_ADDRESS;
 
+  dhcp_maybe_register_udp_ports ();
+
   rx_fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP4,
                                                    rx_table_id,
                                                    FIB_SOURCE_DHCP);
@@ -818,8 +833,8 @@ dhcp4_proxy_set_command_fn (vlib_main_t * vm,
   int is_del = 0;
   int set_src = 0, set_server = 0;
 
-  memset (&server_addr, 0, sizeof (server_addr));
-  memset (&src_addr, 0, sizeof (src_addr));
+  clib_memset (&server_addr, 0, sizeof (server_addr));
+  clib_memset (&src_addr, 0, sizeof (src_addr));
 
   while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
     {