summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2018-10-23 10:47:36 -0400
committerDamjan Marion <dmarion@me.com>2018-10-23 21:48:22 +0000
commit8a9566ebe0bb4644c0dbd118dc1292eca0b7d3e4 (patch)
tree2ddb6e1c5349ebf77423bc053e84ccb47b0c36f9 /src
parentbf4d5ce58435d3f424749ff69650ea67ce778f04 (diff)
dns, dhcp: on-demand udp port registration
Change-Id: I8bf411adc6c5f4caa349d161174b544d2de3ad1d Signed-off-by: Dave Barach <dave@barachs.net>
Diffstat (limited to 'src')
-rw-r--r--src/vnet/dhcp/client.c1
-rw-r--r--src/vnet/dhcp/dhcp4_proxy_node.c25
-rw-r--r--src/vnet/dhcp/dhcp_proxy.h12
-rw-r--r--src/vnet/dns/dns.c29
-rw-r--r--src/vnet/dns/dns.h3
5 files changed, 54 insertions, 16 deletions
diff --git a/src/vnet/dhcp/client.c b/src/vnet/dhcp/client.c
index 32333054fa3..1c52b0cbdbb 100644
--- a/src/vnet/dhcp/client.c
+++ b/src/vnet/dhcp/client.c
@@ -907,6 +907,7 @@ dhcp_client_add_del (dhcp_client_add_del_args_t * a)
if (a->is_add)
{
+ dhcp_maybe_register_udp_ports ();
pool_get (dcm->clients, c);
clib_memset (c, 0, sizeof (*c));
c->state = DHCP_DISCOVER;
diff --git a/src/vnet/dhcp/dhcp4_proxy_node.c b/src/vnet/dhcp/dhcp4_proxy_node.c
index 97ed3b5920a..99e5a739f74 100644
--- a/src/vnet/dhcp/dhcp4_proxy_node.c
+++ b/src/vnet/dhcp/dhcp4_proxy_node.c
@@ -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);
diff --git a/src/vnet/dhcp/dhcp_proxy.h b/src/vnet/dhcp/dhcp_proxy.h
index ec43769d643..f8fc2902684 100644
--- a/src/vnet/dhcp/dhcp_proxy.h
+++ b/src/vnet/dhcp/dhcp_proxy.h
@@ -146,11 +146,23 @@ typedef struct
/* hash lookup specific vrf_id -> option 82 vss suboption */
u32 *vss_index_by_rx_fib_index[DHCP_N_PROTOS];
+
+ /* udp ports have been registered */
+ int udp_ports_registered;
+
+ /* convenience */
+ vlib_main_t *vlib_main;
+
} dhcp_proxy_main_t;
extern dhcp_proxy_main_t dhcp_proxy_main;
/**
+ * @brief Register the dhcp client and server ports, if not already done
+ */
+void dhcp_maybe_register_udp_ports (void);
+
+/**
* @brief Send the details of a proxy session to the API client during a dump
*/
void dhcp_send_details (fib_protocol_t proto,
diff --git a/src/vnet/dns/dns.c b/src/vnet/dns/dns.c
index 54b75aa1708..93b7fb8b9f4 100644
--- a/src/vnet/dns/dns.c
+++ b/src/vnet/dns/dns.c
@@ -72,6 +72,7 @@ dns_enable_disable (dns_main_t * dm, int is_enable)
{
vlib_thread_main_t *tm = &vlib_thread_main;
u32 n_vlib_mains = tm->n_vlib_mains;
+ vlib_main_t *vm = dm->vlib_main;
if (is_enable)
{
@@ -79,6 +80,23 @@ dns_enable_disable (dns_main_t * dm, int is_enable)
&& (vec_len (dm->ip6_name_servers) == 0))
return VNET_API_ERROR_NO_NAME_SERVERS;
+ if (dm->udp_ports_registered == 0)
+ {
+ udp_register_dst_port (vm, UDP_DST_PORT_dns_reply,
+ dns46_reply_node.index, 1 /* is_ip4 */ );
+
+ udp_register_dst_port (vm, UDP_DST_PORT_dns_reply6,
+ dns46_reply_node.index, 0 /* is_ip4 */ );
+
+ udp_register_dst_port (vm, UDP_DST_PORT_dns,
+ dns4_request_node.index, 1 /* is_ip4 */ );
+
+ udp_register_dst_port (vm, UDP_DST_PORT_dns6,
+ dns6_request_node.index, 0 /* is_ip4 */ );
+
+ dm->udp_ports_registered = 1;
+ }
+
if (dm->cache_entry_by_name == 0)
{
if (n_vlib_mains > 1)
@@ -1597,17 +1615,6 @@ dns_init (vlib_main_t * vm)
dm->max_ttl_in_seconds = 86400;
dm->random_seed = 0xDEADDABE;
- udp_register_dst_port (vm, UDP_DST_PORT_dns_reply, dns46_reply_node.index,
- 1 /* is_ip4 */ );
-
- udp_register_dst_port (vm, UDP_DST_PORT_dns_reply6, dns46_reply_node.index,
- 0 /* is_ip4 */ );
-
- udp_register_dst_port (vm, UDP_DST_PORT_dns, dns4_request_node.index,
- 1 /* is_ip4 */ );
-
- udp_register_dst_port (vm, UDP_DST_PORT_dns6, dns6_request_node.index,
- 0 /* is_ip4 */ );
return 0;
}
diff --git a/src/vnet/dns/dns.h b/src/vnet/dns/dns.h
index 59a61ed7687..c747e2ecd38 100644
--- a/src/vnet/dns/dns.h
+++ b/src/vnet/dns/dns.h
@@ -101,6 +101,9 @@ typedef struct
/** enable / disable flag */
int is_enabled;
+ /** udp port registration complete */
+ int udp_ports_registered;
+
/** upstream name servers, e.g. 8.8.8.8 */
ip4_address_t *ip4_name_servers;
ip6_address_t *ip6_name_servers;