Step 1 in /etc/resolv.conf support

include/netutils/netlib.h

@@ -159,7 +159,6 @@ int netlib_ifdown(FAR const char *ifname);
 
 #if defined(CONFIG_NET_IPv4) && defined(CONFIG_NETDB_DNSCLIENT)
 int netlib_set_ipv4dnsaddr(FAR const struct in_addr *inaddr);
-int netlib_get_ipv4dnsaddr(FAR struct in_addr *inaddr);
 #endif
 
 #undef EXTERN

netutils/netlib/Makefile

@@ -49,7 +49,7 @@ ifeq ($(CONFIG_NET_IPv4),y)
 CSRCS += netlib_setipv4addr.c netlib_getipv4addr.c
 CSRCS += netlib_setdripv4addr.c netlib_setipv4netmask.c
 ifeq ($(CONFIG_NETDB_DNSCLIENT),y)
-CSRCS += netlib_setipv4dnsaddr.c netlib_getipv4dnsaddr.c
+CSRCS += netlib_setipv4dnsaddr.c
 endif
 endif
 

netutils/netlib/netlib_getipv4dnsaddr.c

-/****************************************************************************
- * netutils/netlib/netlib_getipv4addr.c
- *
- *   Copyright (C) 2007-2009, 2011, 2015 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <sys/socket.h>
-
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-
-#include <netinet/in.h>
-
-#include <nuttx/net/dns.h>
-
-#include <apps/netutils/netlib.h>
-
-#if defined(CONFIG_NET_IPv4) && defined(CONFIG_NETDB_DNSCLIENT)
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: netlib_get_ipv4dnsaddr
- *
- * Description:
- *   Get the DNS server IPv4 address
- *
- * Parameters:
- *   ipaddr   The location to return the IPv4 address
- *
- * Return:
- *   Zero (OK) is returned on success; A negated errno value is returned
- *   on failure.
- *
- ****************************************************************************/
-
-int netlib_get_ipv4dnsaddr(FAR struct in_addr *inaddr)
-{
-  struct sockaddr_in addr;
-  socklen_t addrlen;
-  int ret = -EINVAL;
-
-  if (inaddr)
-    {
-      addrlen = sizeof(struct sockaddr_in);
-      ret = dns_getserver((FAR struct sockaddr *)&addr, &addrlen);
-      if (ret >= 0)
-        {
-          /* Sanity check */
-
-          DEBUGASSERT(addr.sin_family == AF_INET &&
-                      addrlen == sizeof(struct sockaddr_in));
-          memcpy(inaddr, &addr.sin_addr, sizeof(struct in_addr));
-        }
-    }
-
-  return ret;
-}
-
-#endif /* CONFIG_NET_IPv4 && CONFIG_NETDB_DNSCLIENT */

netutils/netlib/netlib_setipv4dnsaddr.c

@@ -84,8 +84,8 @@ int netlib_set_ipv4dnsaddr(FAR const struct in_addr *inaddr)
       addr.sin_port   = 0;
       memcpy(&addr.sin_addr, inaddr, sizeof(struct in_addr));
 
-      ret = dns_setserver((FAR const struct sockaddr *)&addr,
-                           sizeof(struct sockaddr_in));
+      ret = dns_add_nameserver((FAR const struct sockaddr *)&addr,
+                               sizeof(struct sockaddr_in));
     }
 
   return ret;