dhcp: resolver process node index in main_t

[vpp.git] / src / vnet / dns / dns.h

diff --git a/src/vnet/dns/dns.h b/src/vnet/dns/dns.h
index c55c6f3..e6944de 100644 (file)
--- a/src/vnet/dns/dns.h
+++ b/src/vnet/dns/dns.h
@@ -23,6 +23,28 @@
 #include <vppinfra/hash.h>
 #include <vnet/dns/dns_packet.h>
 #include <vnet/ip/ip.h>
+#include <vppinfra/lock.h>
+
+typedef struct
+{
+  u32 request_type;
+  u32 client_index;
+  u32 client_context;
+  u8 is_ip6;
+  u16 dst_port;
+  u16 id;
+  u16 pad;
+  u8 dst_address[16];
+  u8 *name;
+} dns_pending_request_t;
+
+typedef enum
+{
+  DNS_API_PENDING_NAME_TO_IP = 1,
+  DNS_API_PENDING_IP_TO_NAME,
+  DNS_PEER_PENDING_NAME_TO_IP,
+  DNS_PEER_PENDING_IP_TO_NAME,
+} dns_pending_request_type_t;
 
 typedef struct
 {
@@ -45,16 +67,14 @@ typedef struct
   int retry_count;
   int server_rotor;
   int server_af;
+  int server_fails;
   f64 retry_timer;
 
   /** Cached dns response */
   u8 *dns_response;
 
-  /** Clients awaiting responses */
-  u32 *api_clients_to_notify;
-  u32 *api_client_contexts;
-  ip4_address_t *ip4_peers_to_notify;
-  ip6_address_t *ip6_peers_to_notify;
+  /** Clients / peers awaiting responses */
+  dns_pending_request_t *pending_requests;
 } dns_cache_entry_t;
 
 #define DNS_CACHE_ENTRY_FLAG_VALID     (1<<0) /**< we have Actual Data */
@@ -77,15 +97,21 @@ typedef struct
 
   /** Find cached record by name */
   uword *cache_entry_by_name;
-  uword *cache_lock;
+  clib_spinlock_t cache_lock;
 
   /** 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;
 
+  /** resolver process node index */
+  u32 resolver_process_node_index;
+
   /** config parameters */
   u32 name_cache_size;
   u32 max_ttl_in_seconds;
@@ -99,9 +125,28 @@ typedef struct
 extern dns_main_t dns_main;
 
 extern vlib_node_registration_t dns46_reply_node;
-extern vlib_node_registration_t dns_resolver_node;
+extern vlib_node_registration_t dns4_request_node;
+extern vlib_node_registration_t dns6_request_node;
+
+#define foreach_dns46_request_error                                     \
+_(NONE, "No error")                                                    \
+_(UNIMPLEMENTED, "Unimplemented")                                       \
+_(PROCESSED, "DNS request pkts processed")                              \
+_(IP_OPTIONS, "DNS pkts with ip options (dropped)")                     \
+_(BAD_REQUEST, "DNS pkts with serious discrepanices (dropped)")         \
+_(TOO_MANY_REQUESTS, "DNS pkts asking too many questions")              \
+_(RESOLUTION_REQUIRED, "DNS pkts pending upstream name resolution")
+
+typedef enum
+{
+#define _(sym,str) DNS46_REQUEST_ERROR_##sym,
+  foreach_dns46_request_error
+#undef _
+    DNS46_REQUEST_N_ERROR,
+} dns46_request_error_t;
 
 #define foreach_dns46_reply_error                       \
+_(DISABLED, "DNS pkts punted (feature disabled)")       \
 _(PROCESSED, "DNS reply pkts processed")                \
 _(NO_ELT, "No DNS pool element")                        \
 _(FORMAT_ERROR, "DNS format errors")                    \
@@ -121,6 +166,28 @@ vnet_dns_cname_indirection_nolock (dns_main_t * dm, u32 ep_index, u8 * reply);
 
 int vnet_dns_delete_entry_by_index_nolock (dns_main_t * dm, u32 index);
 
+int
+vnet_dns_resolve_name (dns_main_t * dm, u8 * name, dns_pending_request_t * t,
+                      dns_cache_entry_t ** retp);
+
+void
+vnet_dns_send_dns6_request (dns_main_t * dm,
+                           dns_cache_entry_t * ep, ip6_address_t * server);
+void
+vnet_dns_send_dns4_request (dns_main_t * dm,
+                           dns_cache_entry_t * ep, ip4_address_t * server);
+
+void vnet_send_dns4_reply (dns_main_t * dm, dns_pending_request_t * t,
+                          dns_cache_entry_t * ep, vlib_buffer_t * b0);
+
+void vnet_send_dns6_reply (dns_main_t * dm, dns_pending_request_t * t,
+                          dns_cache_entry_t * ep, vlib_buffer_t * b0);
+
+u8 *vnet_dns_labels_to_name (u8 * label, u8 * full_text,
+                            u8 ** parse_from_here);
+
+void vnet_dns_create_resolver_process (dns_main_t * dm);
+
 format_function_t format_dns_reply;
 
 static inline void
@@ -128,8 +195,7 @@ dns_cache_lock (dns_main_t * dm)
 {
   if (dm->cache_lock)
     {
-      while (__sync_lock_test_and_set (dm->cache_lock, 1))
-       ;
+      clib_spinlock_lock (&dm->cache_lock);
     }
 }
 
@@ -138,8 +204,7 @@ dns_cache_unlock (dns_main_t * dm)
 {
   if (dm->cache_lock)
     {
-      CLIB_MEMORY_BARRIER ();
-      *dm->cache_lock = 0;
+      clib_spinlock_unlock (&dm->cache_lock);
     }
 }