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

Merge pull request #24 from mjg59/coreos

Browse source 
Netboot updates
This commit is contained in:
mjg59 2016-03-24 15:12:06 -07:00
commit a067b998e0
3 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
grub-core/net/bootp.c
View file

@ -25,11 +25,14 @@
#include <grub/net/udp.h> #include <grub/net/udp.h>
#include <grub/datetime.h> #include <grub/datetime.h>
static grub_uint8_t grub_userclass[] = {GRUB_NET_BOOTP_RFC1048_MAGIC_0, static grub_uint8_t dhcp_option_header[] = {GRUB_NET_BOOTP_RFC1048_MAGIC_0,
GRUB_NET_BOOTP_RFC1048_MAGIC_1, GRUB_NET_BOOTP_RFC1048_MAGIC_1,
GRUB_NET_BOOTP_RFC1048_MAGIC_2, GRUB_NET_BOOTP_RFC1048_MAGIC_2,
GRUB_NET_BOOTP_RFC1048_MAGIC_3, GRUB_NET_BOOTP_RFC1048_MAGIC_3};
0x4D, 0x05, 'G', 'R', 'U', 'B', '2'}; static grub_uint8_t grub_userclass[] = {0x4D, 0x05, 'G', 'R', 'U', 'B', '2'};
static grub_uint8_t grub_dhcpdiscover[] = {0x35, 0x01, 0x01};
static grub_uint8_t grub_dhcptime[] = {0x33, 0x04, 0x00, 0x00, 0x0e, 0x10};
static void static void
parse_dhcp_vendor (const char *name, const void *vend, int limit, int *mask) parse_dhcp_vendor (const char *name, const void *vend, int limit, int *mask)
{ {
@ -493,10 +496,14 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)),
struct udphdr *udph; struct udphdr *udph;
grub_net_network_level_address_t target; grub_net_network_level_address_t target;
grub_net_link_level_address_t ll_target; grub_net_link_level_address_t ll_target;
grub_uint8_t *offset;
if (!ifaces[j].prev) if (!ifaces[j].prev)
continue; continue;
nb = grub_netbuff_alloc (sizeof (*pack) + 64 + 128); nb = grub_netbuff_alloc (sizeof (*pack) + sizeof(dhcp_option_header)
+ sizeof(grub_userclass)
+ sizeof(grub_dhcpdiscover)
+ sizeof(grub_dhcptime) + 64 + 128);
if (!nb) if (!nb)
{ {
grub_netbuff_free (nb); grub_netbuff_free (nb);
@ -530,7 +537,14 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)),
pack->seconds = grub_cpu_to_be16 (t); pack->seconds = grub_cpu_to_be16 (t);
grub_memcpy (&pack->mac_addr, &ifaces[j].hwaddress.mac, 6); grub_memcpy (&pack->mac_addr, &ifaces[j].hwaddress.mac, 6);
grub_memcpy (&pack->vendor, grub_userclass, sizeof(grub_userclass)); offset = (grub_uint8_t *)&pack->vendor;
grub_memcpy (offset, dhcp_option_header, sizeof(dhcp_option_header));
offset += sizeof(dhcp_option_header);
grub_memcpy (offset, grub_dhcpdiscover, sizeof(grub_dhcpdiscover));
offset += sizeof(grub_dhcpdiscover);
grub_memcpy (offset, grub_userclass, sizeof(grub_userclass));
offset += sizeof(grub_userclass);
grub_memcpy (offset, grub_dhcptime, sizeof(grub_dhcptime));
grub_netbuff_push (nb, sizeof (*udph)); grub_netbuff_push (nb, sizeof (*udph));

4
grub-core/net/dns.c
View file

@ -276,8 +276,8 @@ recv_hook (grub_net_udp_socket_t sock __attribute__ ((unused)),
ptr++; ptr++;
ptr += 4; ptr += 4;
} }
*data->addresses = grub_malloc (sizeof ((*data->addresses)[0]) *data->addresses = grub_realloc (*data->addresses, sizeof ((*data->addresses)[0])
* grub_be_to_cpu16 (head->ancount)); * (grub_be_to_cpu16 (head->ancount) + *data->naddresses));
if (!*data->addresses) if (!*data->addresses)
{ {
grub_errno = GRUB_ERR_NONE; grub_errno = GRUB_ERR_NONE;

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

@ -1292,6 +1292,10 @@ grub_net_open_real (const char *name)
const char *comma; const char *comma;
char *colon; char *colon;
comma = grub_strchr (name, ','); comma = grub_strchr (name, ',');
if (!comma)
{
comma = grub_strchr (name, ';');
}
colon = grub_strchr (name, ':'); colon = grub_strchr (name, ':');
if (colon) if (colon)
{ {