ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[nsapi] Removed unnecessary dns_query functions

pull/2497/head
Christopher Haster 2016-08-15 17:12:15 -05:00
parent 08584916a5
commit dc9ddd42ef
3 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
features/net/network-socket/NetworkStack.cpp
View File

@ -24,14 +24,7 @@
// Default NetworkStack operations // Default NetworkStack operations
int NetworkStack::gethostbyname(SocketAddress *address, const char *name) int NetworkStack::gethostbyname(SocketAddress *address, const char *name)
{ {
nsapi_addr_t addr; return nsapi_dns_query(this, address, name);
int err = nsapi_dns_query(this, &addr, name);
if (err) {
return err;
}
address->set_addr(addr);
return 0;
} }
int NetworkStack::setstackopt(int level, int optname, const void *optval, unsigned optlen) int NetworkStack::setstackopt(int level, int optname, const void *optval, unsigned optlen)

9
features/net/network-socket/nsapi_dns.cpp
View File

@ -176,7 +176,7 @@ static int dns_scan_response(const uint8_t **p, nsapi_addr_t *addr, unsigned add
} }
// core query function // core query function
int nsapi_dns_query_multiple(NetworkStack *stack, static int nsapi_dns_query_multiple(NetworkStack *stack,
nsapi_addr_t *addr, unsigned addr_count, nsapi_addr_t *addr, unsigned addr_count,
const char *host, nsapi_version_t version) const char *host, nsapi_version_t version)
{ {
@ -299,13 +299,6 @@ int nsapi_dns_query(nsapi_stack_t *stack,
return (result > 0) ? 0 : result; return (result > 0) ? 0 : result;
} }
int nsapi_dns_query(NetworkStack *stack,
nsapi_addr_t *addr, const char *host, nsapi_version_t version)
{
int result = nsapi_dns_query_multiple(stack, addr, 1, host, version);
return (result > 0) ? 0 : result;
}
int nsapi_dns_query(NetworkStack *stack, int nsapi_dns_query(NetworkStack *stack,
SocketAddress *address, const char *host, nsapi_version_t version) SocketAddress *address, const char *host, nsapi_version_t version)
{ {

21
features/net/network-socket/nsapi_dns.h
View File

@ -37,18 +37,9 @@ int nsapi_dns_query(nsapi_stack_t *stack, nsapi_addr_t *addr,
#ifdef __cplusplus #ifdef __cplusplus
int nsapi_dns_query(nsapi_stack_t *stack, nsapi_addr_t *addr, int nsapi_dns_query(nsapi_stack_t *stack, nsapi_addr_t *addr,
const char *host); const char *host);
int nsapi_dns_query(NetworkStack *stack, nsapi_addr_t *addr,
const char *host, nsapi_version_t version = NSAPI_IPv4);
int nsapi_dns_query(NetworkStack *stack, SocketAddress *addr, int nsapi_dns_query(NetworkStack *stack, SocketAddress *addr,
const char *host, nsapi_version_t version = NSAPI_IPv4); const char *host, nsapi_version_t version = NSAPI_IPv4);
template <typename S>
int nsapi_dns_query(S *stack, nsapi_addr_t *addr,
const char *host, nsapi_version_t version = NSAPI_IPv4)
{
return nsapi_dns_query(nsapi_create_stack(stack), addr, host, version);
}
template <typename S> template <typename S>
int nsapi_dns_query(S *stack, SocketAddress *addr, int nsapi_dns_query(S *stack, SocketAddress *addr,
const char *host, nsapi_version_t version = NSAPI_IPv4) const char *host, nsapi_version_t version = NSAPI_IPv4)
@ -77,22 +68,10 @@ int nsapi_dns_query_multiple(nsapi_stack_t *stack,
int nsapi_dns_query_multiple(nsapi_stack_t *stack, int nsapi_dns_query_multiple(nsapi_stack_t *stack,
nsapi_addr_t *addr, unsigned addr_count, nsapi_addr_t *addr, unsigned addr_count,
const char *host); const char *host);
int nsapi_dns_query_multiple(NetworkStack *stack,
nsapi_addr_t *addr, unsigned addr_count,
const char *host, nsapi_version_t version = NSAPI_IPv4);
int nsapi_dns_query_multiple(NetworkStack *stack, int nsapi_dns_query_multiple(NetworkStack *stack,
SocketAddress *addr, unsigned addr_count, SocketAddress *addr, unsigned addr_count,
const char *host, nsapi_version_t version = NSAPI_IPv4); const char *host, nsapi_version_t version = NSAPI_IPv4);
template <typename S>
int nsapi_dns_query_multiple(S *stack,
nsapi_addr_t *addr, unsigned addr_count,
const char *host, nsapi_version_t version = NSAPI_IPv4)
{
return nsapi_dns_query_multiple(nsapi_create_stack(stack),
addr, addr_count, host, version);
}
template <typename S> template <typename S>
int nsapi_dns_query_multiple(S *stack, int nsapi_dns_query_multiple(S *stack,
SocketAddress *addr, unsigned addr_count, SocketAddress *addr, unsigned addr_count,