dns_core: Create new API ast_dns_resolve_ipv6_and_ipv4

The new function takes in a pointer to an ast_sockaddr structure,
a hostname and an optional port and then dispatches parallel
"AAAA" and "A" record queries.  If an "AAAA" record is returned,
it's parsed into the ast_sockaddr structure along with the port
if it was supplied.  If no "AAAA" record was returned, the
first "A" record returned (if any) is parsed instead.

This is a synchronous call.  If you need asynchronous lookups,
use ast_dns_query_set_resolve_async and roll your own.

Change-Id: I194b0b0e73da94b35cc35263a868ffac3a8d0a95

diff --git a/include/asterisk/dns_core.h b/include/asterisk/dns_core.h
index fe67e340d7dd1a359a4a257c90306f9568dec8c0..d74b0123a3cee7e4817f8afa56ca3fcd026da021 100644 (file)
--- a/include/asterisk/dns_core.h
+++ b/include/asterisk/dns_core.h
@@ -28,6 +28,8 @@
 extern "C" {
 #endif
 
+#include "asterisk/netsock2.h"
+
 /*! \brief Opaque structure for an active DNS query */
 struct ast_dns_query_active;
 
@@ -269,6 +271,26 @@ int ast_dns_resolve_cancel(struct ast_dns_query_active *active);
  */
 int ast_dns_resolve(const char *name, int rr_type, int rr_class, struct ast_dns_result **result);
 
+/*!
+ * \brief Synchronously resolves host to  an AAAA or A record
+ * \since 16.6.0
+ *
+ * \param address A pointer to an ast_sockaddr structure to receive the IPv6 or IPv4 address
+ * \param host The hostname to resolve
+ * \param port (optional) A port to parse into the final ast_sockaddr structure
+ *
+ * \retval 0 success - query was completed and result is available
+ * \retval -1 failure
+ *
+ * \note This function makes parallel queries for both AAAA and A records for the host.
+ *              The first returned AAAA record (if any) is used and if not found, the first A record
+ *              is used.
+ *
+ * \warning This function is synchronous and will block until records are returned or an error
+ *          occurrs.
+ */
+int ast_dns_resolve_ipv6_and_ipv4(struct ast_sockaddr *address, const char *host, const char *port);
+
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

diff --git a/main/dns_core.c b/main/dns_core.c
index 6f37a5d46356af0a670876a026f4fbad218f0c64..f262d7deba33df85b555e6c6c1e85d3d895e3d4c 100644 (file)
--- a/main/dns_core.c
+++ b/main/dns_core.c
@@ -40,6 +40,7 @@
 #include "asterisk/dns_recurring.h"
 #include "asterisk/dns_resolver.h"
 #include "asterisk/dns_internal.h"
+#include "asterisk/netsock2.h"
 
 #include <netinet/in.h>
 #include <arpa/nameser.h>
@@ -365,6 +366,77 @@ int ast_dns_resolve(const char *name, int rr_type, int rr_class, struct ast_dns_
        return *result ? 0 : -1;
 }
 
+int ast_dns_resolve_ipv6_and_ipv4(struct ast_sockaddr *address, const char *host, const char *port)
+{
+       RAII_VAR(struct ast_dns_query_set *, queries, ast_dns_query_set_create(), ao2_cleanup);
+       int i;
+       int rc;
+
+       if (!queries) {
+               ast_log(LOG_ERROR, "Couldn't allocate DNS query structure\n");
+               return -1;
+       }
+       rc = ast_dns_query_set_add(queries, host, ns_t_aaaa, ns_c_in);
+       if (rc != 0) {
+               ast_log(LOG_ERROR, "Couldn't add 'AAAA' DNS query for '%s'\n", host);
+               return -1;
+       }
+       rc = ast_dns_query_set_add(queries, host, ns_t_a, ns_c_in);
+       if (rc != 0) {
+               ast_log(LOG_ERROR, "Couldn't add 'A' DNS query for '%s'\n", host);
+               return -1;
+       }
+       rc = ast_query_set_resolve(queries);
+       if (rc != 0) {
+               ast_log(LOG_ERROR, "Query set resolve failure for '%s'\n", host);
+               return -1;
+       }
+       for (i = 0; i < ast_dns_query_set_num_queries(queries); ++i) {
+               struct ast_dns_query *query = ast_dns_query_set_get(queries, i);
+               struct ast_dns_result *result = ast_dns_query_get_result(query);
+               const struct ast_dns_record *record;
+               in_port_t in_port = 0;
+
+               if (!ast_strlen_zero(port)) {
+                       in_port = htons(atoi(port));
+               }
+
+               for (record = ast_dns_result_get_records(result); record; record = ast_dns_record_get_next(record)) {
+                       size_t data_size = ast_dns_record_get_data_size(record);
+                       const unsigned char *data = (unsigned char *)ast_dns_record_get_data(record);
+                       int rr_type = ast_dns_record_get_rr_type(record);
+
+                       if (rr_type == ns_t_aaaa && data_size == 16) {
+                               struct sockaddr_in6 sin6 = { 0, };
+
+                               sin6.sin6_port = in_port;
+                               memcpy(&sin6.sin6_addr, data, data_size);
+                               sin6.sin6_family = AF_INET6;
+                               memcpy(&address->ss, &sin6, sizeof(sin6));
+                               address->len = sizeof(sin6);
+
+                               return 0;
+                       } else if (rr_type == ns_t_a && data_size == 4) {
+                               struct sockaddr_in sin4 = { 0, };
+
+                               sin4.sin_port = in_port;
+                               memcpy(&sin4.sin_addr, data, data_size);
+                               sin4.sin_family = AF_INET;
+                               memcpy(&address->ss, &sin4, sizeof(sin4));
+                               address->len = sizeof(sin4);
+
+                               return 0;
+                       } else {
+                               ast_debug(3, "Unrecognized rr_type '%u' or data_size '%zu' from DNS query for host '%s'\n",
+                                       rr_type, data_size, host);
+                               continue;
+                       }
+               }
+       }
+
+       return -1;
+}
+
 int ast_dns_resolver_set_data(struct ast_dns_query *query, void *data)
 {
        if (query->resolver_data) {