vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Integrate DNS with address parsing

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-12-16 17:12:01 +01:00
parent 8d4e4fc0e5
commit f0f4253cd2
4 changed files with 124 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
grub-core/net/net.c
View file

@ -501,6 +501,10 @@ grub_net_resolve_address (const char *name,
grub_net_network_level_address_t *addr)
{
const char *rest;
grub_err_t err;
grub_size_t naddresses;
struct grub_net_network_level_address *addresses;
if (parse_ip (name, &addr->ipv4, &rest) && *rest == 0)
{
addr->type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4;
@ -511,8 +515,16 @@ grub_net_resolve_address (const char *name,
addr->type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV6;
return GRUB_ERR_NONE;
}
return grub_error (GRUB_ERR_NET_BAD_ADDRESS, N_("unrecognised address %s"),
name);
err = grub_net_dns_lookup (name, 0, 0, &naddresses, &addresses, 1);
if (err)
return err;
if (!naddresses)
grub_error (GRUB_ERR_NET_BAD_ADDRESS, N_("unresolvable address %s"),
name);
/* FIXME: use other results as well. */
*addr = addresses[0];
grub_free (addresses);
return GRUB_ERR_NONE;
}
grub_err_t