From 5e7b343d527ea853b6b7fc716c53c8c153297dbf Mon Sep 17 00:00:00 2001 From: Dirk Ziegelmeier Date: Mon, 13 Jun 2016 09:00:17 +0200 Subject: [PATCH] Fix dns_getserver to return a pointer, not a value --- src/core/dns.c | 6 +++--- src/include/lwip/dns.h | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/core/dns.c b/src/core/dns.c index 03682a96..bae8bc45 100644 --- a/src/core/dns.c +++ b/src/core/dns.c @@ -432,13 +432,13 @@ dns_setserver(u8_t numdns, const ip_addr_t *dnsserver) * @return IP address of the indexed DNS server or "ip_addr_any" if the DNS * server has not been configured. */ -ip_addr_t +const ip_addr_t* dns_getserver(u8_t numdns) { if (numdns < DNS_MAX_SERVERS) { - return dns_servers[numdns]; + return &dns_servers[numdns]; } else { - return *IP_ADDR_ANY; + return IP_ADDR_ANY; } } diff --git a/src/include/lwip/dns.h b/src/include/lwip/dns.h index cf78ace3..00d5a78c 100644 --- a/src/include/lwip/dns.h +++ b/src/include/lwip/dns.h @@ -93,15 +93,15 @@ struct local_hostlist_entry { */ typedef void (*dns_found_callback)(const char *name, const ip_addr_t *ipaddr, void *callback_arg); -void dns_init(void); -void dns_tmr(void); -void dns_setserver(u8_t numdns, const ip_addr_t *dnsserver); -ip_addr_t dns_getserver(u8_t numdns); -err_t dns_gethostbyname(const char *hostname, ip_addr_t *addr, - dns_found_callback found, void *callback_arg); -err_t dns_gethostbyname_addrtype(const char *hostname, ip_addr_t *addr, - dns_found_callback found, void *callback_arg, - u8_t dns_addrtype); +void dns_init(void); +void dns_tmr(void); +void dns_setserver(u8_t numdns, const ip_addr_t *dnsserver); +const ip_addr_t* dns_getserver(u8_t numdns); +err_t dns_gethostbyname(const char *hostname, ip_addr_t *addr, + dns_found_callback found, void *callback_arg); +err_t dns_gethostbyname_addrtype(const char *hostname, ip_addr_t *addr, + dns_found_callback found, void *callback_arg, + u8_t dns_addrtype); #if DNS_LOCAL_HOSTLIST && DNS_LOCAL_HOSTLIST_IS_DYNAMIC