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

net/dhcp: Consistently use decimal numbers for DHCP/BOOTP options enum

Browse source 
The DHCP Options and BOOTP Vendor Extensions enum values are a mixture of
decimal and hexadecimal numbers. Change this to consistently use decimal
numbers for all since that is how these values are defined by RFC 2132.

Suggested-by: Daniel Kiper <daniel.kiper@oracle.com>
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Javier Martinez Canillas 2020-01-22 12:01:53 +01:00 committed by Daniel Kiper
parent 8c2c35dcc0
commit e921119857
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
include/grub/net.h
View file

@ -454,14 +454,14 @@ struct grub_net_bootp_packet
enum enum
{ {
GRUB_NET_BOOTP_PAD = 0x00, GRUB_NET_BOOTP_PAD = 0,
GRUB_NET_BOOTP_NETMASK = 0x01, GRUB_NET_BOOTP_NETMASK = 1,
GRUB_NET_BOOTP_ROUTER = 0x03, GRUB_NET_BOOTP_ROUTER = 3,
GRUB_NET_BOOTP_DNS = 0x06, GRUB_NET_BOOTP_DNS = 6,
GRUB_NET_BOOTP_HOSTNAME = 0x0c, GRUB_NET_BOOTP_HOSTNAME = 12,
GRUB_NET_BOOTP_DOMAIN = 0x0f, GRUB_NET_BOOTP_DOMAIN = 15,
GRUB_NET_BOOTP_ROOT_PATH = 0x11, GRUB_NET_BOOTP_ROOT_PATH = 17,
GRUB_NET_BOOTP_EXTENSIONS_PATH = 0x12, GRUB_NET_BOOTP_EXTENSIONS_PATH = 18,
GRUB_NET_DHCP_REQUESTED_IP_ADDRESS = 50, GRUB_NET_DHCP_REQUESTED_IP_ADDRESS = 50,
GRUB_NET_DHCP_OVERLOAD = 52, GRUB_NET_DHCP_OVERLOAD = 52,
GRUB_NET_DHCP_MESSAGE_TYPE = 53, GRUB_NET_DHCP_MESSAGE_TYPE = 53,
@ -469,7 +469,7 @@ enum
GRUB_NET_DHCP_PARAMETER_REQUEST_LIST = 55, GRUB_NET_DHCP_PARAMETER_REQUEST_LIST = 55,
GRUB_NET_DHCP_TFTP_SERVER_NAME = 66, GRUB_NET_DHCP_TFTP_SERVER_NAME = 66,
GRUB_NET_DHCP_BOOTFILE_NAME = 67, GRUB_NET_DHCP_BOOTFILE_NAME = 67,
GRUB_NET_BOOTP_END = 0xff GRUB_NET_BOOTP_END = 255
}; };
struct grub_net_network_level_interface * struct grub_net_network_level_interface *