aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2016-04-06 12:34:01 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2016-04-06 12:34:01 -0700
commitedb6d3e81a891331d0adea527dc4adbe45db64d4 (patch)
tree401797c1f138d777658f0c0dffc7c78bbe1391de /core
parentcfafd66933bfd9fd55c58d7f8fa9f468386ba385 (diff)
downloadsyslinux-edb6d3e81a891331d0adea527dc4adbe45db64d4.tar.gz
syslinux-edb6d3e81a891331d0adea527dc4adbe45db64d4.tar.xz
syslinux-edb6d3e81a891331d0adea527dc4adbe45db64d4.zip
pxe_dns: remove obsolete pxe_dns.c wrapper
We used to need a wrapper around the core function dns_resolv() to implement pxe_dns(), because the former function required its argument to live in low memory. This is no longer the case and hasn't been for a while, so remove this unnecessary level of indirection. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'core')
-rw-r--r--core/fs/pxe/dnsresolv.c12
-rw-r--r--core/fs/pxe/pxe.c2
-rw-r--r--core/legacynet/dnsresolv.c2
3 files changed, 3 insertions, 13 deletions
diff --git a/core/fs/pxe/dnsresolv.c b/core/fs/pxe/dnsresolv.c
index afb9e219..26c5b34b 100644
--- a/core/fs/pxe/dnsresolv.c
+++ b/core/fs/pxe/dnsresolv.c
@@ -88,7 +88,7 @@ static bool parse_dotquad(const char *ip_str, uint32_t *res)
* _ip_ if it exists and can be found. If _ip_ = 0 on exit, the
* lookup failed. _name_ will be updated
*/
-__export uint32_t dns_resolv(const char *name)
+__export uint32_t pxe_dns(const char *name)
{
err_t err;
struct ip_addr ip;
@@ -122,13 +122,3 @@ __export uint32_t dns_resolv(const char *name)
return ip.addr;
}
-
-/*
- * the one should be called from ASM file
- */
-void pm_pxe_dns_resolv(com32sys_t *regs)
-{
- const char *name = MK_PTR(regs->ds, regs->esi.w[0]);
-
- regs->eax.l = dns_resolv(name);
-}
diff --git a/core/fs/pxe/pxe.c b/core/fs/pxe/pxe.c
index 5efcd9c6..9b1a7329 100644
--- a/core/fs/pxe/pxe.c
+++ b/core/fs/pxe/pxe.c
@@ -241,7 +241,7 @@ static void url_set_ip(struct url_info *url)
{
url->ip = 0;
if (url->host)
- url->ip = dns_resolv(url->host);
+ url->ip = pxe_dns(url->host);
if (!url->ip)
url->ip = IPInfo.serverip;
}
diff --git a/core/legacynet/dnsresolv.c b/core/legacynet/dnsresolv.c
index fdbe795c..2b014cb4 100644
--- a/core/legacynet/dnsresolv.c
+++ b/core/legacynet/dnsresolv.c
@@ -208,7 +208,7 @@ static bool parse_dotquad(const char *ip_str, uint32_t *res)
*
* XXX: probably need some caching here.
*/
-__export uint32_t dns_resolv(const char *name)
+__export uint32_t pxe_dns(const char *name)
{
static char __lowmem DNSSendBuf[PKTBUF_SIZE];
static char __lowmem DNSRecvBuf[PKTBUF_SIZE];